From cd4b00457a89bd55aa802a2a81d871ddd731d301 Mon Sep 17 00:00:00 2001 From: Sean McGrail Date: Wed, 4 Nov 2020 20:23:09 -0800 Subject: [PATCH] AWS Client Loggers and Client Log Mode Support (#872) --- aws/config.go | 17 +++- aws/doc.go | 1 + aws/logging.go | 83 ++++++++++++++++ aws/logging_generate.go | 76 +++++++++++++++ aws/retry/middleware.go | 41 +++++++- aws/signer/v4/v4.go | 42 +++++++- .../aws/go/codegen/AddAwsConfigFields.java | 14 ++- .../go/codegen/AwsRetryMiddlewareHelper.java | 2 + .../aws/go/codegen/AwsSignatureVersion4.java | 31 +++--- .../go/codegen/RequestResponseLogging.java | 74 ++++++++++++++ ...mithy.go.codegen.integration.GoIntegration | 1 + config/config.go | 2 + config/go.mod | 2 +- config/go.sum | 4 - config/provider.go | 96 +++++++++++++++++++ config/resolve.go | 31 ++++++ config/resolve_test.go | 19 ++++ credentials/go.mod | 2 +- credentials/go.sum | 4 - ec2imds/api_client.go | 7 ++ ec2imds/go.sum | 2 - ec2imds/request_middleware.go | 5 +- example/service/s3/listObjects/go.sum | 4 - feature/s3/manager/download.go | 16 +++- feature/s3/manager/go.mod | 2 +- feature/s3/manager/go.sum | 4 - go.mod | 2 +- go.sum | 2 - .../protocoltest/awsrestjson/api_client.go | 42 +++++++- .../awsrestjson/api_op_AllQueryStringTypes.go | 6 ++ .../api_op_ConstantAndVariableQueryString.go | 6 ++ .../awsrestjson/api_op_ConstantQueryString.go | 6 ++ .../api_op_EmptyInputAndEmptyOutput.go | 6 ++ .../awsrestjson/api_op_GreetingWithErrors.go | 6 ++ .../awsrestjson/api_op_HttpPayloadTraits.go | 6 ++ .../api_op_HttpPayloadTraitsWithMediaType.go | 6 ++ .../api_op_HttpPayloadWithStructure.go | 6 ++ .../awsrestjson/api_op_HttpPrefixHeaders.go | 6 ++ .../api_op_HttpPrefixHeadersResponse.go | 6 ++ ...api_op_HttpRequestWithGreedyLabelInPath.go | 6 ++ .../api_op_HttpRequestWithLabels.go | 6 ++ ...HttpRequestWithLabelsAndTimestampFormat.go | 6 ++ .../awsrestjson/api_op_HttpResponseCode.go | 6 ++ .../api_op_IgnoreQueryParamsInResponse.go | 6 ++ .../awsrestjson/api_op_InlineDocument.go | 6 ++ .../api_op_InlineDocumentAsPayload.go | 6 ++ .../api_op_InputAndOutputWithHeaders.go | 6 ++ .../awsrestjson/api_op_JsonBlobs.go | 6 ++ .../awsrestjson/api_op_JsonEnums.go | 6 ++ .../awsrestjson/api_op_JsonLists.go | 6 ++ .../awsrestjson/api_op_JsonMaps.go | 6 ++ .../awsrestjson/api_op_JsonTimestamps.go | 6 ++ .../awsrestjson/api_op_JsonUnions.go | 6 ++ .../awsrestjson/api_op_MediaTypeHeader.go | 6 ++ .../awsrestjson/api_op_NoInputAndNoOutput.go | 6 ++ .../awsrestjson/api_op_NoInputAndOutput.go | 6 ++ .../api_op_NullAndEmptyHeadersClient.go | 6 ++ .../api_op_NullAndEmptyHeadersServer.go | 6 ++ .../api_op_OmitsNullSerializesEmptyString.go | 6 ++ .../api_op_QueryIdempotencyTokenAutoFill.go | 6 ++ .../awsrestjson/api_op_RecursiveShapes.go | 6 ++ .../api_op_SimpleScalarProperties.go | 6 ++ .../awsrestjson/api_op_StreamingTraits.go | 6 ++ .../api_op_StreamingTraitsRequireLength.go | 6 ++ .../api_op_StreamingTraitsWithMediaType.go | 6 ++ .../api_op_TimestampFormatHeaders.go | 6 ++ internal/protocoltest/awsrestjson/go.mod | 4 +- internal/protocoltest/awsrestjson/go.sum | 2 - internal/protocoltest/ec2query/api_client.go | 42 +++++++- .../api_op_EmptyInputAndEmptyOutput.go | 6 ++ .../ec2query/api_op_GreetingWithErrors.go | 6 ++ .../ec2query/api_op_IgnoresWrappingXmlName.go | 6 ++ .../ec2query/api_op_NestedStructures.go | 6 ++ .../ec2query/api_op_NoInputAndOutput.go | 6 ++ .../api_op_QueryIdempotencyTokenAutoFill.go | 6 ++ .../ec2query/api_op_QueryLists.go | 6 ++ .../ec2query/api_op_QueryTimestamps.go | 6 ++ .../ec2query/api_op_RecursiveXmlShapes.go | 6 ++ .../ec2query/api_op_SimpleInputParams.go | 6 ++ .../api_op_SimpleScalarXmlProperties.go | 6 ++ .../protocoltest/ec2query/api_op_XmlBlobs.go | 6 ++ .../ec2query/api_op_XmlEmptyBlobs.go | 6 ++ .../ec2query/api_op_XmlEmptyLists.go | 6 ++ .../protocoltest/ec2query/api_op_XmlEnums.go | 6 ++ .../protocoltest/ec2query/api_op_XmlLists.go | 6 ++ .../ec2query/api_op_XmlNamespaces.go | 6 ++ .../ec2query/api_op_XmlTimestamps.go | 6 ++ internal/protocoltest/ec2query/go.mod | 4 +- internal/protocoltest/ec2query/go.sum | 2 - internal/protocoltest/jsonrpc/api_client.go | 52 ++++++++-- .../jsonrpc/api_op_EmptyOperation.go | 6 ++ .../jsonrpc/api_op_GreetingWithErrors.go | 6 ++ .../protocoltest/jsonrpc/api_op_JsonEnums.go | 6 ++ .../protocoltest/jsonrpc/api_op_JsonUnions.go | 6 ++ .../jsonrpc/api_op_KitchenSinkOperation.go | 6 ++ .../jsonrpc/api_op_NullOperation.go | 6 ++ ...api_op_OperationWithOptionalInputOutput.go | 6 ++ .../api_op_PutAndGetInlineDocuments.go | 6 ++ internal/protocoltest/jsonrpc/go.mod | 4 +- internal/protocoltest/jsonrpc/go.sum | 2 - internal/protocoltest/jsonrpc10/api_client.go | 42 +++++++- .../api_op_EmptyInputAndEmptyOutput.go | 6 ++ .../jsonrpc10/api_op_GreetingWithErrors.go | 6 ++ .../jsonrpc10/api_op_JsonUnions.go | 6 ++ .../jsonrpc10/api_op_NoInputAndNoOutput.go | 6 ++ .../jsonrpc10/api_op_NoInputAndOutput.go | 6 ++ internal/protocoltest/jsonrpc10/go.mod | 4 +- internal/protocoltest/jsonrpc10/go.sum | 2 - internal/protocoltest/query/api_client.go | 42 +++++++- .../query/api_op_EmptyInputAndEmptyOutput.go | 6 ++ .../query/api_op_FlattenedXmlMap.go | 6 ++ .../api_op_FlattenedXmlMapWithXmlName.go | 6 ++ .../query/api_op_GreetingWithErrors.go | 6 ++ .../query/api_op_IgnoresWrappingXmlName.go | 6 ++ .../query/api_op_NestedStructures.go | 6 ++ .../query/api_op_NoInputAndNoOutput.go | 6 ++ .../query/api_op_NoInputAndOutput.go | 6 ++ .../api_op_QueryIdempotencyTokenAutoFill.go | 6 ++ .../protocoltest/query/api_op_QueryLists.go | 6 ++ .../protocoltest/query/api_op_QueryMaps.go | 6 ++ .../query/api_op_QueryTimestamps.go | 6 ++ .../query/api_op_RecursiveXmlShapes.go | 6 ++ .../query/api_op_SimpleInputParams.go | 6 ++ .../query/api_op_SimpleScalarXmlProperties.go | 6 ++ .../protocoltest/query/api_op_XmlBlobs.go | 6 ++ .../query/api_op_XmlEmptyBlobs.go | 6 ++ .../query/api_op_XmlEmptyLists.go | 6 ++ .../protocoltest/query/api_op_XmlEmptyMaps.go | 6 ++ .../protocoltest/query/api_op_XmlEnums.go | 6 ++ .../protocoltest/query/api_op_XmlLists.go | 6 ++ internal/protocoltest/query/api_op_XmlMaps.go | 6 ++ .../query/api_op_XmlMapsXmlName.go | 6 ++ .../query/api_op_XmlNamespaces.go | 6 ++ .../query/api_op_XmlTimestamps.go | 6 ++ internal/protocoltest/query/go.mod | 4 +- internal/protocoltest/query/go.sum | 2 - internal/protocoltest/restxml/api_client.go | 42 +++++++- .../restxml/api_op_AllQueryStringTypes.go | 6 ++ .../api_op_ConstantAndVariableQueryString.go | 6 ++ .../restxml/api_op_ConstantQueryString.go | 6 ++ .../api_op_EmptyInputAndEmptyOutput.go | 6 ++ .../restxml/api_op_FlattenedXmlMap.go | 6 ++ .../api_op_FlattenedXmlMapWithXmlName.go | 6 ++ .../restxml/api_op_GreetingWithErrors.go | 6 ++ .../restxml/api_op_HttpPayloadTraits.go | 6 ++ .../api_op_HttpPayloadTraitsWithMediaType.go | 6 ++ .../api_op_HttpPayloadWithStructure.go | 6 ++ .../restxml/api_op_HttpPayloadWithXmlName.go | 6 ++ .../api_op_HttpPayloadWithXmlNamespace.go | 6 ++ ...op_HttpPayloadWithXmlNamespaceAndPrefix.go | 6 ++ .../restxml/api_op_HttpPrefixHeaders.go | 6 ++ ...api_op_HttpRequestWithGreedyLabelInPath.go | 6 ++ .../restxml/api_op_HttpRequestWithLabels.go | 6 ++ ...HttpRequestWithLabelsAndTimestampFormat.go | 6 ++ .../restxml/api_op_HttpResponseCode.go | 6 ++ .../api_op_IgnoreQueryParamsInResponse.go | 6 ++ .../api_op_InputAndOutputWithHeaders.go | 6 ++ .../restxml/api_op_NoInputAndNoOutput.go | 6 ++ .../restxml/api_op_NoInputAndOutput.go | 6 ++ .../api_op_NullAndEmptyHeadersClient.go | 6 ++ .../api_op_NullAndEmptyHeadersServer.go | 6 ++ .../api_op_OmitsNullSerializesEmptyString.go | 6 ++ .../api_op_QueryIdempotencyTokenAutoFill.go | 6 ++ .../restxml/api_op_RecursiveShapes.go | 6 ++ .../restxml/api_op_SimpleScalarProperties.go | 6 ++ .../restxml/api_op_TimestampFormatHeaders.go | 6 ++ .../restxml/api_op_XmlAttributes.go | 6 ++ .../restxml/api_op_XmlAttributesOnPayload.go | 6 ++ .../protocoltest/restxml/api_op_XmlBlobs.go | 6 ++ .../restxml/api_op_XmlEmptyBlobs.go | 6 ++ .../restxml/api_op_XmlEmptyLists.go | 6 ++ .../restxml/api_op_XmlEmptyMaps.go | 6 ++ .../restxml/api_op_XmlEmptyStrings.go | 6 ++ .../protocoltest/restxml/api_op_XmlEnums.go | 6 ++ .../protocoltest/restxml/api_op_XmlLists.go | 6 ++ .../protocoltest/restxml/api_op_XmlMaps.go | 6 ++ .../restxml/api_op_XmlMapsXmlName.go | 6 ++ .../restxml/api_op_XmlNamespaces.go | 6 ++ .../restxml/api_op_XmlTimestamps.go | 6 ++ internal/protocoltest/restxml/go.mod | 4 +- internal/protocoltest/restxml/go.sum | 2 - service/accessanalyzer/api_client.go | 52 ++++++++-- .../accessanalyzer/api_op_CreateAnalyzer.go | 6 ++ .../api_op_CreateArchiveRule.go | 6 ++ .../accessanalyzer/api_op_DeleteAnalyzer.go | 6 ++ .../api_op_DeleteArchiveRule.go | 6 ++ .../api_op_GetAnalyzedResource.go | 6 ++ service/accessanalyzer/api_op_GetAnalyzer.go | 6 ++ .../accessanalyzer/api_op_GetArchiveRule.go | 6 ++ service/accessanalyzer/api_op_GetFinding.go | 6 ++ .../api_op_ListAnalyzedResources.go | 6 ++ .../accessanalyzer/api_op_ListAnalyzers.go | 6 ++ .../accessanalyzer/api_op_ListArchiveRules.go | 6 ++ service/accessanalyzer/api_op_ListFindings.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_StartResourceScan.go | 6 ++ service/accessanalyzer/api_op_TagResource.go | 6 ++ .../accessanalyzer/api_op_UntagResource.go | 6 ++ .../api_op_UpdateArchiveRule.go | 6 ++ .../accessanalyzer/api_op_UpdateFindings.go | 6 ++ service/accessanalyzer/go.mod | 4 +- service/accessanalyzer/go.sum | 2 - service/acm/api_client.go | 52 ++++++++-- service/acm/api_op_AddTagsToCertificate.go | 6 ++ service/acm/api_op_DeleteCertificate.go | 6 ++ service/acm/api_op_DescribeCertificate.go | 6 ++ service/acm/api_op_ExportCertificate.go | 6 ++ service/acm/api_op_GetCertificate.go | 6 ++ service/acm/api_op_ImportCertificate.go | 6 ++ service/acm/api_op_ListCertificates.go | 6 ++ service/acm/api_op_ListTagsForCertificate.go | 6 ++ .../acm/api_op_RemoveTagsFromCertificate.go | 6 ++ service/acm/api_op_RenewCertificate.go | 6 ++ service/acm/api_op_RequestCertificate.go | 6 ++ service/acm/api_op_ResendValidationEmail.go | 6 ++ .../acm/api_op_UpdateCertificateOptions.go | 6 ++ service/acm/go.mod | 4 +- service/acm/go.sum | 2 - service/acmpca/api_client.go | 52 ++++++++-- .../api_op_CreateCertificateAuthority.go | 6 ++ ...p_CreateCertificateAuthorityAuditReport.go | 6 ++ service/acmpca/api_op_CreatePermission.go | 6 ++ .../api_op_DeleteCertificateAuthority.go | 6 ++ service/acmpca/api_op_DeletePermission.go | 6 ++ service/acmpca/api_op_DeletePolicy.go | 6 ++ .../api_op_DescribeCertificateAuthority.go | 6 ++ ...DescribeCertificateAuthorityAuditReport.go | 6 ++ service/acmpca/api_op_GetCertificate.go | 6 ++ ...i_op_GetCertificateAuthorityCertificate.go | 6 ++ .../api_op_GetCertificateAuthorityCsr.go | 6 ++ service/acmpca/api_op_GetPolicy.go | 6 ++ ...p_ImportCertificateAuthorityCertificate.go | 6 ++ service/acmpca/api_op_IssueCertificate.go | 6 ++ .../api_op_ListCertificateAuthorities.go | 6 ++ service/acmpca/api_op_ListPermissions.go | 6 ++ service/acmpca/api_op_ListTags.go | 6 ++ service/acmpca/api_op_PutPolicy.go | 6 ++ .../api_op_RestoreCertificateAuthority.go | 6 ++ service/acmpca/api_op_RevokeCertificate.go | 6 ++ .../acmpca/api_op_TagCertificateAuthority.go | 6 ++ .../api_op_UntagCertificateAuthority.go | 6 ++ .../api_op_UpdateCertificateAuthority.go | 6 ++ service/acmpca/go.mod | 4 +- service/acmpca/go.sum | 2 - service/alexaforbusiness/api_client.go | 52 ++++++++-- .../alexaforbusiness/api_op_ApproveSkill.go | 6 ++ .../api_op_AssociateContactWithAddressBook.go | 6 ++ ...pi_op_AssociateDeviceWithNetworkProfile.go | 6 ++ .../api_op_AssociateDeviceWithRoom.go | 6 ++ .../api_op_AssociateSkillGroupWithRoom.go | 6 ++ .../api_op_AssociateSkillWithSkillGroup.go | 6 ++ .../api_op_AssociateSkillWithUsers.go | 6 ++ .../api_op_CreateAddressBook.go | 6 ++ .../api_op_CreateBusinessReportSchedule.go | 6 ++ .../api_op_CreateConferenceProvider.go | 6 ++ .../alexaforbusiness/api_op_CreateContact.go | 6 ++ .../api_op_CreateGatewayGroup.go | 6 ++ .../api_op_CreateNetworkProfile.go | 6 ++ .../alexaforbusiness/api_op_CreateProfile.go | 6 ++ service/alexaforbusiness/api_op_CreateRoom.go | 6 ++ .../api_op_CreateSkillGroup.go | 6 ++ service/alexaforbusiness/api_op_CreateUser.go | 6 ++ .../api_op_DeleteAddressBook.go | 6 ++ .../api_op_DeleteBusinessReportSchedule.go | 6 ++ .../api_op_DeleteConferenceProvider.go | 6 ++ .../alexaforbusiness/api_op_DeleteContact.go | 6 ++ .../alexaforbusiness/api_op_DeleteDevice.go | 6 ++ .../api_op_DeleteDeviceUsageData.go | 6 ++ .../api_op_DeleteGatewayGroup.go | 6 ++ .../api_op_DeleteNetworkProfile.go | 6 ++ .../alexaforbusiness/api_op_DeleteProfile.go | 6 ++ service/alexaforbusiness/api_op_DeleteRoom.go | 6 ++ .../api_op_DeleteRoomSkillParameter.go | 6 ++ .../api_op_DeleteSkillAuthorization.go | 6 ++ .../api_op_DeleteSkillGroup.go | 6 ++ service/alexaforbusiness/api_op_DeleteUser.go | 6 ++ ...i_op_DisassociateContactFromAddressBook.go | 6 ++ .../api_op_DisassociateDeviceFromRoom.go | 6 ++ .../api_op_DisassociateSkillFromSkillGroup.go | 6 ++ .../api_op_DisassociateSkillFromUsers.go | 6 ++ .../api_op_DisassociateSkillGroupFromRoom.go | 6 ++ .../api_op_ForgetSmartHomeAppliances.go | 6 ++ .../alexaforbusiness/api_op_GetAddressBook.go | 6 ++ .../api_op_GetConferencePreference.go | 6 ++ .../api_op_GetConferenceProvider.go | 6 ++ service/alexaforbusiness/api_op_GetContact.go | 6 ++ service/alexaforbusiness/api_op_GetDevice.go | 6 ++ service/alexaforbusiness/api_op_GetGateway.go | 6 ++ .../api_op_GetGatewayGroup.go | 6 ++ .../api_op_GetInvitationConfiguration.go | 6 ++ .../api_op_GetNetworkProfile.go | 6 ++ service/alexaforbusiness/api_op_GetProfile.go | 6 ++ service/alexaforbusiness/api_op_GetRoom.go | 6 ++ .../api_op_GetRoomSkillParameter.go | 6 ++ .../alexaforbusiness/api_op_GetSkillGroup.go | 6 ++ .../api_op_ListBusinessReportSchedules.go | 6 ++ .../api_op_ListConferenceProviders.go | 6 ++ .../api_op_ListDeviceEvents.go | 6 ++ .../api_op_ListGatewayGroups.go | 6 ++ .../alexaforbusiness/api_op_ListGateways.go | 6 ++ service/alexaforbusiness/api_op_ListSkills.go | 6 ++ .../api_op_ListSkillsStoreCategories.go | 6 ++ .../api_op_ListSkillsStoreSkillsByCategory.go | 6 ++ .../api_op_ListSmartHomeAppliances.go | 6 ++ service/alexaforbusiness/api_op_ListTags.go | 6 ++ .../api_op_PutConferencePreference.go | 6 ++ .../api_op_PutInvitationConfiguration.go | 6 ++ .../api_op_PutRoomSkillParameter.go | 6 ++ .../api_op_PutSkillAuthorization.go | 6 ++ .../api_op_RegisterAVSDevice.go | 6 ++ .../alexaforbusiness/api_op_RejectSkill.go | 6 ++ .../alexaforbusiness/api_op_ResolveRoom.go | 6 ++ .../api_op_RevokeInvitation.go | 6 ++ .../api_op_SearchAddressBooks.go | 6 ++ .../alexaforbusiness/api_op_SearchContacts.go | 6 ++ .../alexaforbusiness/api_op_SearchDevices.go | 6 ++ .../api_op_SearchNetworkProfiles.go | 6 ++ .../alexaforbusiness/api_op_SearchProfiles.go | 6 ++ .../alexaforbusiness/api_op_SearchRooms.go | 6 ++ .../api_op_SearchSkillGroups.go | 6 ++ .../alexaforbusiness/api_op_SearchUsers.go | 6 ++ .../api_op_SendAnnouncement.go | 6 ++ .../alexaforbusiness/api_op_SendInvitation.go | 6 ++ .../api_op_StartDeviceSync.go | 6 ++ ...api_op_StartSmartHomeApplianceDiscovery.go | 6 ++ .../alexaforbusiness/api_op_TagResource.go | 6 ++ .../alexaforbusiness/api_op_UntagResource.go | 6 ++ .../api_op_UpdateAddressBook.go | 6 ++ .../api_op_UpdateBusinessReportSchedule.go | 6 ++ .../api_op_UpdateConferenceProvider.go | 6 ++ .../alexaforbusiness/api_op_UpdateContact.go | 6 ++ .../alexaforbusiness/api_op_UpdateDevice.go | 6 ++ .../alexaforbusiness/api_op_UpdateGateway.go | 6 ++ .../api_op_UpdateGatewayGroup.go | 6 ++ .../api_op_UpdateNetworkProfile.go | 6 ++ .../alexaforbusiness/api_op_UpdateProfile.go | 6 ++ service/alexaforbusiness/api_op_UpdateRoom.go | 6 ++ .../api_op_UpdateSkillGroup.go | 6 ++ service/alexaforbusiness/go.mod | 4 +- service/alexaforbusiness/go.sum | 2 - service/amplify/api_client.go | 52 ++++++++-- service/amplify/api_op_CreateApp.go | 6 ++ .../api_op_CreateBackendEnvironment.go | 6 ++ service/amplify/api_op_CreateBranch.go | 6 ++ service/amplify/api_op_CreateDeployment.go | 6 ++ .../amplify/api_op_CreateDomainAssociation.go | 6 ++ service/amplify/api_op_CreateWebhook.go | 6 ++ service/amplify/api_op_DeleteApp.go | 6 ++ .../api_op_DeleteBackendEnvironment.go | 6 ++ service/amplify/api_op_DeleteBranch.go | 6 ++ .../amplify/api_op_DeleteDomainAssociation.go | 6 ++ service/amplify/api_op_DeleteJob.go | 6 ++ service/amplify/api_op_DeleteWebhook.go | 6 ++ service/amplify/api_op_GenerateAccessLogs.go | 6 ++ service/amplify/api_op_GetApp.go | 6 ++ service/amplify/api_op_GetArtifactUrl.go | 6 ++ .../amplify/api_op_GetBackendEnvironment.go | 6 ++ service/amplify/api_op_GetBranch.go | 6 ++ .../amplify/api_op_GetDomainAssociation.go | 6 ++ service/amplify/api_op_GetJob.go | 6 ++ service/amplify/api_op_GetWebhook.go | 6 ++ service/amplify/api_op_ListApps.go | 6 ++ service/amplify/api_op_ListArtifacts.go | 6 ++ .../amplify/api_op_ListBackendEnvironments.go | 6 ++ service/amplify/api_op_ListBranches.go | 6 ++ .../amplify/api_op_ListDomainAssociations.go | 6 ++ service/amplify/api_op_ListJobs.go | 6 ++ service/amplify/api_op_ListTagsForResource.go | 6 ++ service/amplify/api_op_ListWebhooks.go | 6 ++ service/amplify/api_op_StartDeployment.go | 6 ++ service/amplify/api_op_StartJob.go | 6 ++ service/amplify/api_op_StopJob.go | 6 ++ service/amplify/api_op_TagResource.go | 6 ++ service/amplify/api_op_UntagResource.go | 6 ++ service/amplify/api_op_UpdateApp.go | 6 ++ service/amplify/api_op_UpdateBranch.go | 6 ++ .../amplify/api_op_UpdateDomainAssociation.go | 6 ++ service/amplify/api_op_UpdateWebhook.go | 6 ++ service/amplify/go.mod | 4 +- service/amplify/go.sum | 2 - service/apigateway/api_client.go | 52 ++++++++-- service/apigateway/api_op_CreateApiKey.go | 6 ++ service/apigateway/api_op_CreateAuthorizer.go | 6 ++ .../api_op_CreateBasePathMapping.go | 6 ++ service/apigateway/api_op_CreateDeployment.go | 6 ++ .../api_op_CreateDocumentationPart.go | 6 ++ .../api_op_CreateDocumentationVersion.go | 6 ++ service/apigateway/api_op_CreateDomainName.go | 6 ++ service/apigateway/api_op_CreateModel.go | 6 ++ .../api_op_CreateRequestValidator.go | 6 ++ service/apigateway/api_op_CreateResource.go | 6 ++ service/apigateway/api_op_CreateRestApi.go | 6 ++ service/apigateway/api_op_CreateStage.go | 6 ++ service/apigateway/api_op_CreateUsagePlan.go | 6 ++ .../apigateway/api_op_CreateUsagePlanKey.go | 6 ++ service/apigateway/api_op_CreateVpcLink.go | 6 ++ service/apigateway/api_op_DeleteApiKey.go | 6 ++ service/apigateway/api_op_DeleteAuthorizer.go | 6 ++ .../api_op_DeleteBasePathMapping.go | 6 ++ .../api_op_DeleteClientCertificate.go | 6 ++ service/apigateway/api_op_DeleteDeployment.go | 6 ++ .../api_op_DeleteDocumentationPart.go | 6 ++ .../api_op_DeleteDocumentationVersion.go | 6 ++ service/apigateway/api_op_DeleteDomainName.go | 6 ++ .../api_op_DeleteGatewayResponse.go | 6 ++ .../apigateway/api_op_DeleteIntegration.go | 6 ++ .../api_op_DeleteIntegrationResponse.go | 6 ++ service/apigateway/api_op_DeleteMethod.go | 6 ++ .../apigateway/api_op_DeleteMethodResponse.go | 6 ++ service/apigateway/api_op_DeleteModel.go | 6 ++ .../api_op_DeleteRequestValidator.go | 6 ++ service/apigateway/api_op_DeleteResource.go | 6 ++ service/apigateway/api_op_DeleteRestApi.go | 6 ++ service/apigateway/api_op_DeleteStage.go | 6 ++ service/apigateway/api_op_DeleteUsagePlan.go | 6 ++ .../apigateway/api_op_DeleteUsagePlanKey.go | 6 ++ service/apigateway/api_op_DeleteVpcLink.go | 6 ++ .../api_op_FlushStageAuthorizersCache.go | 6 ++ service/apigateway/api_op_FlushStageCache.go | 6 ++ .../api_op_GenerateClientCertificate.go | 6 ++ service/apigateway/api_op_GetAccount.go | 6 ++ service/apigateway/api_op_GetApiKey.go | 6 ++ service/apigateway/api_op_GetApiKeys.go | 6 ++ service/apigateway/api_op_GetAuthorizer.go | 6 ++ service/apigateway/api_op_GetAuthorizers.go | 6 ++ .../apigateway/api_op_GetBasePathMapping.go | 6 ++ .../apigateway/api_op_GetBasePathMappings.go | 6 ++ .../apigateway/api_op_GetClientCertificate.go | 6 ++ .../api_op_GetClientCertificates.go | 6 ++ service/apigateway/api_op_GetDeployment.go | 6 ++ service/apigateway/api_op_GetDeployments.go | 6 ++ .../apigateway/api_op_GetDocumentationPart.go | 6 ++ .../api_op_GetDocumentationParts.go | 6 ++ .../api_op_GetDocumentationVersion.go | 6 ++ .../api_op_GetDocumentationVersions.go | 6 ++ service/apigateway/api_op_GetDomainName.go | 6 ++ service/apigateway/api_op_GetDomainNames.go | 6 ++ service/apigateway/api_op_GetExport.go | 6 ++ .../apigateway/api_op_GetGatewayResponse.go | 6 ++ .../apigateway/api_op_GetGatewayResponses.go | 6 ++ service/apigateway/api_op_GetIntegration.go | 6 ++ .../api_op_GetIntegrationResponse.go | 6 ++ service/apigateway/api_op_GetMethod.go | 6 ++ .../apigateway/api_op_GetMethodResponse.go | 6 ++ service/apigateway/api_op_GetModel.go | 6 ++ service/apigateway/api_op_GetModelTemplate.go | 6 ++ service/apigateway/api_op_GetModels.go | 6 ++ .../apigateway/api_op_GetRequestValidator.go | 6 ++ .../apigateway/api_op_GetRequestValidators.go | 6 ++ service/apigateway/api_op_GetResource.go | 6 ++ service/apigateway/api_op_GetResources.go | 6 ++ service/apigateway/api_op_GetRestApi.go | 6 ++ service/apigateway/api_op_GetRestApis.go | 6 ++ service/apigateway/api_op_GetSdk.go | 6 ++ service/apigateway/api_op_GetSdkType.go | 6 ++ service/apigateway/api_op_GetSdkTypes.go | 6 ++ service/apigateway/api_op_GetStage.go | 6 ++ service/apigateway/api_op_GetStages.go | 6 ++ service/apigateway/api_op_GetTags.go | 6 ++ service/apigateway/api_op_GetUsage.go | 6 ++ service/apigateway/api_op_GetUsagePlan.go | 6 ++ service/apigateway/api_op_GetUsagePlanKey.go | 6 ++ service/apigateway/api_op_GetUsagePlanKeys.go | 6 ++ service/apigateway/api_op_GetUsagePlans.go | 6 ++ service/apigateway/api_op_GetVpcLink.go | 6 ++ service/apigateway/api_op_GetVpcLinks.go | 6 ++ service/apigateway/api_op_ImportApiKeys.go | 6 ++ .../api_op_ImportDocumentationParts.go | 6 ++ service/apigateway/api_op_ImportRestApi.go | 6 ++ .../apigateway/api_op_PutGatewayResponse.go | 6 ++ service/apigateway/api_op_PutIntegration.go | 6 ++ .../api_op_PutIntegrationResponse.go | 6 ++ service/apigateway/api_op_PutMethod.go | 6 ++ .../apigateway/api_op_PutMethodResponse.go | 6 ++ service/apigateway/api_op_PutRestApi.go | 6 ++ service/apigateway/api_op_TagResource.go | 6 ++ .../apigateway/api_op_TestInvokeAuthorizer.go | 6 ++ service/apigateway/api_op_TestInvokeMethod.go | 6 ++ service/apigateway/api_op_UntagResource.go | 6 ++ service/apigateway/api_op_UpdateAccount.go | 6 ++ service/apigateway/api_op_UpdateApiKey.go | 6 ++ service/apigateway/api_op_UpdateAuthorizer.go | 6 ++ .../api_op_UpdateBasePathMapping.go | 6 ++ .../api_op_UpdateClientCertificate.go | 6 ++ service/apigateway/api_op_UpdateDeployment.go | 6 ++ .../api_op_UpdateDocumentationPart.go | 6 ++ .../api_op_UpdateDocumentationVersion.go | 6 ++ service/apigateway/api_op_UpdateDomainName.go | 6 ++ .../api_op_UpdateGatewayResponse.go | 6 ++ .../apigateway/api_op_UpdateIntegration.go | 6 ++ .../api_op_UpdateIntegrationResponse.go | 6 ++ service/apigateway/api_op_UpdateMethod.go | 6 ++ .../apigateway/api_op_UpdateMethodResponse.go | 6 ++ service/apigateway/api_op_UpdateModel.go | 6 ++ .../api_op_UpdateRequestValidator.go | 6 ++ service/apigateway/api_op_UpdateResource.go | 6 ++ service/apigateway/api_op_UpdateRestApi.go | 6 ++ service/apigateway/api_op_UpdateStage.go | 6 ++ service/apigateway/api_op_UpdateUsage.go | 6 ++ service/apigateway/api_op_UpdateUsagePlan.go | 6 ++ service/apigateway/api_op_UpdateVpcLink.go | 6 ++ service/apigateway/go.mod | 4 +- service/apigateway/go.sum | 2 - service/apigatewaymanagementapi/api_client.go | 52 ++++++++-- .../api_op_DeleteConnection.go | 6 ++ .../api_op_GetConnection.go | 6 ++ .../api_op_PostToConnection.go | 6 ++ service/apigatewaymanagementapi/go.mod | 4 +- service/apigatewaymanagementapi/go.sum | 2 - service/apigatewayv2/api_client.go | 52 ++++++++-- service/apigatewayv2/api_op_CreateApi.go | 6 ++ .../apigatewayv2/api_op_CreateApiMapping.go | 6 ++ .../apigatewayv2/api_op_CreateAuthorizer.go | 6 ++ .../apigatewayv2/api_op_CreateDeployment.go | 6 ++ .../apigatewayv2/api_op_CreateDomainName.go | 6 ++ .../apigatewayv2/api_op_CreateIntegration.go | 6 ++ .../api_op_CreateIntegrationResponse.go | 6 ++ service/apigatewayv2/api_op_CreateModel.go | 6 ++ service/apigatewayv2/api_op_CreateRoute.go | 6 ++ .../api_op_CreateRouteResponse.go | 6 ++ service/apigatewayv2/api_op_CreateStage.go | 6 ++ service/apigatewayv2/api_op_CreateVpcLink.go | 6 ++ .../api_op_DeleteAccessLogSettings.go | 6 ++ service/apigatewayv2/api_op_DeleteApi.go | 6 ++ .../apigatewayv2/api_op_DeleteApiMapping.go | 6 ++ .../apigatewayv2/api_op_DeleteAuthorizer.go | 6 ++ .../api_op_DeleteCorsConfiguration.go | 6 ++ .../apigatewayv2/api_op_DeleteDeployment.go | 6 ++ .../apigatewayv2/api_op_DeleteDomainName.go | 6 ++ .../apigatewayv2/api_op_DeleteIntegration.go | 6 ++ .../api_op_DeleteIntegrationResponse.go | 6 ++ service/apigatewayv2/api_op_DeleteModel.go | 6 ++ service/apigatewayv2/api_op_DeleteRoute.go | 6 ++ .../api_op_DeleteRouteRequestParameter.go | 6 ++ .../api_op_DeleteRouteResponse.go | 6 ++ .../api_op_DeleteRouteSettings.go | 6 ++ service/apigatewayv2/api_op_DeleteStage.go | 6 ++ service/apigatewayv2/api_op_DeleteVpcLink.go | 6 ++ service/apigatewayv2/api_op_ExportApi.go | 6 ++ service/apigatewayv2/api_op_GetApi.go | 6 ++ service/apigatewayv2/api_op_GetApiMapping.go | 6 ++ service/apigatewayv2/api_op_GetApiMappings.go | 6 ++ service/apigatewayv2/api_op_GetApis.go | 6 ++ service/apigatewayv2/api_op_GetAuthorizer.go | 6 ++ service/apigatewayv2/api_op_GetAuthorizers.go | 6 ++ service/apigatewayv2/api_op_GetDeployment.go | 6 ++ service/apigatewayv2/api_op_GetDeployments.go | 6 ++ service/apigatewayv2/api_op_GetDomainName.go | 6 ++ service/apigatewayv2/api_op_GetDomainNames.go | 6 ++ service/apigatewayv2/api_op_GetIntegration.go | 6 ++ .../api_op_GetIntegrationResponse.go | 6 ++ .../api_op_GetIntegrationResponses.go | 6 ++ .../apigatewayv2/api_op_GetIntegrations.go | 6 ++ service/apigatewayv2/api_op_GetModel.go | 6 ++ .../apigatewayv2/api_op_GetModelTemplate.go | 6 ++ service/apigatewayv2/api_op_GetModels.go | 6 ++ service/apigatewayv2/api_op_GetRoute.go | 6 ++ .../apigatewayv2/api_op_GetRouteResponse.go | 6 ++ .../apigatewayv2/api_op_GetRouteResponses.go | 6 ++ service/apigatewayv2/api_op_GetRoutes.go | 6 ++ service/apigatewayv2/api_op_GetStage.go | 6 ++ service/apigatewayv2/api_op_GetStages.go | 6 ++ service/apigatewayv2/api_op_GetTags.go | 6 ++ service/apigatewayv2/api_op_GetVpcLink.go | 6 ++ service/apigatewayv2/api_op_GetVpcLinks.go | 6 ++ service/apigatewayv2/api_op_ImportApi.go | 6 ++ service/apigatewayv2/api_op_ReimportApi.go | 6 ++ .../api_op_ResetAuthorizersCache.go | 6 ++ service/apigatewayv2/api_op_TagResource.go | 6 ++ service/apigatewayv2/api_op_UntagResource.go | 6 ++ service/apigatewayv2/api_op_UpdateApi.go | 6 ++ .../apigatewayv2/api_op_UpdateApiMapping.go | 6 ++ .../apigatewayv2/api_op_UpdateAuthorizer.go | 6 ++ .../apigatewayv2/api_op_UpdateDeployment.go | 6 ++ .../apigatewayv2/api_op_UpdateDomainName.go | 6 ++ .../apigatewayv2/api_op_UpdateIntegration.go | 6 ++ .../api_op_UpdateIntegrationResponse.go | 6 ++ service/apigatewayv2/api_op_UpdateModel.go | 6 ++ service/apigatewayv2/api_op_UpdateRoute.go | 6 ++ .../api_op_UpdateRouteResponse.go | 6 ++ service/apigatewayv2/api_op_UpdateStage.go | 6 ++ service/apigatewayv2/api_op_UpdateVpcLink.go | 6 ++ service/apigatewayv2/go.mod | 4 +- service/apigatewayv2/go.sum | 2 - service/appconfig/api_client.go | 52 ++++++++-- service/appconfig/api_op_CreateApplication.go | 6 ++ .../api_op_CreateConfigurationProfile.go | 6 ++ .../api_op_CreateDeploymentStrategy.go | 6 ++ service/appconfig/api_op_CreateEnvironment.go | 6 ++ ...api_op_CreateHostedConfigurationVersion.go | 6 ++ service/appconfig/api_op_DeleteApplication.go | 6 ++ .../api_op_DeleteConfigurationProfile.go | 6 ++ .../api_op_DeleteDeploymentStrategy.go | 6 ++ service/appconfig/api_op_DeleteEnvironment.go | 6 ++ ...api_op_DeleteHostedConfigurationVersion.go | 6 ++ service/appconfig/api_op_GetApplication.go | 6 ++ service/appconfig/api_op_GetConfiguration.go | 6 ++ .../api_op_GetConfigurationProfile.go | 6 ++ service/appconfig/api_op_GetDeployment.go | 6 ++ .../appconfig/api_op_GetDeploymentStrategy.go | 6 ++ service/appconfig/api_op_GetEnvironment.go | 6 ++ .../api_op_GetHostedConfigurationVersion.go | 6 ++ service/appconfig/api_op_ListApplications.go | 6 ++ .../api_op_ListConfigurationProfiles.go | 6 ++ .../api_op_ListDeploymentStrategies.go | 6 ++ service/appconfig/api_op_ListDeployments.go | 6 ++ service/appconfig/api_op_ListEnvironments.go | 6 ++ .../api_op_ListHostedConfigurationVersions.go | 6 ++ .../appconfig/api_op_ListTagsForResource.go | 6 ++ service/appconfig/api_op_StartDeployment.go | 6 ++ service/appconfig/api_op_StopDeployment.go | 6 ++ service/appconfig/api_op_TagResource.go | 6 ++ service/appconfig/api_op_UntagResource.go | 6 ++ service/appconfig/api_op_UpdateApplication.go | 6 ++ .../api_op_UpdateConfigurationProfile.go | 6 ++ .../api_op_UpdateDeploymentStrategy.go | 6 ++ service/appconfig/api_op_UpdateEnvironment.go | 6 ++ .../appconfig/api_op_ValidateConfiguration.go | 6 ++ service/appconfig/go.mod | 4 +- service/appconfig/go.sum | 2 - service/appflow/api_client.go | 52 ++++++++-- .../appflow/api_op_CreateConnectorProfile.go | 6 ++ service/appflow/api_op_CreateFlow.go | 6 ++ .../appflow/api_op_DeleteConnectorProfile.go | 6 ++ service/appflow/api_op_DeleteFlow.go | 6 ++ .../appflow/api_op_DescribeConnectorEntity.go | 6 ++ .../api_op_DescribeConnectorProfiles.go | 6 ++ service/appflow/api_op_DescribeConnectors.go | 6 ++ service/appflow/api_op_DescribeFlow.go | 6 ++ .../api_op_DescribeFlowExecutionRecords.go | 6 ++ .../appflow/api_op_ListConnectorEntities.go | 6 ++ service/appflow/api_op_ListFlows.go | 6 ++ service/appflow/api_op_ListTagsForResource.go | 6 ++ service/appflow/api_op_StartFlow.go | 6 ++ service/appflow/api_op_StopFlow.go | 6 ++ service/appflow/api_op_TagResource.go | 6 ++ service/appflow/api_op_UntagResource.go | 6 ++ .../appflow/api_op_UpdateConnectorProfile.go | 6 ++ service/appflow/api_op_UpdateFlow.go | 6 ++ service/appflow/go.mod | 4 +- service/appflow/go.sum | 2 - service/applicationautoscaling/api_client.go | 52 ++++++++-- .../api_op_DeleteScalingPolicy.go | 6 ++ .../api_op_DeleteScheduledAction.go | 6 ++ .../api_op_DeregisterScalableTarget.go | 6 ++ .../api_op_DescribeScalableTargets.go | 6 ++ .../api_op_DescribeScalingActivities.go | 6 ++ .../api_op_DescribeScalingPolicies.go | 6 ++ .../api_op_DescribeScheduledActions.go | 6 ++ .../api_op_PutScalingPolicy.go | 6 ++ .../api_op_PutScheduledAction.go | 6 ++ .../api_op_RegisterScalableTarget.go | 6 ++ service/applicationautoscaling/go.mod | 4 +- service/applicationautoscaling/go.sum | 2 - .../applicationdiscoveryservice/api_client.go | 52 ++++++++-- ...ssociateConfigurationItemsToApplication.go | 6 ++ .../api_op_BatchDeleteImportData.go | 6 ++ .../api_op_CreateApplication.go | 6 ++ .../api_op_CreateTags.go | 6 ++ .../api_op_DeleteApplications.go | 6 ++ .../api_op_DeleteTags.go | 6 ++ .../api_op_DescribeAgents.go | 6 ++ .../api_op_DescribeConfigurations.go | 6 ++ .../api_op_DescribeContinuousExports.go | 6 ++ .../api_op_DescribeExportConfigurations.go | 6 ++ .../api_op_DescribeExportTasks.go | 6 ++ .../api_op_DescribeImportTasks.go | 6 ++ .../api_op_DescribeTags.go | 6 ++ ...ociateConfigurationItemsFromApplication.go | 6 ++ .../api_op_ExportConfigurations.go | 6 ++ .../api_op_GetDiscoverySummary.go | 6 ++ .../api_op_ListConfigurations.go | 6 ++ .../api_op_ListServerNeighbors.go | 6 ++ .../api_op_StartContinuousExport.go | 6 ++ .../api_op_StartDataCollectionByAgentIds.go | 6 ++ .../api_op_StartExportTask.go | 6 ++ .../api_op_StartImportTask.go | 6 ++ .../api_op_StopContinuousExport.go | 6 ++ .../api_op_StopDataCollectionByAgentIds.go | 6 ++ .../api_op_UpdateApplication.go | 6 ++ service/applicationdiscoveryservice/go.mod | 4 +- service/applicationdiscoveryservice/go.sum | 2 - service/applicationinsights/api_client.go | 52 ++++++++-- .../api_op_CreateApplication.go | 6 ++ .../api_op_CreateComponent.go | 6 ++ .../api_op_CreateLogPattern.go | 6 ++ .../api_op_DeleteApplication.go | 6 ++ .../api_op_DeleteComponent.go | 6 ++ .../api_op_DeleteLogPattern.go | 6 ++ .../api_op_DescribeApplication.go | 6 ++ .../api_op_DescribeComponent.go | 6 ++ .../api_op_DescribeComponentConfiguration.go | 6 ++ ...ibeComponentConfigurationRecommendation.go | 6 ++ .../api_op_DescribeLogPattern.go | 6 ++ .../api_op_DescribeObservation.go | 6 ++ .../api_op_DescribeProblem.go | 6 ++ .../api_op_DescribeProblemObservations.go | 6 ++ .../api_op_ListApplications.go | 6 ++ .../api_op_ListComponents.go | 6 ++ .../api_op_ListConfigurationHistory.go | 6 ++ .../api_op_ListLogPatternSets.go | 6 ++ .../api_op_ListLogPatterns.go | 6 ++ .../api_op_ListProblems.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../applicationinsights/api_op_TagResource.go | 6 ++ .../api_op_UntagResource.go | 6 ++ .../api_op_UpdateApplication.go | 6 ++ .../api_op_UpdateComponent.go | 6 ++ .../api_op_UpdateComponentConfiguration.go | 6 ++ .../api_op_UpdateLogPattern.go | 6 ++ service/applicationinsights/go.mod | 4 +- service/applicationinsights/go.sum | 2 - service/appmesh/api_client.go | 52 ++++++++-- service/appmesh/api_op_CreateGatewayRoute.go | 6 ++ service/appmesh/api_op_CreateMesh.go | 6 ++ service/appmesh/api_op_CreateRoute.go | 6 ++ .../appmesh/api_op_CreateVirtualGateway.go | 6 ++ service/appmesh/api_op_CreateVirtualNode.go | 6 ++ service/appmesh/api_op_CreateVirtualRouter.go | 6 ++ .../appmesh/api_op_CreateVirtualService.go | 6 ++ service/appmesh/api_op_DeleteGatewayRoute.go | 6 ++ service/appmesh/api_op_DeleteMesh.go | 6 ++ service/appmesh/api_op_DeleteRoute.go | 6 ++ .../appmesh/api_op_DeleteVirtualGateway.go | 6 ++ service/appmesh/api_op_DeleteVirtualNode.go | 6 ++ service/appmesh/api_op_DeleteVirtualRouter.go | 6 ++ .../appmesh/api_op_DeleteVirtualService.go | 6 ++ .../appmesh/api_op_DescribeGatewayRoute.go | 6 ++ service/appmesh/api_op_DescribeMesh.go | 6 ++ service/appmesh/api_op_DescribeRoute.go | 6 ++ .../appmesh/api_op_DescribeVirtualGateway.go | 6 ++ service/appmesh/api_op_DescribeVirtualNode.go | 6 ++ .../appmesh/api_op_DescribeVirtualRouter.go | 6 ++ .../appmesh/api_op_DescribeVirtualService.go | 6 ++ service/appmesh/api_op_ListGatewayRoutes.go | 6 ++ service/appmesh/api_op_ListMeshes.go | 6 ++ service/appmesh/api_op_ListRoutes.go | 6 ++ service/appmesh/api_op_ListTagsForResource.go | 6 ++ service/appmesh/api_op_ListVirtualGateways.go | 6 ++ service/appmesh/api_op_ListVirtualNodes.go | 6 ++ service/appmesh/api_op_ListVirtualRouters.go | 6 ++ service/appmesh/api_op_ListVirtualServices.go | 6 ++ service/appmesh/api_op_TagResource.go | 6 ++ service/appmesh/api_op_UntagResource.go | 6 ++ service/appmesh/api_op_UpdateGatewayRoute.go | 6 ++ service/appmesh/api_op_UpdateMesh.go | 6 ++ service/appmesh/api_op_UpdateRoute.go | 6 ++ .../appmesh/api_op_UpdateVirtualGateway.go | 6 ++ service/appmesh/api_op_UpdateVirtualNode.go | 6 ++ service/appmesh/api_op_UpdateVirtualRouter.go | 6 ++ .../appmesh/api_op_UpdateVirtualService.go | 6 ++ service/appmesh/go.mod | 4 +- service/appmesh/go.sum | 2 - service/appstream/api_client.go | 52 ++++++++-- service/appstream/api_op_AssociateFleet.go | 6 ++ .../api_op_BatchAssociateUserStack.go | 6 ++ .../api_op_BatchDisassociateUserStack.go | 6 ++ service/appstream/api_op_CopyImage.go | 6 ++ .../appstream/api_op_CreateDirectoryConfig.go | 6 ++ service/appstream/api_op_CreateFleet.go | 6 ++ .../appstream/api_op_CreateImageBuilder.go | 6 ++ .../api_op_CreateImageBuilderStreamingURL.go | 6 ++ service/appstream/api_op_CreateStack.go | 6 ++ .../appstream/api_op_CreateStreamingURL.go | 6 ++ .../api_op_CreateUsageReportSubscription.go | 6 ++ service/appstream/api_op_CreateUser.go | 6 ++ .../appstream/api_op_DeleteDirectoryConfig.go | 6 ++ service/appstream/api_op_DeleteFleet.go | 6 ++ service/appstream/api_op_DeleteImage.go | 6 ++ .../appstream/api_op_DeleteImageBuilder.go | 6 ++ .../api_op_DeleteImagePermissions.go | 6 ++ service/appstream/api_op_DeleteStack.go | 6 ++ .../api_op_DeleteUsageReportSubscription.go | 6 ++ service/appstream/api_op_DeleteUser.go | 6 ++ .../api_op_DescribeDirectoryConfigs.go | 6 ++ service/appstream/api_op_DescribeFleets.go | 6 ++ .../appstream/api_op_DescribeImageBuilders.go | 6 ++ .../api_op_DescribeImagePermissions.go | 6 ++ service/appstream/api_op_DescribeImages.go | 6 ++ service/appstream/api_op_DescribeSessions.go | 6 ++ service/appstream/api_op_DescribeStacks.go | 6 ++ ...api_op_DescribeUsageReportSubscriptions.go | 6 ++ .../api_op_DescribeUserStackAssociations.go | 6 ++ service/appstream/api_op_DescribeUsers.go | 6 ++ service/appstream/api_op_DisableUser.go | 6 ++ service/appstream/api_op_DisassociateFleet.go | 6 ++ service/appstream/api_op_EnableUser.go | 6 ++ service/appstream/api_op_ExpireSession.go | 6 ++ .../appstream/api_op_ListAssociatedFleets.go | 6 ++ .../appstream/api_op_ListAssociatedStacks.go | 6 ++ .../appstream/api_op_ListTagsForResource.go | 6 ++ service/appstream/api_op_StartFleet.go | 6 ++ service/appstream/api_op_StartImageBuilder.go | 6 ++ service/appstream/api_op_StopFleet.go | 6 ++ service/appstream/api_op_StopImageBuilder.go | 6 ++ service/appstream/api_op_TagResource.go | 6 ++ service/appstream/api_op_UntagResource.go | 6 ++ .../appstream/api_op_UpdateDirectoryConfig.go | 6 ++ service/appstream/api_op_UpdateFleet.go | 6 ++ .../api_op_UpdateImagePermissions.go | 6 ++ service/appstream/api_op_UpdateStack.go | 6 ++ service/appstream/go.mod | 4 +- service/appstream/go.sum | 2 - service/appsync/api_client.go | 52 ++++++++-- service/appsync/api_op_CreateApiCache.go | 6 ++ service/appsync/api_op_CreateApiKey.go | 6 ++ service/appsync/api_op_CreateDataSource.go | 6 ++ service/appsync/api_op_CreateFunction.go | 6 ++ service/appsync/api_op_CreateGraphqlApi.go | 6 ++ service/appsync/api_op_CreateResolver.go | 6 ++ service/appsync/api_op_CreateType.go | 6 ++ service/appsync/api_op_DeleteApiCache.go | 6 ++ service/appsync/api_op_DeleteApiKey.go | 6 ++ service/appsync/api_op_DeleteDataSource.go | 6 ++ service/appsync/api_op_DeleteFunction.go | 6 ++ service/appsync/api_op_DeleteGraphqlApi.go | 6 ++ service/appsync/api_op_DeleteResolver.go | 6 ++ service/appsync/api_op_DeleteType.go | 6 ++ service/appsync/api_op_FlushApiCache.go | 6 ++ service/appsync/api_op_GetApiCache.go | 6 ++ service/appsync/api_op_GetDataSource.go | 6 ++ service/appsync/api_op_GetFunction.go | 6 ++ service/appsync/api_op_GetGraphqlApi.go | 6 ++ .../appsync/api_op_GetIntrospectionSchema.go | 6 ++ service/appsync/api_op_GetResolver.go | 6 ++ .../appsync/api_op_GetSchemaCreationStatus.go | 6 ++ service/appsync/api_op_GetType.go | 6 ++ service/appsync/api_op_ListApiKeys.go | 6 ++ service/appsync/api_op_ListDataSources.go | 6 ++ service/appsync/api_op_ListFunctions.go | 6 ++ service/appsync/api_op_ListGraphqlApis.go | 6 ++ service/appsync/api_op_ListResolvers.go | 6 ++ .../appsync/api_op_ListResolversByFunction.go | 6 ++ service/appsync/api_op_ListTagsForResource.go | 6 ++ service/appsync/api_op_ListTypes.go | 6 ++ service/appsync/api_op_StartSchemaCreation.go | 6 ++ service/appsync/api_op_TagResource.go | 6 ++ service/appsync/api_op_UntagResource.go | 6 ++ service/appsync/api_op_UpdateApiCache.go | 6 ++ service/appsync/api_op_UpdateApiKey.go | 6 ++ service/appsync/api_op_UpdateDataSource.go | 6 ++ service/appsync/api_op_UpdateFunction.go | 6 ++ service/appsync/api_op_UpdateGraphqlApi.go | 6 ++ service/appsync/api_op_UpdateResolver.go | 6 ++ service/appsync/api_op_UpdateType.go | 6 ++ service/appsync/go.mod | 4 +- service/appsync/go.sum | 2 - service/athena/api_client.go | 52 ++++++++-- service/athena/api_op_BatchGetNamedQuery.go | 6 ++ .../athena/api_op_BatchGetQueryExecution.go | 6 ++ service/athena/api_op_CreateDataCatalog.go | 6 ++ service/athena/api_op_CreateNamedQuery.go | 6 ++ service/athena/api_op_CreateWorkGroup.go | 6 ++ service/athena/api_op_DeleteDataCatalog.go | 6 ++ service/athena/api_op_DeleteNamedQuery.go | 6 ++ service/athena/api_op_DeleteWorkGroup.go | 6 ++ service/athena/api_op_GetDataCatalog.go | 6 ++ service/athena/api_op_GetDatabase.go | 6 ++ service/athena/api_op_GetNamedQuery.go | 6 ++ service/athena/api_op_GetQueryExecution.go | 6 ++ service/athena/api_op_GetQueryResults.go | 6 ++ service/athena/api_op_GetTableMetadata.go | 6 ++ service/athena/api_op_GetWorkGroup.go | 6 ++ service/athena/api_op_ListDataCatalogs.go | 6 ++ service/athena/api_op_ListDatabases.go | 6 ++ service/athena/api_op_ListNamedQueries.go | 6 ++ service/athena/api_op_ListQueryExecutions.go | 6 ++ service/athena/api_op_ListTableMetadata.go | 6 ++ service/athena/api_op_ListTagsForResource.go | 6 ++ service/athena/api_op_ListWorkGroups.go | 6 ++ service/athena/api_op_StartQueryExecution.go | 6 ++ service/athena/api_op_StopQueryExecution.go | 6 ++ service/athena/api_op_TagResource.go | 6 ++ service/athena/api_op_UntagResource.go | 6 ++ service/athena/api_op_UpdateDataCatalog.go | 6 ++ service/athena/api_op_UpdateWorkGroup.go | 6 ++ service/athena/go.mod | 4 +- service/athena/go.sum | 2 - service/autoscaling/api_client.go | 52 ++++++++-- service/autoscaling/api_op_AttachInstances.go | 6 ++ .../api_op_AttachLoadBalancerTargetGroups.go | 6 ++ .../autoscaling/api_op_AttachLoadBalancers.go | 6 ++ .../api_op_BatchDeleteScheduledAction.go | 6 ++ ...i_op_BatchPutScheduledUpdateGroupAction.go | 6 ++ .../api_op_CancelInstanceRefresh.go | 6 ++ .../api_op_CompleteLifecycleAction.go | 6 ++ .../api_op_CreateAutoScalingGroup.go | 6 ++ .../api_op_CreateLaunchConfiguration.go | 6 ++ .../autoscaling/api_op_CreateOrUpdateTags.go | 6 ++ .../api_op_DeleteAutoScalingGroup.go | 6 ++ .../api_op_DeleteLaunchConfiguration.go | 6 ++ .../autoscaling/api_op_DeleteLifecycleHook.go | 6 ++ .../api_op_DeleteNotificationConfiguration.go | 6 ++ service/autoscaling/api_op_DeletePolicy.go | 6 ++ .../api_op_DeleteScheduledAction.go | 6 ++ service/autoscaling/api_op_DeleteTags.go | 6 ++ .../api_op_DescribeAccountLimits.go | 6 ++ .../api_op_DescribeAdjustmentTypes.go | 6 ++ .../api_op_DescribeAutoScalingGroups.go | 6 ++ .../api_op_DescribeAutoScalingInstances.go | 6 ++ ...op_DescribeAutoScalingNotificationTypes.go | 6 ++ .../api_op_DescribeInstanceRefreshes.go | 6 ++ .../api_op_DescribeLaunchConfigurations.go | 6 ++ .../api_op_DescribeLifecycleHookTypes.go | 6 ++ .../api_op_DescribeLifecycleHooks.go | 6 ++ ...api_op_DescribeLoadBalancerTargetGroups.go | 6 ++ .../api_op_DescribeLoadBalancers.go | 6 ++ .../api_op_DescribeMetricCollectionTypes.go | 6 ++ ...i_op_DescribeNotificationConfigurations.go | 6 ++ .../autoscaling/api_op_DescribePolicies.go | 6 ++ .../api_op_DescribeScalingActivities.go | 6 ++ .../api_op_DescribeScalingProcessTypes.go | 6 ++ .../api_op_DescribeScheduledActions.go | 6 ++ service/autoscaling/api_op_DescribeTags.go | 6 ++ .../api_op_DescribeTerminationPolicyTypes.go | 6 ++ service/autoscaling/api_op_DetachInstances.go | 6 ++ .../api_op_DetachLoadBalancerTargetGroups.go | 6 ++ .../autoscaling/api_op_DetachLoadBalancers.go | 6 ++ .../api_op_DisableMetricsCollection.go | 6 ++ .../api_op_EnableMetricsCollection.go | 6 ++ service/autoscaling/api_op_EnterStandby.go | 6 ++ service/autoscaling/api_op_ExecutePolicy.go | 6 ++ service/autoscaling/api_op_ExitStandby.go | 6 ++ .../autoscaling/api_op_PutLifecycleHook.go | 6 ++ .../api_op_PutNotificationConfiguration.go | 6 ++ .../autoscaling/api_op_PutScalingPolicy.go | 6 ++ .../api_op_PutScheduledUpdateGroupAction.go | 6 ++ .../api_op_RecordLifecycleActionHeartbeat.go | 6 ++ service/autoscaling/api_op_ResumeProcesses.go | 6 ++ .../autoscaling/api_op_SetDesiredCapacity.go | 6 ++ .../autoscaling/api_op_SetInstanceHealth.go | 6 ++ .../api_op_SetInstanceProtection.go | 6 ++ .../api_op_StartInstanceRefresh.go | 6 ++ .../autoscaling/api_op_SuspendProcesses.go | 6 ++ ..._op_TerminateInstanceInAutoScalingGroup.go | 6 ++ .../api_op_UpdateAutoScalingGroup.go | 6 ++ service/autoscaling/go.mod | 4 +- service/autoscaling/go.sum | 2 - service/autoscalingplans/api_client.go | 52 ++++++++-- .../api_op_CreateScalingPlan.go | 6 ++ .../api_op_DeleteScalingPlan.go | 6 ++ .../api_op_DescribeScalingPlanResources.go | 6 ++ .../api_op_DescribeScalingPlans.go | 6 ++ ...i_op_GetScalingPlanResourceForecastData.go | 6 ++ .../api_op_UpdateScalingPlan.go | 6 ++ service/autoscalingplans/go.mod | 4 +- service/autoscalingplans/go.sum | 2 - service/backup/api_client.go | 52 ++++++++-- service/backup/api_op_CreateBackupPlan.go | 6 ++ .../backup/api_op_CreateBackupSelection.go | 6 ++ service/backup/api_op_CreateBackupVault.go | 6 ++ service/backup/api_op_DeleteBackupPlan.go | 6 ++ .../backup/api_op_DeleteBackupSelection.go | 6 ++ service/backup/api_op_DeleteBackupVault.go | 6 ++ .../api_op_DeleteBackupVaultAccessPolicy.go | 6 ++ .../api_op_DeleteBackupVaultNotifications.go | 6 ++ service/backup/api_op_DeleteRecoveryPoint.go | 6 ++ service/backup/api_op_DescribeBackupJob.go | 6 ++ service/backup/api_op_DescribeBackupVault.go | 6 ++ service/backup/api_op_DescribeCopyJob.go | 6 ++ .../api_op_DescribeProtectedResource.go | 6 ++ .../backup/api_op_DescribeRecoveryPoint.go | 6 ++ .../backup/api_op_DescribeRegionSettings.go | 6 ++ service/backup/api_op_DescribeRestoreJob.go | 6 ++ .../backup/api_op_ExportBackupPlanTemplate.go | 6 ++ service/backup/api_op_GetBackupPlan.go | 6 ++ .../backup/api_op_GetBackupPlanFromJSON.go | 6 ++ .../api_op_GetBackupPlanFromTemplate.go | 6 ++ service/backup/api_op_GetBackupSelection.go | 6 ++ .../api_op_GetBackupVaultAccessPolicy.go | 6 ++ .../api_op_GetBackupVaultNotifications.go | 6 ++ .../api_op_GetRecoveryPointRestoreMetadata.go | 6 ++ .../api_op_GetSupportedResourceTypes.go | 6 ++ service/backup/api_op_ListBackupJobs.go | 6 ++ .../backup/api_op_ListBackupPlanTemplates.go | 6 ++ .../backup/api_op_ListBackupPlanVersions.go | 6 ++ service/backup/api_op_ListBackupPlans.go | 6 ++ service/backup/api_op_ListBackupSelections.go | 6 ++ service/backup/api_op_ListBackupVaults.go | 6 ++ service/backup/api_op_ListCopyJobs.go | 6 ++ .../backup/api_op_ListProtectedResources.go | 6 ++ .../api_op_ListRecoveryPointsByBackupVault.go | 6 ++ .../api_op_ListRecoveryPointsByResource.go | 6 ++ service/backup/api_op_ListRestoreJobs.go | 6 ++ service/backup/api_op_ListTags.go | 6 ++ .../api_op_PutBackupVaultAccessPolicy.go | 6 ++ .../api_op_PutBackupVaultNotifications.go | 6 ++ service/backup/api_op_StartBackupJob.go | 6 ++ service/backup/api_op_StartCopyJob.go | 6 ++ service/backup/api_op_StartRestoreJob.go | 6 ++ service/backup/api_op_StopBackupJob.go | 6 ++ service/backup/api_op_TagResource.go | 6 ++ service/backup/api_op_UntagResource.go | 6 ++ service/backup/api_op_UpdateBackupPlan.go | 6 ++ .../api_op_UpdateRecoveryPointLifecycle.go | 6 ++ service/backup/api_op_UpdateRegionSettings.go | 6 ++ service/backup/go.mod | 4 +- service/backup/go.sum | 2 - service/batch/api_client.go | 52 ++++++++-- service/batch/api_op_CancelJob.go | 6 ++ .../batch/api_op_CreateComputeEnvironment.go | 6 ++ service/batch/api_op_CreateJobQueue.go | 6 ++ .../batch/api_op_DeleteComputeEnvironment.go | 6 ++ service/batch/api_op_DeleteJobQueue.go | 6 ++ .../batch/api_op_DeregisterJobDefinition.go | 6 ++ .../api_op_DescribeComputeEnvironments.go | 6 ++ .../batch/api_op_DescribeJobDefinitions.go | 6 ++ service/batch/api_op_DescribeJobQueues.go | 6 ++ service/batch/api_op_DescribeJobs.go | 6 ++ service/batch/api_op_ListJobs.go | 6 ++ service/batch/api_op_ListTagsForResource.go | 6 ++ service/batch/api_op_RegisterJobDefinition.go | 6 ++ service/batch/api_op_SubmitJob.go | 6 ++ service/batch/api_op_TagResource.go | 6 ++ service/batch/api_op_TerminateJob.go | 6 ++ service/batch/api_op_UntagResource.go | 6 ++ .../batch/api_op_UpdateComputeEnvironment.go | 6 ++ service/batch/api_op_UpdateJobQueue.go | 6 ++ service/batch/go.mod | 4 +- service/batch/go.sum | 2 - service/braket/api_client.go | 52 ++++++++-- service/braket/api_op_CancelQuantumTask.go | 6 ++ service/braket/api_op_CreateQuantumTask.go | 6 ++ service/braket/api_op_GetDevice.go | 6 ++ service/braket/api_op_GetQuantumTask.go | 6 ++ service/braket/api_op_SearchDevices.go | 6 ++ service/braket/api_op_SearchQuantumTasks.go | 6 ++ service/braket/go.mod | 4 +- service/braket/go.sum | 2 - service/budgets/api_client.go | 52 ++++++++-- service/budgets/api_op_CreateBudget.go | 6 ++ service/budgets/api_op_CreateBudgetAction.go | 6 ++ service/budgets/api_op_CreateNotification.go | 6 ++ service/budgets/api_op_CreateSubscriber.go | 6 ++ service/budgets/api_op_DeleteBudget.go | 6 ++ service/budgets/api_op_DeleteBudgetAction.go | 6 ++ service/budgets/api_op_DeleteNotification.go | 6 ++ service/budgets/api_op_DeleteSubscriber.go | 6 ++ service/budgets/api_op_DescribeBudget.go | 6 ++ .../budgets/api_op_DescribeBudgetAction.go | 6 ++ .../api_op_DescribeBudgetActionHistories.go | 6 ++ .../api_op_DescribeBudgetActionsForAccount.go | 6 ++ .../api_op_DescribeBudgetActionsForBudget.go | 6 ++ ...api_op_DescribeBudgetPerformanceHistory.go | 6 ++ service/budgets/api_op_DescribeBudgets.go | 6 ++ .../api_op_DescribeNotificationsForBudget.go | 6 ++ ...i_op_DescribeSubscribersForNotification.go | 6 ++ service/budgets/api_op_ExecuteBudgetAction.go | 6 ++ service/budgets/api_op_UpdateBudget.go | 6 ++ service/budgets/api_op_UpdateBudgetAction.go | 6 ++ service/budgets/api_op_UpdateNotification.go | 6 ++ service/budgets/api_op_UpdateSubscriber.go | 6 ++ service/budgets/go.mod | 4 +- service/budgets/go.sum | 2 - service/chime/api_client.go | 52 ++++++++-- .../api_op_AssociatePhoneNumberWithUser.go | 6 ++ ...AssociatePhoneNumbersWithVoiceConnector.go | 6 ++ ...iatePhoneNumbersWithVoiceConnectorGroup.go | 6 ++ ...ssociateSigninDelegateGroupsWithAccount.go | 6 ++ service/chime/api_op_BatchCreateAttendee.go | 6 ++ .../chime/api_op_BatchCreateRoomMembership.go | 6 ++ .../chime/api_op_BatchDeletePhoneNumber.go | 6 ++ service/chime/api_op_BatchSuspendUser.go | 6 ++ service/chime/api_op_BatchUnsuspendUser.go | 6 ++ .../chime/api_op_BatchUpdatePhoneNumber.go | 6 ++ service/chime/api_op_BatchUpdateUser.go | 6 ++ service/chime/api_op_CreateAccount.go | 6 ++ service/chime/api_op_CreateAttendee.go | 6 ++ service/chime/api_op_CreateBot.go | 6 ++ service/chime/api_op_CreateMeeting.go | 6 ++ .../api_op_CreateMeetingWithAttendees.go | 6 ++ .../chime/api_op_CreatePhoneNumberOrder.go | 6 ++ service/chime/api_op_CreateProxySession.go | 6 ++ service/chime/api_op_CreateRoom.go | 6 ++ service/chime/api_op_CreateRoomMembership.go | 6 ++ service/chime/api_op_CreateUser.go | 6 ++ service/chime/api_op_CreateVoiceConnector.go | 6 ++ .../chime/api_op_CreateVoiceConnectorGroup.go | 6 ++ service/chime/api_op_DeleteAccount.go | 6 ++ service/chime/api_op_DeleteAttendee.go | 6 ++ .../chime/api_op_DeleteEventsConfiguration.go | 6 ++ service/chime/api_op_DeleteMeeting.go | 6 ++ service/chime/api_op_DeletePhoneNumber.go | 6 ++ service/chime/api_op_DeleteProxySession.go | 6 ++ service/chime/api_op_DeleteRoom.go | 6 ++ service/chime/api_op_DeleteRoomMembership.go | 6 ++ service/chime/api_op_DeleteVoiceConnector.go | 6 ++ ...eConnectorEmergencyCallingConfiguration.go | 6 ++ .../chime/api_op_DeleteVoiceConnectorGroup.go | 6 ++ .../api_op_DeleteVoiceConnectorOrigination.go | 6 ++ .../chime/api_op_DeleteVoiceConnectorProxy.go | 6 ++ ...eteVoiceConnectorStreamingConfiguration.go | 6 ++ .../api_op_DeleteVoiceConnectorTermination.go | 6 ++ ...eteVoiceConnectorTerminationCredentials.go | 6 ++ .../api_op_DisassociatePhoneNumberFromUser.go | 6 ++ ...associatePhoneNumbersFromVoiceConnector.go | 6 ++ ...iatePhoneNumbersFromVoiceConnectorGroup.go | 6 ++ ...ssociateSigninDelegateGroupsFromAccount.go | 6 ++ service/chime/api_op_GetAccount.go | 6 ++ service/chime/api_op_GetAccountSettings.go | 6 ++ service/chime/api_op_GetAttendee.go | 6 ++ service/chime/api_op_GetBot.go | 6 ++ .../chime/api_op_GetEventsConfiguration.go | 6 ++ service/chime/api_op_GetGlobalSettings.go | 6 ++ service/chime/api_op_GetMeeting.go | 6 ++ service/chime/api_op_GetPhoneNumber.go | 6 ++ service/chime/api_op_GetPhoneNumberOrder.go | 6 ++ .../chime/api_op_GetPhoneNumberSettings.go | 6 ++ service/chime/api_op_GetProxySession.go | 6 ++ service/chime/api_op_GetRetentionSettings.go | 6 ++ service/chime/api_op_GetRoom.go | 6 ++ service/chime/api_op_GetUser.go | 6 ++ service/chime/api_op_GetUserSettings.go | 6 ++ service/chime/api_op_GetVoiceConnector.go | 6 ++ ...eConnectorEmergencyCallingConfiguration.go | 6 ++ .../chime/api_op_GetVoiceConnectorGroup.go | 6 ++ ...p_GetVoiceConnectorLoggingConfiguration.go | 6 ++ .../api_op_GetVoiceConnectorOrigination.go | 6 ++ .../chime/api_op_GetVoiceConnectorProxy.go | 6 ++ ...GetVoiceConnectorStreamingConfiguration.go | 6 ++ .../api_op_GetVoiceConnectorTermination.go | 6 ++ ...i_op_GetVoiceConnectorTerminationHealth.go | 6 ++ service/chime/api_op_InviteUsers.go | 6 ++ service/chime/api_op_ListAccounts.go | 6 ++ service/chime/api_op_ListAttendeeTags.go | 6 ++ service/chime/api_op_ListAttendees.go | 6 ++ service/chime/api_op_ListBots.go | 6 ++ service/chime/api_op_ListMeetingTags.go | 6 ++ service/chime/api_op_ListMeetings.go | 6 ++ service/chime/api_op_ListPhoneNumberOrders.go | 6 ++ service/chime/api_op_ListPhoneNumbers.go | 6 ++ service/chime/api_op_ListProxySessions.go | 6 ++ service/chime/api_op_ListRoomMemberships.go | 6 ++ service/chime/api_op_ListRooms.go | 6 ++ service/chime/api_op_ListTagsForResource.go | 6 ++ service/chime/api_op_ListUsers.go | 6 ++ .../chime/api_op_ListVoiceConnectorGroups.go | 6 ++ ...istVoiceConnectorTerminationCredentials.go | 6 ++ service/chime/api_op_ListVoiceConnectors.go | 6 ++ service/chime/api_op_LogoutUser.go | 6 ++ .../chime/api_op_PutEventsConfiguration.go | 6 ++ service/chime/api_op_PutRetentionSettings.go | 6 ++ ...eConnectorEmergencyCallingConfiguration.go | 6 ++ ...p_PutVoiceConnectorLoggingConfiguration.go | 6 ++ .../api_op_PutVoiceConnectorOrigination.go | 6 ++ .../chime/api_op_PutVoiceConnectorProxy.go | 6 ++ ...PutVoiceConnectorStreamingConfiguration.go | 6 ++ .../api_op_PutVoiceConnectorTermination.go | 6 ++ ...PutVoiceConnectorTerminationCredentials.go | 6 ++ .../chime/api_op_RedactConversationMessage.go | 6 ++ service/chime/api_op_RedactRoomMessage.go | 6 ++ .../chime/api_op_RegenerateSecurityToken.go | 6 ++ service/chime/api_op_ResetPersonalPIN.go | 6 ++ service/chime/api_op_RestorePhoneNumber.go | 6 ++ .../api_op_SearchAvailablePhoneNumbers.go | 6 ++ service/chime/api_op_TagAttendee.go | 6 ++ service/chime/api_op_TagMeeting.go | 6 ++ service/chime/api_op_TagResource.go | 6 ++ service/chime/api_op_UntagAttendee.go | 6 ++ service/chime/api_op_UntagMeeting.go | 6 ++ service/chime/api_op_UntagResource.go | 6 ++ service/chime/api_op_UpdateAccount.go | 6 ++ service/chime/api_op_UpdateAccountSettings.go | 6 ++ service/chime/api_op_UpdateBot.go | 6 ++ service/chime/api_op_UpdateGlobalSettings.go | 6 ++ service/chime/api_op_UpdatePhoneNumber.go | 6 ++ .../chime/api_op_UpdatePhoneNumberSettings.go | 6 ++ service/chime/api_op_UpdateProxySession.go | 6 ++ service/chime/api_op_UpdateRoom.go | 6 ++ service/chime/api_op_UpdateRoomMembership.go | 6 ++ service/chime/api_op_UpdateUser.go | 6 ++ service/chime/api_op_UpdateUserSettings.go | 6 ++ service/chime/api_op_UpdateVoiceConnector.go | 6 ++ .../chime/api_op_UpdateVoiceConnectorGroup.go | 6 ++ service/chime/go.mod | 4 +- service/chime/go.sum | 2 - service/cloud9/api_client.go | 52 ++++++++-- service/cloud9/api_op_CreateEnvironmentEC2.go | 6 ++ .../api_op_CreateEnvironmentMembership.go | 6 ++ service/cloud9/api_op_DeleteEnvironment.go | 6 ++ .../api_op_DeleteEnvironmentMembership.go | 6 ++ .../api_op_DescribeEnvironmentMemberships.go | 6 ++ .../api_op_DescribeEnvironmentStatus.go | 6 ++ service/cloud9/api_op_DescribeEnvironments.go | 6 ++ service/cloud9/api_op_ListEnvironments.go | 6 ++ service/cloud9/api_op_ListTagsForResource.go | 6 ++ service/cloud9/api_op_TagResource.go | 6 ++ service/cloud9/api_op_UntagResource.go | 6 ++ service/cloud9/api_op_UpdateEnvironment.go | 6 ++ .../api_op_UpdateEnvironmentMembership.go | 6 ++ service/cloud9/go.mod | 4 +- service/cloud9/go.sum | 2 - service/clouddirectory/api_client.go | 52 ++++++++-- .../clouddirectory/api_op_AddFacetToObject.go | 6 ++ service/clouddirectory/api_op_ApplySchema.go | 6 ++ service/clouddirectory/api_op_AttachObject.go | 6 ++ service/clouddirectory/api_op_AttachPolicy.go | 6 ++ .../clouddirectory/api_op_AttachToIndex.go | 6 ++ .../clouddirectory/api_op_AttachTypedLink.go | 6 ++ service/clouddirectory/api_op_BatchRead.go | 6 ++ service/clouddirectory/api_op_BatchWrite.go | 6 ++ .../clouddirectory/api_op_CreateDirectory.go | 6 ++ service/clouddirectory/api_op_CreateFacet.go | 6 ++ service/clouddirectory/api_op_CreateIndex.go | 6 ++ service/clouddirectory/api_op_CreateObject.go | 6 ++ service/clouddirectory/api_op_CreateSchema.go | 6 ++ .../api_op_CreateTypedLinkFacet.go | 6 ++ .../clouddirectory/api_op_DeleteDirectory.go | 6 ++ service/clouddirectory/api_op_DeleteFacet.go | 6 ++ service/clouddirectory/api_op_DeleteObject.go | 6 ++ service/clouddirectory/api_op_DeleteSchema.go | 6 ++ .../api_op_DeleteTypedLinkFacet.go | 6 ++ .../clouddirectory/api_op_DetachFromIndex.go | 6 ++ service/clouddirectory/api_op_DetachObject.go | 6 ++ service/clouddirectory/api_op_DetachPolicy.go | 6 ++ .../clouddirectory/api_op_DetachTypedLink.go | 6 ++ .../clouddirectory/api_op_DisableDirectory.go | 6 ++ .../clouddirectory/api_op_EnableDirectory.go | 6 ++ .../api_op_GetAppliedSchemaVersion.go | 6 ++ service/clouddirectory/api_op_GetDirectory.go | 6 ++ service/clouddirectory/api_op_GetFacet.go | 6 ++ .../api_op_GetLinkAttributes.go | 6 ++ .../api_op_GetObjectAttributes.go | 6 ++ .../api_op_GetObjectInformation.go | 6 ++ .../clouddirectory/api_op_GetSchemaAsJson.go | 6 ++ .../api_op_GetTypedLinkFacetInformation.go | 6 ++ .../api_op_ListAppliedSchemaArns.go | 6 ++ .../api_op_ListAttachedIndices.go | 6 ++ .../api_op_ListDevelopmentSchemaArns.go | 6 ++ .../clouddirectory/api_op_ListDirectories.go | 6 ++ .../api_op_ListFacetAttributes.go | 6 ++ .../clouddirectory/api_op_ListFacetNames.go | 6 ++ .../api_op_ListIncomingTypedLinks.go | 6 ++ service/clouddirectory/api_op_ListIndex.go | 6 ++ .../api_op_ListManagedSchemaArns.go | 6 ++ .../api_op_ListObjectAttributes.go | 6 ++ .../api_op_ListObjectChildren.go | 6 ++ .../api_op_ListObjectParentPaths.go | 6 ++ .../api_op_ListObjectParents.go | 6 ++ .../api_op_ListObjectPolicies.go | 6 ++ .../api_op_ListOutgoingTypedLinks.go | 6 ++ .../api_op_ListPolicyAttachments.go | 6 ++ .../api_op_ListPublishedSchemaArns.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ListTypedLinkFacetAttributes.go | 6 ++ .../api_op_ListTypedLinkFacetNames.go | 6 ++ service/clouddirectory/api_op_LookupPolicy.go | 6 ++ .../clouddirectory/api_op_PublishSchema.go | 6 ++ .../api_op_PutSchemaFromJson.go | 6 ++ .../api_op_RemoveFacetFromObject.go | 6 ++ service/clouddirectory/api_op_TagResource.go | 6 ++ .../clouddirectory/api_op_UntagResource.go | 6 ++ service/clouddirectory/api_op_UpdateFacet.go | 6 ++ .../api_op_UpdateLinkAttributes.go | 6 ++ .../api_op_UpdateObjectAttributes.go | 6 ++ service/clouddirectory/api_op_UpdateSchema.go | 6 ++ .../api_op_UpdateTypedLinkFacet.go | 6 ++ .../api_op_UpgradeAppliedSchema.go | 6 ++ .../api_op_UpgradePublishedSchema.go | 6 ++ service/clouddirectory/go.mod | 4 +- service/clouddirectory/go.sum | 2 - service/cloudformation/api_client.go | 52 ++++++++-- .../api_op_CancelUpdateStack.go | 6 ++ .../api_op_ContinueUpdateRollback.go | 6 ++ .../cloudformation/api_op_CreateChangeSet.go | 6 ++ service/cloudformation/api_op_CreateStack.go | 6 ++ .../api_op_CreateStackInstances.go | 6 ++ .../cloudformation/api_op_CreateStackSet.go | 6 ++ .../cloudformation/api_op_DeleteChangeSet.go | 6 ++ service/cloudformation/api_op_DeleteStack.go | 6 ++ .../api_op_DeleteStackInstances.go | 6 ++ .../cloudformation/api_op_DeleteStackSet.go | 6 ++ .../cloudformation/api_op_DeregisterType.go | 6 ++ .../api_op_DescribeAccountLimits.go | 6 ++ .../api_op_DescribeChangeSet.go | 6 ++ ...pi_op_DescribeStackDriftDetectionStatus.go | 6 ++ .../api_op_DescribeStackEvents.go | 6 ++ .../api_op_DescribeStackInstance.go | 6 ++ .../api_op_DescribeStackResource.go | 6 ++ .../api_op_DescribeStackResourceDrifts.go | 6 ++ .../api_op_DescribeStackResources.go | 6 ++ .../cloudformation/api_op_DescribeStackSet.go | 6 ++ .../api_op_DescribeStackSetOperation.go | 6 ++ .../cloudformation/api_op_DescribeStacks.go | 6 ++ service/cloudformation/api_op_DescribeType.go | 6 ++ .../api_op_DescribeTypeRegistration.go | 6 ++ .../cloudformation/api_op_DetectStackDrift.go | 6 ++ .../api_op_DetectStackResourceDrift.go | 6 ++ .../api_op_DetectStackSetDrift.go | 6 ++ .../api_op_EstimateTemplateCost.go | 6 ++ .../cloudformation/api_op_ExecuteChangeSet.go | 6 ++ .../cloudformation/api_op_GetStackPolicy.go | 6 ++ service/cloudformation/api_op_GetTemplate.go | 6 ++ .../api_op_GetTemplateSummary.go | 6 ++ .../cloudformation/api_op_ListChangeSets.go | 6 ++ service/cloudformation/api_op_ListExports.go | 6 ++ service/cloudformation/api_op_ListImports.go | 6 ++ .../api_op_ListStackInstances.go | 6 ++ .../api_op_ListStackResources.go | 6 ++ .../api_op_ListStackSetOperationResults.go | 6 ++ .../api_op_ListStackSetOperations.go | 6 ++ .../cloudformation/api_op_ListStackSets.go | 6 ++ service/cloudformation/api_op_ListStacks.go | 6 ++ .../api_op_ListTypeRegistrations.go | 6 ++ .../cloudformation/api_op_ListTypeVersions.go | 6 ++ service/cloudformation/api_op_ListTypes.go | 6 ++ .../api_op_RecordHandlerProgress.go | 6 ++ service/cloudformation/api_op_RegisterType.go | 6 ++ .../cloudformation/api_op_SetStackPolicy.go | 6 ++ .../api_op_SetTypeDefaultVersion.go | 6 ++ .../cloudformation/api_op_SignalResource.go | 6 ++ .../api_op_StopStackSetOperation.go | 6 ++ service/cloudformation/api_op_UpdateStack.go | 6 ++ .../api_op_UpdateStackInstances.go | 6 ++ .../cloudformation/api_op_UpdateStackSet.go | 6 ++ .../api_op_UpdateTerminationProtection.go | 6 ++ .../cloudformation/api_op_ValidateTemplate.go | 6 ++ service/cloudformation/go.mod | 4 +- service/cloudformation/go.sum | 2 - service/cloudfront/api_client.go | 52 ++++++++-- .../cloudfront/api_op_CreateCachePolicy.go | 6 ++ ...op_CreateCloudFrontOriginAccessIdentity.go | 6 ++ .../cloudfront/api_op_CreateDistribution.go | 6 ++ .../api_op_CreateDistributionWithTags.go | 6 ++ ...api_op_CreateFieldLevelEncryptionConfig.go | 6 ++ ...pi_op_CreateFieldLevelEncryptionProfile.go | 6 ++ .../cloudfront/api_op_CreateInvalidation.go | 6 ++ service/cloudfront/api_op_CreateKeyGroup.go | 6 ++ .../api_op_CreateMonitoringSubscription.go | 6 ++ .../api_op_CreateOriginRequestPolicy.go | 6 ++ service/cloudfront/api_op_CreatePublicKey.go | 6 ++ .../api_op_CreateRealtimeLogConfig.go | 6 ++ .../api_op_CreateStreamingDistribution.go | 6 ++ ..._op_CreateStreamingDistributionWithTags.go | 6 ++ .../cloudfront/api_op_DeleteCachePolicy.go | 6 ++ ...op_DeleteCloudFrontOriginAccessIdentity.go | 6 ++ .../cloudfront/api_op_DeleteDistribution.go | 6 ++ ...api_op_DeleteFieldLevelEncryptionConfig.go | 6 ++ ...pi_op_DeleteFieldLevelEncryptionProfile.go | 6 ++ service/cloudfront/api_op_DeleteKeyGroup.go | 6 ++ .../api_op_DeleteMonitoringSubscription.go | 6 ++ .../api_op_DeleteOriginRequestPolicy.go | 6 ++ service/cloudfront/api_op_DeletePublicKey.go | 6 ++ .../api_op_DeleteRealtimeLogConfig.go | 6 ++ .../api_op_DeleteStreamingDistribution.go | 6 ++ service/cloudfront/api_op_GetCachePolicy.go | 6 ++ .../cloudfront/api_op_GetCachePolicyConfig.go | 6 ++ ...pi_op_GetCloudFrontOriginAccessIdentity.go | 6 ++ ...GetCloudFrontOriginAccessIdentityConfig.go | 6 ++ service/cloudfront/api_op_GetDistribution.go | 6 ++ .../api_op_GetDistributionConfig.go | 6 ++ .../api_op_GetFieldLevelEncryption.go | 6 ++ .../api_op_GetFieldLevelEncryptionConfig.go | 6 ++ .../api_op_GetFieldLevelEncryptionProfile.go | 6 ++ ...op_GetFieldLevelEncryptionProfileConfig.go | 6 ++ service/cloudfront/api_op_GetInvalidation.go | 6 ++ service/cloudfront/api_op_GetKeyGroup.go | 6 ++ .../cloudfront/api_op_GetKeyGroupConfig.go | 6 ++ .../api_op_GetMonitoringSubscription.go | 6 ++ .../api_op_GetOriginRequestPolicy.go | 6 ++ .../api_op_GetOriginRequestPolicyConfig.go | 6 ++ service/cloudfront/api_op_GetPublicKey.go | 6 ++ .../cloudfront/api_op_GetPublicKeyConfig.go | 6 ++ .../cloudfront/api_op_GetRealtimeLogConfig.go | 6 ++ .../api_op_GetStreamingDistribution.go | 6 ++ .../api_op_GetStreamingDistributionConfig.go | 6 ++ .../cloudfront/api_op_ListCachePolicies.go | 6 ++ ...op_ListCloudFrontOriginAccessIdentities.go | 6 ++ .../cloudfront/api_op_ListDistributions.go | 6 ++ ...api_op_ListDistributionsByCachePolicyId.go | 6 ++ .../api_op_ListDistributionsByKeyGroup.go | 6 ++ ...istDistributionsByOriginRequestPolicyId.go | 6 ++ ...op_ListDistributionsByRealtimeLogConfig.go | 6 ++ .../api_op_ListDistributionsByWebACLId.go | 6 ++ .../api_op_ListFieldLevelEncryptionConfigs.go | 6 ++ ...api_op_ListFieldLevelEncryptionProfiles.go | 6 ++ .../cloudfront/api_op_ListInvalidations.go | 6 ++ service/cloudfront/api_op_ListKeyGroups.go | 6 ++ .../api_op_ListOriginRequestPolicies.go | 6 ++ service/cloudfront/api_op_ListPublicKeys.go | 6 ++ .../api_op_ListRealtimeLogConfigs.go | 6 ++ .../api_op_ListStreamingDistributions.go | 6 ++ .../cloudfront/api_op_ListTagsForResource.go | 6 ++ service/cloudfront/api_op_TagResource.go | 6 ++ service/cloudfront/api_op_UntagResource.go | 6 ++ .../cloudfront/api_op_UpdateCachePolicy.go | 6 ++ ...op_UpdateCloudFrontOriginAccessIdentity.go | 6 ++ .../cloudfront/api_op_UpdateDistribution.go | 6 ++ ...api_op_UpdateFieldLevelEncryptionConfig.go | 6 ++ ...pi_op_UpdateFieldLevelEncryptionProfile.go | 6 ++ service/cloudfront/api_op_UpdateKeyGroup.go | 6 ++ .../api_op_UpdateOriginRequestPolicy.go | 6 ++ service/cloudfront/api_op_UpdatePublicKey.go | 6 ++ .../api_op_UpdateRealtimeLogConfig.go | 6 ++ .../api_op_UpdateStreamingDistribution.go | 6 ++ service/cloudfront/go.mod | 4 +- service/cloudfront/go.sum | 2 - service/cloudhsm/api_client.go | 52 ++++++++-- service/cloudhsm/api_op_AddTagsToResource.go | 6 ++ service/cloudhsm/api_op_CreateHapg.go | 6 ++ service/cloudhsm/api_op_CreateHsm.go | 6 ++ service/cloudhsm/api_op_CreateLunaClient.go | 6 ++ service/cloudhsm/api_op_DeleteHapg.go | 6 ++ service/cloudhsm/api_op_DeleteHsm.go | 6 ++ service/cloudhsm/api_op_DeleteLunaClient.go | 6 ++ service/cloudhsm/api_op_DescribeHapg.go | 6 ++ service/cloudhsm/api_op_DescribeHsm.go | 6 ++ service/cloudhsm/api_op_DescribeLunaClient.go | 6 ++ service/cloudhsm/api_op_GetConfig.go | 6 ++ service/cloudhsm/api_op_ListAvailableZones.go | 6 ++ service/cloudhsm/api_op_ListHapgs.go | 6 ++ service/cloudhsm/api_op_ListHsms.go | 6 ++ service/cloudhsm/api_op_ListLunaClients.go | 6 ++ .../cloudhsm/api_op_ListTagsForResource.go | 6 ++ service/cloudhsm/api_op_ModifyHapg.go | 6 ++ service/cloudhsm/api_op_ModifyHsm.go | 6 ++ service/cloudhsm/api_op_ModifyLunaClient.go | 6 ++ .../cloudhsm/api_op_RemoveTagsFromResource.go | 6 ++ service/cloudhsm/go.mod | 4 +- service/cloudhsm/go.sum | 2 - service/cloudhsmv2/api_client.go | 52 ++++++++-- .../cloudhsmv2/api_op_CopyBackupToRegion.go | 6 ++ service/cloudhsmv2/api_op_CreateCluster.go | 6 ++ service/cloudhsmv2/api_op_CreateHsm.go | 6 ++ service/cloudhsmv2/api_op_DeleteBackup.go | 6 ++ service/cloudhsmv2/api_op_DeleteCluster.go | 6 ++ service/cloudhsmv2/api_op_DeleteHsm.go | 6 ++ service/cloudhsmv2/api_op_DescribeBackups.go | 6 ++ service/cloudhsmv2/api_op_DescribeClusters.go | 6 ++ .../cloudhsmv2/api_op_InitializeCluster.go | 6 ++ service/cloudhsmv2/api_op_ListTags.go | 6 ++ service/cloudhsmv2/api_op_RestoreBackup.go | 6 ++ service/cloudhsmv2/api_op_TagResource.go | 6 ++ service/cloudhsmv2/api_op_UntagResource.go | 6 ++ service/cloudhsmv2/go.mod | 4 +- service/cloudhsmv2/go.sum | 2 - service/cloudsearch/api_client.go | 52 ++++++++-- service/cloudsearch/api_op_BuildSuggesters.go | 6 ++ service/cloudsearch/api_op_CreateDomain.go | 6 ++ .../api_op_DefineAnalysisScheme.go | 6 ++ .../cloudsearch/api_op_DefineExpression.go | 6 ++ .../cloudsearch/api_op_DefineIndexField.go | 6 ++ service/cloudsearch/api_op_DefineSuggester.go | 6 ++ .../api_op_DeleteAnalysisScheme.go | 6 ++ service/cloudsearch/api_op_DeleteDomain.go | 6 ++ .../cloudsearch/api_op_DeleteExpression.go | 6 ++ .../cloudsearch/api_op_DeleteIndexField.go | 6 ++ service/cloudsearch/api_op_DeleteSuggester.go | 6 ++ .../api_op_DescribeAnalysisSchemes.go | 6 ++ .../api_op_DescribeAvailabilityOptions.go | 6 ++ .../api_op_DescribeDomainEndpointOptions.go | 6 ++ service/cloudsearch/api_op_DescribeDomains.go | 6 ++ .../cloudsearch/api_op_DescribeExpressions.go | 6 ++ .../cloudsearch/api_op_DescribeIndexFields.go | 6 ++ .../api_op_DescribeScalingParameters.go | 6 ++ .../api_op_DescribeServiceAccessPolicies.go | 6 ++ .../cloudsearch/api_op_DescribeSuggesters.go | 6 ++ service/cloudsearch/api_op_IndexDocuments.go | 6 ++ service/cloudsearch/api_op_ListDomainNames.go | 6 ++ .../api_op_UpdateAvailabilityOptions.go | 6 ++ .../api_op_UpdateDomainEndpointOptions.go | 6 ++ .../api_op_UpdateScalingParameters.go | 6 ++ .../api_op_UpdateServiceAccessPolicies.go | 6 ++ service/cloudsearch/go.mod | 4 +- service/cloudsearch/go.sum | 2 - service/cloudsearchdomain/api_client.go | 52 ++++++++-- service/cloudsearchdomain/api_op_Search.go | 6 ++ service/cloudsearchdomain/api_op_Suggest.go | 6 ++ .../api_op_UploadDocuments.go | 6 ++ service/cloudsearchdomain/go.mod | 4 +- service/cloudsearchdomain/go.sum | 2 - service/cloudtrail/api_client.go | 52 ++++++++-- service/cloudtrail/api_op_AddTags.go | 6 ++ service/cloudtrail/api_op_CreateTrail.go | 6 ++ service/cloudtrail/api_op_DeleteTrail.go | 6 ++ service/cloudtrail/api_op_DescribeTrails.go | 6 ++ .../cloudtrail/api_op_GetEventSelectors.go | 6 ++ .../cloudtrail/api_op_GetInsightSelectors.go | 6 ++ service/cloudtrail/api_op_GetTrail.go | 6 ++ service/cloudtrail/api_op_GetTrailStatus.go | 6 ++ service/cloudtrail/api_op_ListPublicKeys.go | 6 ++ service/cloudtrail/api_op_ListTags.go | 6 ++ service/cloudtrail/api_op_ListTrails.go | 6 ++ service/cloudtrail/api_op_LookupEvents.go | 6 ++ .../cloudtrail/api_op_PutEventSelectors.go | 6 ++ .../cloudtrail/api_op_PutInsightSelectors.go | 6 ++ service/cloudtrail/api_op_RemoveTags.go | 6 ++ service/cloudtrail/api_op_StartLogging.go | 6 ++ service/cloudtrail/api_op_StopLogging.go | 6 ++ service/cloudtrail/api_op_UpdateTrail.go | 6 ++ service/cloudtrail/go.mod | 4 +- service/cloudtrail/go.sum | 2 - service/cloudwatch/api_client.go | 52 ++++++++-- service/cloudwatch/api_op_DeleteAlarms.go | 6 ++ .../api_op_DeleteAnomalyDetector.go | 6 ++ service/cloudwatch/api_op_DeleteDashboards.go | 6 ++ .../cloudwatch/api_op_DeleteInsightRules.go | 6 ++ .../cloudwatch/api_op_DescribeAlarmHistory.go | 6 ++ service/cloudwatch/api_op_DescribeAlarms.go | 6 ++ .../api_op_DescribeAlarmsForMetric.go | 6 ++ .../api_op_DescribeAnomalyDetectors.go | 6 ++ .../cloudwatch/api_op_DescribeInsightRules.go | 6 ++ .../cloudwatch/api_op_DisableAlarmActions.go | 6 ++ .../cloudwatch/api_op_DisableInsightRules.go | 6 ++ .../cloudwatch/api_op_EnableAlarmActions.go | 6 ++ .../cloudwatch/api_op_EnableInsightRules.go | 6 ++ service/cloudwatch/api_op_GetDashboard.go | 6 ++ .../cloudwatch/api_op_GetInsightRuleReport.go | 6 ++ service/cloudwatch/api_op_GetMetricData.go | 6 ++ .../cloudwatch/api_op_GetMetricStatistics.go | 6 ++ .../cloudwatch/api_op_GetMetricWidgetImage.go | 6 ++ service/cloudwatch/api_op_ListDashboards.go | 6 ++ service/cloudwatch/api_op_ListMetrics.go | 6 ++ .../cloudwatch/api_op_ListTagsForResource.go | 6 ++ .../cloudwatch/api_op_PutAnomalyDetector.go | 6 ++ .../cloudwatch/api_op_PutCompositeAlarm.go | 6 ++ service/cloudwatch/api_op_PutDashboard.go | 6 ++ service/cloudwatch/api_op_PutInsightRule.go | 6 ++ service/cloudwatch/api_op_PutMetricAlarm.go | 6 ++ service/cloudwatch/api_op_PutMetricData.go | 6 ++ service/cloudwatch/api_op_SetAlarmState.go | 6 ++ service/cloudwatch/api_op_TagResource.go | 6 ++ service/cloudwatch/api_op_UntagResource.go | 6 ++ service/cloudwatch/go.mod | 4 +- service/cloudwatch/go.sum | 2 - service/cloudwatchevents/api_client.go | 52 ++++++++-- .../api_op_ActivateEventSource.go | 6 ++ .../cloudwatchevents/api_op_CreateEventBus.go | 6 ++ .../api_op_CreatePartnerEventSource.go | 6 ++ .../api_op_DeactivateEventSource.go | 6 ++ .../cloudwatchevents/api_op_DeleteEventBus.go | 6 ++ .../api_op_DeletePartnerEventSource.go | 6 ++ service/cloudwatchevents/api_op_DeleteRule.go | 6 ++ .../api_op_DescribeEventBus.go | 6 ++ .../api_op_DescribeEventSource.go | 6 ++ .../api_op_DescribePartnerEventSource.go | 6 ++ .../cloudwatchevents/api_op_DescribeRule.go | 6 ++ .../cloudwatchevents/api_op_DisableRule.go | 6 ++ service/cloudwatchevents/api_op_EnableRule.go | 6 ++ .../cloudwatchevents/api_op_ListEventBuses.go | 6 ++ .../api_op_ListEventSources.go | 6 ++ .../api_op_ListPartnerEventSourceAccounts.go | 6 ++ .../api_op_ListPartnerEventSources.go | 6 ++ .../api_op_ListRuleNamesByTarget.go | 6 ++ service/cloudwatchevents/api_op_ListRules.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ListTargetsByRule.go | 6 ++ service/cloudwatchevents/api_op_PutEvents.go | 6 ++ .../api_op_PutPartnerEvents.go | 6 ++ .../cloudwatchevents/api_op_PutPermission.go | 6 ++ service/cloudwatchevents/api_op_PutRule.go | 6 ++ service/cloudwatchevents/api_op_PutTargets.go | 6 ++ .../api_op_RemovePermission.go | 6 ++ .../cloudwatchevents/api_op_RemoveTargets.go | 6 ++ .../cloudwatchevents/api_op_TagResource.go | 6 ++ .../api_op_TestEventPattern.go | 6 ++ .../cloudwatchevents/api_op_UntagResource.go | 6 ++ service/cloudwatchevents/go.mod | 4 +- service/cloudwatchevents/go.sum | 2 - service/cloudwatchlogs/api_client.go | 52 ++++++++-- .../cloudwatchlogs/api_op_AssociateKmsKey.go | 6 ++ .../cloudwatchlogs/api_op_CancelExportTask.go | 6 ++ .../cloudwatchlogs/api_op_CreateExportTask.go | 6 ++ .../cloudwatchlogs/api_op_CreateLogGroup.go | 6 ++ .../cloudwatchlogs/api_op_CreateLogStream.go | 6 ++ .../api_op_DeleteDestination.go | 6 ++ .../cloudwatchlogs/api_op_DeleteLogGroup.go | 6 ++ .../cloudwatchlogs/api_op_DeleteLogStream.go | 6 ++ .../api_op_DeleteMetricFilter.go | 6 ++ .../api_op_DeleteQueryDefinition.go | 6 ++ .../api_op_DeleteResourcePolicy.go | 6 ++ .../api_op_DeleteRetentionPolicy.go | 6 ++ .../api_op_DeleteSubscriptionFilter.go | 6 ++ .../api_op_DescribeDestinations.go | 6 ++ .../api_op_DescribeExportTasks.go | 6 ++ .../api_op_DescribeLogGroups.go | 6 ++ .../api_op_DescribeLogStreams.go | 6 ++ .../api_op_DescribeMetricFilters.go | 6 ++ .../cloudwatchlogs/api_op_DescribeQueries.go | 6 ++ .../api_op_DescribeQueryDefinitions.go | 6 ++ .../api_op_DescribeResourcePolicies.go | 6 ++ .../api_op_DescribeSubscriptionFilters.go | 6 ++ .../api_op_DisassociateKmsKey.go | 6 ++ .../cloudwatchlogs/api_op_FilterLogEvents.go | 6 ++ service/cloudwatchlogs/api_op_GetLogEvents.go | 6 ++ .../api_op_GetLogGroupFields.go | 6 ++ service/cloudwatchlogs/api_op_GetLogRecord.go | 6 ++ .../cloudwatchlogs/api_op_GetQueryResults.go | 6 ++ .../cloudwatchlogs/api_op_ListTagsLogGroup.go | 6 ++ .../cloudwatchlogs/api_op_PutDestination.go | 6 ++ .../api_op_PutDestinationPolicy.go | 6 ++ service/cloudwatchlogs/api_op_PutLogEvents.go | 6 ++ .../cloudwatchlogs/api_op_PutMetricFilter.go | 6 ++ .../api_op_PutQueryDefinition.go | 6 ++ .../api_op_PutResourcePolicy.go | 6 ++ .../api_op_PutRetentionPolicy.go | 6 ++ .../api_op_PutSubscriptionFilter.go | 6 ++ service/cloudwatchlogs/api_op_StartQuery.go | 6 ++ service/cloudwatchlogs/api_op_StopQuery.go | 6 ++ service/cloudwatchlogs/api_op_TagLogGroup.go | 6 ++ .../cloudwatchlogs/api_op_TestMetricFilter.go | 6 ++ .../cloudwatchlogs/api_op_UntagLogGroup.go | 6 ++ service/cloudwatchlogs/go.mod | 4 +- service/cloudwatchlogs/go.sum | 2 - service/codeartifact/api_client.go | 52 ++++++++-- .../api_op_AssociateExternalConnection.go | 6 ++ .../api_op_CopyPackageVersions.go | 6 ++ service/codeartifact/api_op_CreateDomain.go | 6 ++ .../codeartifact/api_op_CreateRepository.go | 6 ++ service/codeartifact/api_op_DeleteDomain.go | 6 ++ .../api_op_DeleteDomainPermissionsPolicy.go | 6 ++ .../api_op_DeletePackageVersions.go | 6 ++ .../codeartifact/api_op_DeleteRepository.go | 6 ++ ...pi_op_DeleteRepositoryPermissionsPolicy.go | 6 ++ service/codeartifact/api_op_DescribeDomain.go | 6 ++ .../api_op_DescribePackageVersion.go | 6 ++ .../codeartifact/api_op_DescribeRepository.go | 6 ++ .../api_op_DisassociateExternalConnection.go | 6 ++ .../api_op_DisposePackageVersions.go | 6 ++ .../api_op_GetAuthorizationToken.go | 6 ++ .../api_op_GetDomainPermissionsPolicy.go | 6 ++ .../api_op_GetPackageVersionAsset.go | 6 ++ .../api_op_GetPackageVersionReadme.go | 6 ++ .../api_op_GetRepositoryEndpoint.go | 6 ++ .../api_op_GetRepositoryPermissionsPolicy.go | 6 ++ service/codeartifact/api_op_ListDomains.go | 6 ++ .../api_op_ListPackageVersionAssets.go | 6 ++ .../api_op_ListPackageVersionDependencies.go | 6 ++ .../api_op_ListPackageVersions.go | 6 ++ service/codeartifact/api_op_ListPackages.go | 6 ++ .../codeartifact/api_op_ListRepositories.go | 6 ++ .../api_op_ListRepositoriesInDomain.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_PutDomainPermissionsPolicy.go | 6 ++ .../api_op_PutRepositoryPermissionsPolicy.go | 6 ++ service/codeartifact/api_op_TagResource.go | 6 ++ service/codeartifact/api_op_UntagResource.go | 6 ++ .../api_op_UpdatePackageVersionsStatus.go | 6 ++ .../codeartifact/api_op_UpdateRepository.go | 6 ++ service/codeartifact/go.mod | 4 +- service/codeartifact/go.sum | 2 - service/codebuild/api_client.go | 52 ++++++++-- service/codebuild/api_op_BatchDeleteBuilds.go | 6 ++ .../codebuild/api_op_BatchGetBuildBatches.go | 6 ++ service/codebuild/api_op_BatchGetBuilds.go | 6 ++ service/codebuild/api_op_BatchGetProjects.go | 6 ++ .../codebuild/api_op_BatchGetReportGroups.go | 6 ++ service/codebuild/api_op_BatchGetReports.go | 6 ++ service/codebuild/api_op_CreateProject.go | 6 ++ service/codebuild/api_op_CreateReportGroup.go | 6 ++ service/codebuild/api_op_CreateWebhook.go | 6 ++ service/codebuild/api_op_DeleteBuildBatch.go | 6 ++ service/codebuild/api_op_DeleteProject.go | 6 ++ service/codebuild/api_op_DeleteReport.go | 6 ++ service/codebuild/api_op_DeleteReportGroup.go | 6 ++ .../codebuild/api_op_DeleteResourcePolicy.go | 6 ++ .../api_op_DeleteSourceCredentials.go | 6 ++ service/codebuild/api_op_DeleteWebhook.go | 6 ++ .../codebuild/api_op_DescribeCodeCoverages.go | 6 ++ service/codebuild/api_op_DescribeTestCases.go | 6 ++ service/codebuild/api_op_GetResourcePolicy.go | 6 ++ .../api_op_ImportSourceCredentials.go | 6 ++ .../api_op_InvalidateProjectCache.go | 6 ++ service/codebuild/api_op_ListBuildBatches.go | 6 ++ .../api_op_ListBuildBatchesForProject.go | 6 ++ service/codebuild/api_op_ListBuilds.go | 6 ++ .../codebuild/api_op_ListBuildsForProject.go | 6 ++ .../api_op_ListCuratedEnvironmentImages.go | 6 ++ service/codebuild/api_op_ListProjects.go | 6 ++ service/codebuild/api_op_ListReportGroups.go | 6 ++ service/codebuild/api_op_ListReports.go | 6 ++ .../api_op_ListReportsForReportGroup.go | 6 ++ .../codebuild/api_op_ListSharedProjects.go | 6 ++ .../api_op_ListSharedReportGroups.go | 6 ++ .../codebuild/api_op_ListSourceCredentials.go | 6 ++ service/codebuild/api_op_PutResourcePolicy.go | 6 ++ service/codebuild/api_op_RetryBuild.go | 6 ++ service/codebuild/api_op_RetryBuildBatch.go | 6 ++ service/codebuild/api_op_StartBuild.go | 6 ++ service/codebuild/api_op_StartBuildBatch.go | 6 ++ service/codebuild/api_op_StopBuild.go | 6 ++ service/codebuild/api_op_StopBuildBatch.go | 6 ++ service/codebuild/api_op_UpdateProject.go | 6 ++ service/codebuild/api_op_UpdateReportGroup.go | 6 ++ service/codebuild/api_op_UpdateWebhook.go | 6 ++ service/codebuild/go.mod | 4 +- service/codebuild/go.sum | 2 - service/codecommit/api_client.go | 52 ++++++++-- ...ciateApprovalRuleTemplateWithRepository.go | 6 ++ ...ateApprovalRuleTemplateWithRepositories.go | 6 ++ .../api_op_BatchDescribeMergeConflicts.go | 6 ++ ...ateApprovalRuleTemplateFromRepositories.go | 6 ++ service/codecommit/api_op_BatchGetCommits.go | 6 ++ .../codecommit/api_op_BatchGetRepositories.go | 6 ++ .../api_op_CreateApprovalRuleTemplate.go | 6 ++ service/codecommit/api_op_CreateBranch.go | 6 ++ service/codecommit/api_op_CreateCommit.go | 6 ++ .../codecommit/api_op_CreatePullRequest.go | 6 ++ .../api_op_CreatePullRequestApprovalRule.go | 6 ++ service/codecommit/api_op_CreateRepository.go | 6 ++ .../api_op_CreateUnreferencedMergeCommit.go | 6 ++ .../api_op_DeleteApprovalRuleTemplate.go | 6 ++ service/codecommit/api_op_DeleteBranch.go | 6 ++ .../codecommit/api_op_DeleteCommentContent.go | 6 ++ service/codecommit/api_op_DeleteFile.go | 6 ++ .../api_op_DeletePullRequestApprovalRule.go | 6 ++ service/codecommit/api_op_DeleteRepository.go | 6 ++ .../api_op_DescribeMergeConflicts.go | 6 ++ .../api_op_DescribePullRequestEvents.go | 6 ++ ...ciateApprovalRuleTemplateFromRepository.go | 6 ++ ...api_op_EvaluatePullRequestApprovalRules.go | 6 ++ .../api_op_GetApprovalRuleTemplate.go | 6 ++ service/codecommit/api_op_GetBlob.go | 6 ++ service/codecommit/api_op_GetBranch.go | 6 ++ service/codecommit/api_op_GetComment.go | 6 ++ .../codecommit/api_op_GetCommentReactions.go | 6 ++ .../api_op_GetCommentsForComparedCommit.go | 6 ++ .../api_op_GetCommentsForPullRequest.go | 6 ++ service/codecommit/api_op_GetCommit.go | 6 ++ service/codecommit/api_op_GetDifferences.go | 6 ++ service/codecommit/api_op_GetFile.go | 6 ++ service/codecommit/api_op_GetFolder.go | 6 ++ service/codecommit/api_op_GetMergeCommit.go | 6 ++ .../codecommit/api_op_GetMergeConflicts.go | 6 ++ service/codecommit/api_op_GetMergeOptions.go | 6 ++ service/codecommit/api_op_GetPullRequest.go | 6 ++ .../api_op_GetPullRequestApprovalStates.go | 6 ++ .../api_op_GetPullRequestOverrideState.go | 6 ++ service/codecommit/api_op_GetRepository.go | 6 ++ .../api_op_GetRepositoryTriggers.go | 6 ++ .../api_op_ListApprovalRuleTemplates.go | 6 ++ ...iatedApprovalRuleTemplatesForRepository.go | 6 ++ service/codecommit/api_op_ListBranches.go | 6 ++ service/codecommit/api_op_ListPullRequests.go | 6 ++ service/codecommit/api_op_ListRepositories.go | 6 ++ ...ListRepositoriesForApprovalRuleTemplate.go | 6 ++ .../codecommit/api_op_ListTagsForResource.go | 6 ++ .../api_op_MergeBranchesByFastForward.go | 6 ++ .../api_op_MergeBranchesBySquash.go | 6 ++ .../api_op_MergeBranchesByThreeWay.go | 6 ++ .../api_op_MergePullRequestByFastForward.go | 6 ++ .../api_op_MergePullRequestBySquash.go | 6 ++ .../api_op_MergePullRequestByThreeWay.go | 6 ++ ...api_op_OverridePullRequestApprovalRules.go | 6 ++ .../api_op_PostCommentForComparedCommit.go | 6 ++ .../api_op_PostCommentForPullRequest.go | 6 ++ service/codecommit/api_op_PostCommentReply.go | 6 ++ .../codecommit/api_op_PutCommentReaction.go | 6 ++ service/codecommit/api_op_PutFile.go | 6 ++ .../api_op_PutRepositoryTriggers.go | 6 ++ service/codecommit/api_op_TagResource.go | 6 ++ .../api_op_TestRepositoryTriggers.go | 6 ++ service/codecommit/api_op_UntagResource.go | 6 ++ ...pi_op_UpdateApprovalRuleTemplateContent.go | 6 ++ ...p_UpdateApprovalRuleTemplateDescription.go | 6 ++ .../api_op_UpdateApprovalRuleTemplateName.go | 6 ++ service/codecommit/api_op_UpdateComment.go | 6 ++ .../codecommit/api_op_UpdateDefaultBranch.go | 6 ++ ...op_UpdatePullRequestApprovalRuleContent.go | 6 ++ .../api_op_UpdatePullRequestApprovalState.go | 6 ++ .../api_op_UpdatePullRequestDescription.go | 6 ++ .../api_op_UpdatePullRequestStatus.go | 6 ++ .../api_op_UpdatePullRequestTitle.go | 6 ++ .../api_op_UpdateRepositoryDescription.go | 6 ++ .../codecommit/api_op_UpdateRepositoryName.go | 6 ++ service/codecommit/go.mod | 4 +- service/codecommit/go.sum | 2 - service/codedeploy/api_client.go | 52 ++++++++-- .../api_op_AddTagsToOnPremisesInstances.go | 6 ++ .../api_op_BatchGetApplicationRevisions.go | 6 ++ .../codedeploy/api_op_BatchGetApplications.go | 6 ++ .../api_op_BatchGetDeploymentGroups.go | 6 ++ .../api_op_BatchGetDeploymentInstances.go | 6 ++ .../api_op_BatchGetDeploymentTargets.go | 6 ++ .../codedeploy/api_op_BatchGetDeployments.go | 6 ++ .../api_op_BatchGetOnPremisesInstances.go | 6 ++ .../codedeploy/api_op_ContinueDeployment.go | 6 ++ .../codedeploy/api_op_CreateApplication.go | 6 ++ service/codedeploy/api_op_CreateDeployment.go | 6 ++ .../api_op_CreateDeploymentConfig.go | 6 ++ .../api_op_CreateDeploymentGroup.go | 6 ++ .../codedeploy/api_op_DeleteApplication.go | 6 ++ .../api_op_DeleteDeploymentConfig.go | 6 ++ .../api_op_DeleteDeploymentGroup.go | 6 ++ .../api_op_DeleteGitHubAccountToken.go | 6 ++ .../api_op_DeleteResourcesByExternalId.go | 6 ++ .../api_op_DeregisterOnPremisesInstance.go | 6 ++ service/codedeploy/api_op_GetApplication.go | 6 ++ .../api_op_GetApplicationRevision.go | 6 ++ service/codedeploy/api_op_GetDeployment.go | 6 ++ .../codedeploy/api_op_GetDeploymentConfig.go | 6 ++ .../codedeploy/api_op_GetDeploymentGroup.go | 6 ++ .../api_op_GetDeploymentInstance.go | 6 ++ .../codedeploy/api_op_GetDeploymentTarget.go | 6 ++ .../api_op_GetOnPremisesInstance.go | 6 ++ .../api_op_ListApplicationRevisions.go | 6 ++ service/codedeploy/api_op_ListApplications.go | 6 ++ .../api_op_ListDeploymentConfigs.go | 6 ++ .../codedeploy/api_op_ListDeploymentGroups.go | 6 ++ .../api_op_ListDeploymentInstances.go | 6 ++ .../api_op_ListDeploymentTargets.go | 6 ++ service/codedeploy/api_op_ListDeployments.go | 6 ++ .../api_op_ListGitHubAccountTokenNames.go | 6 ++ .../api_op_ListOnPremisesInstances.go | 6 ++ .../codedeploy/api_op_ListTagsForResource.go | 6 ++ ...op_PutLifecycleEventHookExecutionStatus.go | 6 ++ .../api_op_RegisterApplicationRevision.go | 6 ++ .../api_op_RegisterOnPremisesInstance.go | 6 ++ ...pi_op_RemoveTagsFromOnPremisesInstances.go | 6 ++ ...i_op_SkipWaitTimeForInstanceTermination.go | 6 ++ service/codedeploy/api_op_StopDeployment.go | 6 ++ service/codedeploy/api_op_TagResource.go | 6 ++ service/codedeploy/api_op_UntagResource.go | 6 ++ .../codedeploy/api_op_UpdateApplication.go | 6 ++ .../api_op_UpdateDeploymentGroup.go | 6 ++ service/codedeploy/go.mod | 4 +- service/codedeploy/go.sum | 2 - service/codeguruprofiler/api_client.go | 52 ++++++++-- .../codeguruprofiler/api_op_ConfigureAgent.go | 6 ++ .../api_op_CreateProfilingGroup.go | 6 ++ .../api_op_DeleteProfilingGroup.go | 6 ++ .../api_op_DescribeProfilingGroup.go | 6 ++ service/codeguruprofiler/api_op_GetPolicy.go | 6 ++ service/codeguruprofiler/api_op_GetProfile.go | 6 ++ .../api_op_ListProfileTimes.go | 6 ++ .../api_op_ListProfilingGroups.go | 6 ++ .../api_op_PostAgentProfile.go | 6 ++ .../codeguruprofiler/api_op_PutPermission.go | 6 ++ .../api_op_RemovePermission.go | 6 ++ .../api_op_RetrieveTimeSeries.go | 6 ++ .../api_op_UpdateProfilingGroup.go | 6 ++ service/codeguruprofiler/go.mod | 4 +- service/codeguruprofiler/go.sum | 2 - service/codegurureviewer/api_client.go | 52 ++++++++-- .../api_op_AssociateRepository.go | 6 ++ .../api_op_CreateCodeReview.go | 6 ++ .../api_op_DescribeCodeReview.go | 6 ++ .../api_op_DescribeRecommendationFeedback.go | 6 ++ .../api_op_DescribeRepositoryAssociation.go | 6 ++ .../api_op_DisassociateRepository.go | 6 ++ .../api_op_ListCodeReviews.go | 6 ++ .../api_op_ListRecommendationFeedback.go | 6 ++ .../api_op_ListRecommendations.go | 6 ++ .../api_op_ListRepositoryAssociations.go | 6 ++ .../api_op_PutRecommendationFeedback.go | 6 ++ service/codegurureviewer/go.mod | 4 +- service/codegurureviewer/go.sum | 2 - service/codepipeline/api_client.go | 52 ++++++++-- service/codepipeline/api_op_AcknowledgeJob.go | 6 ++ .../api_op_AcknowledgeThirdPartyJob.go | 6 ++ .../api_op_CreateCustomActionType.go | 6 ++ service/codepipeline/api_op_CreatePipeline.go | 6 ++ .../api_op_DeleteCustomActionType.go | 6 ++ service/codepipeline/api_op_DeletePipeline.go | 6 ++ service/codepipeline/api_op_DeleteWebhook.go | 6 ++ .../api_op_DeregisterWebhookWithThirdParty.go | 6 ++ .../api_op_DisableStageTransition.go | 6 ++ .../api_op_EnableStageTransition.go | 6 ++ service/codepipeline/api_op_GetJobDetails.go | 6 ++ service/codepipeline/api_op_GetPipeline.go | 6 ++ .../api_op_GetPipelineExecution.go | 6 ++ .../codepipeline/api_op_GetPipelineState.go | 6 ++ .../api_op_GetThirdPartyJobDetails.go | 6 ++ .../api_op_ListActionExecutions.go | 6 ++ .../codepipeline/api_op_ListActionTypes.go | 6 ++ .../api_op_ListPipelineExecutions.go | 6 ++ service/codepipeline/api_op_ListPipelines.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/codepipeline/api_op_ListWebhooks.go | 6 ++ service/codepipeline/api_op_PollForJobs.go | 6 ++ .../api_op_PollForThirdPartyJobs.go | 6 ++ .../codepipeline/api_op_PutActionRevision.go | 6 ++ .../codepipeline/api_op_PutApprovalResult.go | 6 ++ .../api_op_PutJobFailureResult.go | 6 ++ .../api_op_PutJobSuccessResult.go | 6 ++ .../api_op_PutThirdPartyJobFailureResult.go | 6 ++ .../api_op_PutThirdPartyJobSuccessResult.go | 6 ++ service/codepipeline/api_op_PutWebhook.go | 6 ++ .../api_op_RegisterWebhookWithThirdParty.go | 6 ++ .../api_op_RetryStageExecution.go | 6 ++ .../api_op_StartPipelineExecution.go | 6 ++ .../api_op_StopPipelineExecution.go | 6 ++ service/codepipeline/api_op_TagResource.go | 6 ++ service/codepipeline/api_op_UntagResource.go | 6 ++ service/codepipeline/api_op_UpdatePipeline.go | 6 ++ service/codepipeline/go.mod | 4 +- service/codepipeline/go.sum | 2 - service/codestar/api_client.go | 52 ++++++++-- .../codestar/api_op_AssociateTeamMember.go | 6 ++ service/codestar/api_op_CreateProject.go | 6 ++ service/codestar/api_op_CreateUserProfile.go | 6 ++ service/codestar/api_op_DeleteProject.go | 6 ++ service/codestar/api_op_DeleteUserProfile.go | 6 ++ service/codestar/api_op_DescribeProject.go | 6 ++ .../codestar/api_op_DescribeUserProfile.go | 6 ++ .../codestar/api_op_DisassociateTeamMember.go | 6 ++ service/codestar/api_op_ListProjects.go | 6 ++ service/codestar/api_op_ListResources.go | 6 ++ service/codestar/api_op_ListTagsForProject.go | 6 ++ service/codestar/api_op_ListTeamMembers.go | 6 ++ service/codestar/api_op_ListUserProfiles.go | 6 ++ service/codestar/api_op_TagProject.go | 6 ++ service/codestar/api_op_UntagProject.go | 6 ++ service/codestar/api_op_UpdateProject.go | 6 ++ service/codestar/api_op_UpdateTeamMember.go | 6 ++ service/codestar/api_op_UpdateUserProfile.go | 6 ++ service/codestar/go.mod | 4 +- service/codestar/go.sum | 2 - service/codestarconnections/api_client.go | 52 ++++++++-- .../api_op_CreateConnection.go | 6 ++ .../codestarconnections/api_op_CreateHost.go | 6 ++ .../api_op_DeleteConnection.go | 6 ++ .../codestarconnections/api_op_DeleteHost.go | 6 ++ .../api_op_GetConnection.go | 6 ++ service/codestarconnections/api_op_GetHost.go | 6 ++ .../api_op_ListConnections.go | 6 ++ .../codestarconnections/api_op_ListHosts.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../codestarconnections/api_op_TagResource.go | 6 ++ .../api_op_UntagResource.go | 6 ++ service/codestarconnections/go.mod | 4 +- service/codestarconnections/go.sum | 2 - service/codestarnotifications/api_client.go | 52 ++++++++-- .../api_op_CreateNotificationRule.go | 6 ++ .../api_op_DeleteNotificationRule.go | 6 ++ .../api_op_DeleteTarget.go | 6 ++ .../api_op_DescribeNotificationRule.go | 6 ++ .../api_op_ListEventTypes.go | 6 ++ .../api_op_ListNotificationRules.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ListTargets.go | 6 ++ .../codestarnotifications/api_op_Subscribe.go | 6 ++ .../api_op_TagResource.go | 6 ++ .../api_op_Unsubscribe.go | 6 ++ .../api_op_UntagResource.go | 6 ++ .../api_op_UpdateNotificationRule.go | 6 ++ service/codestarnotifications/go.mod | 4 +- service/codestarnotifications/go.sum | 2 - service/cognitoidentity/api_client.go | 52 ++++++++-- .../api_op_CreateIdentityPool.go | 6 ++ .../api_op_DeleteIdentities.go | 6 ++ .../api_op_DeleteIdentityPool.go | 6 ++ .../api_op_DescribeIdentity.go | 6 ++ .../api_op_DescribeIdentityPool.go | 6 ++ .../api_op_GetCredentialsForIdentity.go | 6 ++ service/cognitoidentity/api_op_GetId.go | 6 ++ .../api_op_GetIdentityPoolRoles.go | 6 ++ .../cognitoidentity/api_op_GetOpenIdToken.go | 6 ++ ...i_op_GetOpenIdTokenForDeveloperIdentity.go | 6 ++ .../cognitoidentity/api_op_ListIdentities.go | 6 ++ .../api_op_ListIdentityPools.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_LookupDeveloperIdentity.go | 6 ++ .../api_op_MergeDeveloperIdentities.go | 6 ++ .../api_op_SetIdentityPoolRoles.go | 6 ++ service/cognitoidentity/api_op_TagResource.go | 6 ++ .../api_op_UnlinkDeveloperIdentity.go | 6 ++ .../cognitoidentity/api_op_UnlinkIdentity.go | 6 ++ .../cognitoidentity/api_op_UntagResource.go | 6 ++ .../api_op_UpdateIdentityPool.go | 6 ++ service/cognitoidentity/go.mod | 4 +- service/cognitoidentity/go.sum | 2 - service/cognitoidentityprovider/api_client.go | 52 ++++++++-- .../api_op_AddCustomAttributes.go | 6 ++ .../api_op_AdminAddUserToGroup.go | 6 ++ .../api_op_AdminConfirmSignUp.go | 6 ++ .../api_op_AdminCreateUser.go | 6 ++ .../api_op_AdminDeleteUser.go | 6 ++ .../api_op_AdminDeleteUserAttributes.go | 6 ++ .../api_op_AdminDisableProviderForUser.go | 6 ++ .../api_op_AdminDisableUser.go | 6 ++ .../api_op_AdminEnableUser.go | 6 ++ .../api_op_AdminForgetDevice.go | 6 ++ .../api_op_AdminGetDevice.go | 6 ++ .../api_op_AdminGetUser.go | 6 ++ .../api_op_AdminInitiateAuth.go | 6 ++ .../api_op_AdminLinkProviderForUser.go | 6 ++ .../api_op_AdminListDevices.go | 6 ++ .../api_op_AdminListGroupsForUser.go | 6 ++ .../api_op_AdminListUserAuthEvents.go | 6 ++ .../api_op_AdminRemoveUserFromGroup.go | 6 ++ .../api_op_AdminResetUserPassword.go | 6 ++ .../api_op_AdminRespondToAuthChallenge.go | 6 ++ .../api_op_AdminSetUserMFAPreference.go | 6 ++ .../api_op_AdminSetUserPassword.go | 6 ++ .../api_op_AdminSetUserSettings.go | 6 ++ .../api_op_AdminUpdateAuthEventFeedback.go | 6 ++ .../api_op_AdminUpdateDeviceStatus.go | 6 ++ .../api_op_AdminUpdateUserAttributes.go | 6 ++ .../api_op_AdminUserGlobalSignOut.go | 6 ++ .../api_op_AssociateSoftwareToken.go | 6 ++ .../api_op_ChangePassword.go | 6 ++ .../api_op_ConfirmDevice.go | 6 ++ .../api_op_ConfirmForgotPassword.go | 6 ++ .../api_op_ConfirmSignUp.go | 6 ++ .../api_op_CreateGroup.go | 6 ++ .../api_op_CreateIdentityProvider.go | 6 ++ .../api_op_CreateResourceServer.go | 6 ++ .../api_op_CreateUserImportJob.go | 6 ++ .../api_op_CreateUserPool.go | 6 ++ .../api_op_CreateUserPoolClient.go | 6 ++ .../api_op_CreateUserPoolDomain.go | 6 ++ .../api_op_DeleteGroup.go | 6 ++ .../api_op_DeleteIdentityProvider.go | 6 ++ .../api_op_DeleteResourceServer.go | 6 ++ .../api_op_DeleteUser.go | 6 ++ .../api_op_DeleteUserAttributes.go | 6 ++ .../api_op_DeleteUserPool.go | 6 ++ .../api_op_DeleteUserPoolClient.go | 6 ++ .../api_op_DeleteUserPoolDomain.go | 6 ++ .../api_op_DescribeIdentityProvider.go | 6 ++ .../api_op_DescribeResourceServer.go | 6 ++ .../api_op_DescribeRiskConfiguration.go | 6 ++ .../api_op_DescribeUserImportJob.go | 6 ++ .../api_op_DescribeUserPool.go | 6 ++ .../api_op_DescribeUserPoolClient.go | 6 ++ .../api_op_DescribeUserPoolDomain.go | 6 ++ .../api_op_ForgetDevice.go | 6 ++ .../api_op_ForgotPassword.go | 6 ++ .../api_op_GetCSVHeader.go | 6 ++ .../api_op_GetDevice.go | 6 ++ .../api_op_GetGroup.go | 6 ++ .../api_op_GetIdentityProviderByIdentifier.go | 6 ++ .../api_op_GetSigningCertificate.go | 6 ++ .../api_op_GetUICustomization.go | 6 ++ .../cognitoidentityprovider/api_op_GetUser.go | 6 ++ ...api_op_GetUserAttributeVerificationCode.go | 6 ++ .../api_op_GetUserPoolMfaConfig.go | 6 ++ .../api_op_GlobalSignOut.go | 6 ++ .../api_op_InitiateAuth.go | 6 ++ .../api_op_ListDevices.go | 6 ++ .../api_op_ListGroups.go | 6 ++ .../api_op_ListIdentityProviders.go | 6 ++ .../api_op_ListResourceServers.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ListUserImportJobs.go | 6 ++ .../api_op_ListUserPoolClients.go | 6 ++ .../api_op_ListUserPools.go | 6 ++ .../api_op_ListUsers.go | 6 ++ .../api_op_ListUsersInGroup.go | 6 ++ .../api_op_ResendConfirmationCode.go | 6 ++ .../api_op_RespondToAuthChallenge.go | 6 ++ .../api_op_SetRiskConfiguration.go | 6 ++ .../api_op_SetUICustomization.go | 6 ++ .../api_op_SetUserMFAPreference.go | 6 ++ .../api_op_SetUserPoolMfaConfig.go | 6 ++ .../api_op_SetUserSettings.go | 6 ++ .../cognitoidentityprovider/api_op_SignUp.go | 6 ++ .../api_op_StartUserImportJob.go | 6 ++ .../api_op_StopUserImportJob.go | 6 ++ .../api_op_TagResource.go | 6 ++ .../api_op_UntagResource.go | 6 ++ .../api_op_UpdateAuthEventFeedback.go | 6 ++ .../api_op_UpdateDeviceStatus.go | 6 ++ .../api_op_UpdateGroup.go | 6 ++ .../api_op_UpdateIdentityProvider.go | 6 ++ .../api_op_UpdateResourceServer.go | 6 ++ .../api_op_UpdateUserAttributes.go | 6 ++ .../api_op_UpdateUserPool.go | 6 ++ .../api_op_UpdateUserPoolClient.go | 6 ++ .../api_op_UpdateUserPoolDomain.go | 6 ++ .../api_op_VerifySoftwareToken.go | 6 ++ .../api_op_VerifyUserAttribute.go | 6 ++ service/cognitoidentityprovider/go.mod | 4 +- service/cognitoidentityprovider/go.sum | 2 - service/cognitosync/api_client.go | 52 ++++++++-- service/cognitosync/api_op_BulkPublish.go | 6 ++ service/cognitosync/api_op_DeleteDataset.go | 6 ++ service/cognitosync/api_op_DescribeDataset.go | 6 ++ .../api_op_DescribeIdentityPoolUsage.go | 6 ++ .../api_op_DescribeIdentityUsage.go | 6 ++ .../api_op_GetBulkPublishDetails.go | 6 ++ .../cognitosync/api_op_GetCognitoEvents.go | 6 ++ .../api_op_GetIdentityPoolConfiguration.go | 6 ++ service/cognitosync/api_op_ListDatasets.go | 6 ++ .../api_op_ListIdentityPoolUsage.go | 6 ++ service/cognitosync/api_op_ListRecords.go | 6 ++ service/cognitosync/api_op_RegisterDevice.go | 6 ++ .../cognitosync/api_op_SetCognitoEvents.go | 6 ++ .../api_op_SetIdentityPoolConfiguration.go | 6 ++ .../cognitosync/api_op_SubscribeToDataset.go | 6 ++ .../api_op_UnsubscribeFromDataset.go | 6 ++ service/cognitosync/api_op_UpdateRecords.go | 6 ++ service/cognitosync/go.mod | 4 +- service/cognitosync/go.sum | 2 - service/comprehend/api_client.go | 52 ++++++++-- .../api_op_BatchDetectDominantLanguage.go | 6 ++ .../comprehend/api_op_BatchDetectEntities.go | 6 ++ .../api_op_BatchDetectKeyPhrases.go | 6 ++ .../comprehend/api_op_BatchDetectSentiment.go | 6 ++ .../comprehend/api_op_BatchDetectSyntax.go | 6 ++ service/comprehend/api_op_ClassifyDocument.go | 6 ++ .../api_op_CreateDocumentClassifier.go | 6 ++ service/comprehend/api_op_CreateEndpoint.go | 6 ++ .../api_op_CreateEntityRecognizer.go | 6 ++ .../api_op_DeleteDocumentClassifier.go | 6 ++ service/comprehend/api_op_DeleteEndpoint.go | 6 ++ .../api_op_DeleteEntityRecognizer.go | 6 ++ ...pi_op_DescribeDocumentClassificationJob.go | 6 ++ .../api_op_DescribeDocumentClassifier.go | 6 ++ ...op_DescribeDominantLanguageDetectionJob.go | 6 ++ service/comprehend/api_op_DescribeEndpoint.go | 6 ++ .../api_op_DescribeEntitiesDetectionJob.go | 6 ++ .../api_op_DescribeEntityRecognizer.go | 6 ++ .../api_op_DescribeKeyPhrasesDetectionJob.go | 6 ++ .../api_op_DescribePiiEntitiesDetectionJob.go | 6 ++ .../api_op_DescribeSentimentDetectionJob.go | 6 ++ .../api_op_DescribeTopicsDetectionJob.go | 6 ++ .../api_op_DetectDominantLanguage.go | 6 ++ service/comprehend/api_op_DetectEntities.go | 6 ++ service/comprehend/api_op_DetectKeyPhrases.go | 6 ++ .../comprehend/api_op_DetectPiiEntities.go | 6 ++ service/comprehend/api_op_DetectSentiment.go | 6 ++ service/comprehend/api_op_DetectSyntax.go | 6 ++ .../api_op_ListDocumentClassificationJobs.go | 6 ++ .../api_op_ListDocumentClassifiers.go | 6 ++ ...pi_op_ListDominantLanguageDetectionJobs.go | 6 ++ service/comprehend/api_op_ListEndpoints.go | 6 ++ .../api_op_ListEntitiesDetectionJobs.go | 6 ++ .../api_op_ListEntityRecognizers.go | 6 ++ .../api_op_ListKeyPhrasesDetectionJobs.go | 6 ++ .../api_op_ListPiiEntitiesDetectionJobs.go | 6 ++ .../api_op_ListSentimentDetectionJobs.go | 6 ++ .../comprehend/api_op_ListTagsForResource.go | 6 ++ .../api_op_ListTopicsDetectionJobs.go | 6 ++ .../api_op_StartDocumentClassificationJob.go | 6 ++ ...pi_op_StartDominantLanguageDetectionJob.go | 6 ++ .../api_op_StartEntitiesDetectionJob.go | 6 ++ .../api_op_StartKeyPhrasesDetectionJob.go | 6 ++ .../api_op_StartPiiEntitiesDetectionJob.go | 6 ++ .../api_op_StartSentimentDetectionJob.go | 6 ++ .../api_op_StartTopicsDetectionJob.go | 6 ++ ...api_op_StopDominantLanguageDetectionJob.go | 6 ++ .../api_op_StopEntitiesDetectionJob.go | 6 ++ .../api_op_StopKeyPhrasesDetectionJob.go | 6 ++ .../api_op_StopPiiEntitiesDetectionJob.go | 6 ++ .../api_op_StopSentimentDetectionJob.go | 6 ++ .../api_op_StopTrainingDocumentClassifier.go | 6 ++ .../api_op_StopTrainingEntityRecognizer.go | 6 ++ service/comprehend/api_op_TagResource.go | 6 ++ service/comprehend/api_op_UntagResource.go | 6 ++ service/comprehend/api_op_UpdateEndpoint.go | 6 ++ service/comprehend/go.mod | 4 +- service/comprehend/go.sum | 2 - service/comprehendmedical/api_client.go | 52 ++++++++-- .../api_op_DescribeEntitiesDetectionV2Job.go | 6 ++ .../api_op_DescribeICD10CMInferenceJob.go | 6 ++ .../api_op_DescribePHIDetectionJob.go | 6 ++ .../api_op_DescribeRxNormInferenceJob.go | 6 ++ .../api_op_DetectEntities.go | 6 ++ .../api_op_DetectEntitiesV2.go | 6 ++ service/comprehendmedical/api_op_DetectPHI.go | 6 ++ .../comprehendmedical/api_op_InferICD10CM.go | 6 ++ .../comprehendmedical/api_op_InferRxNorm.go | 6 ++ .../api_op_ListEntitiesDetectionV2Jobs.go | 6 ++ .../api_op_ListICD10CMInferenceJobs.go | 6 ++ .../api_op_ListPHIDetectionJobs.go | 6 ++ .../api_op_ListRxNormInferenceJobs.go | 6 ++ .../api_op_StartEntitiesDetectionV2Job.go | 6 ++ .../api_op_StartICD10CMInferenceJob.go | 6 ++ .../api_op_StartPHIDetectionJob.go | 6 ++ .../api_op_StartRxNormInferenceJob.go | 6 ++ .../api_op_StopEntitiesDetectionV2Job.go | 6 ++ .../api_op_StopICD10CMInferenceJob.go | 6 ++ .../api_op_StopPHIDetectionJob.go | 6 ++ .../api_op_StopRxNormInferenceJob.go | 6 ++ service/comprehendmedical/go.mod | 4 +- service/comprehendmedical/go.sum | 2 - service/computeoptimizer/api_client.go | 52 ++++++++-- ...api_op_DescribeRecommendationExportJobs.go | 6 ++ ...p_ExportAutoScalingGroupRecommendations.go | 6 ++ ...api_op_ExportEC2InstanceRecommendations.go | 6 ++ ...i_op_GetAutoScalingGroupRecommendations.go | 6 ++ .../api_op_GetEC2InstanceRecommendations.go | 6 ++ ...op_GetEC2RecommendationProjectedMetrics.go | 6 ++ .../api_op_GetEnrollmentStatus.go | 6 ++ .../api_op_GetRecommendationSummaries.go | 6 ++ .../api_op_UpdateEnrollmentStatus.go | 6 ++ service/computeoptimizer/go.mod | 4 +- service/computeoptimizer/go.sum | 2 - service/configservice/api_client.go | 52 ++++++++-- .../api_op_BatchGetAggregateResourceConfig.go | 6 ++ .../api_op_BatchGetResourceConfig.go | 6 ++ .../api_op_DeleteAggregationAuthorization.go | 6 ++ .../configservice/api_op_DeleteConfigRule.go | 6 ++ .../api_op_DeleteConfigurationAggregator.go | 6 ++ .../api_op_DeleteConfigurationRecorder.go | 6 ++ .../api_op_DeleteConformancePack.go | 6 ++ .../api_op_DeleteDeliveryChannel.go | 6 ++ .../api_op_DeleteEvaluationResults.go | 6 ++ .../api_op_DeleteOrganizationConfigRule.go | 6 ++ ...pi_op_DeleteOrganizationConformancePack.go | 6 ++ .../api_op_DeletePendingAggregationRequest.go | 6 ++ .../api_op_DeleteRemediationConfiguration.go | 6 ++ .../api_op_DeleteRemediationExceptions.go | 6 ++ .../api_op_DeleteResourceConfig.go | 6 ++ .../api_op_DeleteRetentionConfiguration.go | 6 ++ .../api_op_DeliverConfigSnapshot.go | 6 ++ ...escribeAggregateComplianceByConfigRules.go | 6 ++ ...pi_op_DescribeAggregationAuthorizations.go | 6 ++ .../api_op_DescribeComplianceByConfigRule.go | 6 ++ .../api_op_DescribeComplianceByResource.go | 6 ++ ...i_op_DescribeConfigRuleEvaluationStatus.go | 6 ++ .../api_op_DescribeConfigRules.go | 6 ++ ...ibeConfigurationAggregatorSourcesStatus.go | 6 ++ ...api_op_DescribeConfigurationAggregators.go | 6 ++ ..._op_DescribeConfigurationRecorderStatus.go | 6 ++ .../api_op_DescribeConfigurationRecorders.go | 6 ++ ...pi_op_DescribeConformancePackCompliance.go | 6 ++ .../api_op_DescribeConformancePackStatus.go | 6 ++ .../api_op_DescribeConformancePacks.go | 6 ++ .../api_op_DescribeDeliveryChannelStatus.go | 6 ++ .../api_op_DescribeDeliveryChannels.go | 6 ++ ..._DescribeOrganizationConfigRuleStatuses.go | 6 ++ .../api_op_DescribeOrganizationConfigRules.go | 6 ++ ...ribeOrganizationConformancePackStatuses.go | 6 ++ ...op_DescribeOrganizationConformancePacks.go | 6 ++ ...i_op_DescribePendingAggregationRequests.go | 6 ++ ...pi_op_DescribeRemediationConfigurations.go | 6 ++ .../api_op_DescribeRemediationExceptions.go | 6 ++ ...i_op_DescribeRemediationExecutionStatus.go | 6 ++ .../api_op_DescribeRetentionConfigurations.go | 6 ++ ...tAggregateComplianceDetailsByConfigRule.go | 6 ++ ...GetAggregateConfigRuleComplianceSummary.go | 6 ++ ...op_GetAggregateDiscoveredResourceCounts.go | 6 ++ .../api_op_GetAggregateResourceConfig.go | 6 ++ ...api_op_GetComplianceDetailsByConfigRule.go | 6 ++ .../api_op_GetComplianceDetailsByResource.go | 6 ++ ...api_op_GetComplianceSummaryByConfigRule.go | 6 ++ ...i_op_GetComplianceSummaryByResourceType.go | 6 ++ ..._op_GetConformancePackComplianceDetails.go | 6 ++ ..._op_GetConformancePackComplianceSummary.go | 6 ++ .../api_op_GetDiscoveredResourceCounts.go | 6 ++ ...GetOrganizationConfigRuleDetailedStatus.go | 6 ++ ...ganizationConformancePackDetailedStatus.go | 6 ++ .../api_op_GetResourceConfigHistory.go | 6 ++ ...api_op_ListAggregateDiscoveredResources.go | 6 ++ .../api_op_ListDiscoveredResources.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_PutAggregationAuthorization.go | 6 ++ service/configservice/api_op_PutConfigRule.go | 6 ++ .../api_op_PutConfigurationAggregator.go | 6 ++ .../api_op_PutConfigurationRecorder.go | 6 ++ .../api_op_PutConformancePack.go | 6 ++ .../api_op_PutDeliveryChannel.go | 6 ++ .../configservice/api_op_PutEvaluations.go | 6 ++ .../api_op_PutOrganizationConfigRule.go | 6 ++ .../api_op_PutOrganizationConformancePack.go | 6 ++ .../api_op_PutRemediationConfigurations.go | 6 ++ .../api_op_PutRemediationExceptions.go | 6 ++ .../configservice/api_op_PutResourceConfig.go | 6 ++ .../api_op_PutRetentionConfiguration.go | 6 ++ .../api_op_SelectAggregateResourceConfig.go | 6 ++ .../api_op_SelectResourceConfig.go | 6 ++ .../api_op_StartConfigRulesEvaluation.go | 6 ++ .../api_op_StartConfigurationRecorder.go | 6 ++ .../api_op_StartRemediationExecution.go | 6 ++ .../api_op_StopConfigurationRecorder.go | 6 ++ service/configservice/api_op_TagResource.go | 6 ++ service/configservice/api_op_UntagResource.go | 6 ++ service/configservice/go.mod | 4 +- service/configservice/go.sum | 2 - service/connect/api_client.go | 52 ++++++++-- .../api_op_AssociateRoutingProfileQueues.go | 6 ++ service/connect/api_op_CreateContactFlow.go | 6 ++ .../connect/api_op_CreateRoutingProfile.go | 6 ++ service/connect/api_op_CreateUser.go | 6 ++ service/connect/api_op_DeleteUser.go | 6 ++ service/connect/api_op_DescribeContactFlow.go | 6 ++ .../connect/api_op_DescribeRoutingProfile.go | 6 ++ service/connect/api_op_DescribeUser.go | 6 ++ .../api_op_DescribeUserHierarchyGroup.go | 6 ++ .../api_op_DescribeUserHierarchyStructure.go | 6 ++ ...api_op_DisassociateRoutingProfileQueues.go | 6 ++ .../connect/api_op_GetContactAttributes.go | 6 ++ .../connect/api_op_GetCurrentMetricData.go | 6 ++ service/connect/api_op_GetFederationToken.go | 6 ++ service/connect/api_op_GetMetricData.go | 6 ++ service/connect/api_op_ListContactFlows.go | 6 ++ .../connect/api_op_ListHoursOfOperations.go | 6 ++ service/connect/api_op_ListPhoneNumbers.go | 6 ++ service/connect/api_op_ListPrompts.go | 6 ++ service/connect/api_op_ListQueues.go | 6 ++ .../api_op_ListRoutingProfileQueues.go | 6 ++ service/connect/api_op_ListRoutingProfiles.go | 6 ++ .../connect/api_op_ListSecurityProfiles.go | 6 ++ service/connect/api_op_ListTagsForResource.go | 6 ++ .../connect/api_op_ListUserHierarchyGroups.go | 6 ++ service/connect/api_op_ListUsers.go | 6 ++ .../connect/api_op_ResumeContactRecording.go | 6 ++ service/connect/api_op_StartChatContact.go | 6 ++ .../connect/api_op_StartContactRecording.go | 6 ++ .../api_op_StartOutboundVoiceContact.go | 6 ++ service/connect/api_op_StopContact.go | 6 ++ .../connect/api_op_StopContactRecording.go | 6 ++ .../connect/api_op_SuspendContactRecording.go | 6 ++ service/connect/api_op_TagResource.go | 6 ++ service/connect/api_op_UntagResource.go | 6 ++ .../connect/api_op_UpdateContactAttributes.go | 6 ++ .../api_op_UpdateContactFlowContent.go | 6 ++ .../connect/api_op_UpdateContactFlowName.go | 6 ++ .../api_op_UpdateRoutingProfileConcurrency.go | 6 ++ ...pdateRoutingProfileDefaultOutboundQueue.go | 6 ++ .../api_op_UpdateRoutingProfileName.go | 6 ++ .../api_op_UpdateRoutingProfileQueues.go | 6 ++ service/connect/api_op_UpdateUserHierarchy.go | 6 ++ .../connect/api_op_UpdateUserIdentityInfo.go | 6 ++ .../connect/api_op_UpdateUserPhoneConfig.go | 6 ++ .../api_op_UpdateUserRoutingProfile.go | 6 ++ .../api_op_UpdateUserSecurityProfiles.go | 6 ++ service/connect/go.mod | 4 +- service/connect/go.sum | 2 - service/connectparticipant/api_client.go | 52 ++++++++-- .../api_op_CreateParticipantConnection.go | 6 ++ .../api_op_DisconnectParticipant.go | 6 ++ .../api_op_GetTranscript.go | 6 ++ .../connectparticipant/api_op_SendEvent.go | 6 ++ .../connectparticipant/api_op_SendMessage.go | 6 ++ service/connectparticipant/go.mod | 4 +- service/connectparticipant/go.sum | 2 - .../costandusagereportservice/api_client.go | 52 ++++++++-- .../api_op_DeleteReportDefinition.go | 6 ++ .../api_op_DescribeReportDefinitions.go | 6 ++ .../api_op_ModifyReportDefinition.go | 6 ++ .../api_op_PutReportDefinition.go | 6 ++ service/costandusagereportservice/go.mod | 4 +- service/costandusagereportservice/go.sum | 2 - service/costexplorer/api_client.go | 52 ++++++++-- .../api_op_CreateAnomalyMonitor.go | 6 ++ .../api_op_CreateAnomalySubscription.go | 6 ++ .../api_op_CreateCostCategoryDefinition.go | 6 ++ .../api_op_DeleteAnomalyMonitor.go | 6 ++ .../api_op_DeleteAnomalySubscription.go | 6 ++ .../api_op_DeleteCostCategoryDefinition.go | 6 ++ .../api_op_DescribeCostCategoryDefinition.go | 6 ++ service/costexplorer/api_op_GetAnomalies.go | 6 ++ .../costexplorer/api_op_GetAnomalyMonitors.go | 6 ++ .../api_op_GetAnomalySubscriptions.go | 6 ++ .../costexplorer/api_op_GetCostAndUsage.go | 6 ++ .../api_op_GetCostAndUsageWithResources.go | 6 ++ .../costexplorer/api_op_GetCostForecast.go | 6 ++ .../costexplorer/api_op_GetDimensionValues.go | 6 ++ .../api_op_GetReservationCoverage.go | 6 ++ ...op_GetReservationPurchaseRecommendation.go | 6 ++ .../api_op_GetReservationUtilization.go | 6 ++ .../api_op_GetRightsizingRecommendation.go | 6 ++ .../api_op_GetSavingsPlansCoverage.go | 6 ++ ...p_GetSavingsPlansPurchaseRecommendation.go | 6 ++ .../api_op_GetSavingsPlansUtilization.go | 6 ++ ...pi_op_GetSavingsPlansUtilizationDetails.go | 6 ++ service/costexplorer/api_op_GetTags.go | 6 ++ .../costexplorer/api_op_GetUsageForecast.go | 6 ++ .../api_op_ListCostCategoryDefinitions.go | 6 ++ .../api_op_ProvideAnomalyFeedback.go | 6 ++ .../api_op_UpdateAnomalyMonitor.go | 6 ++ .../api_op_UpdateAnomalySubscription.go | 6 ++ .../api_op_UpdateCostCategoryDefinition.go | 6 ++ service/costexplorer/go.mod | 4 +- service/costexplorer/go.sum | 2 - .../databasemigrationservice/api_client.go | 52 ++++++++-- .../api_op_AddTagsToResource.go | 6 ++ .../api_op_ApplyPendingMaintenanceAction.go | 6 ++ ...i_op_CancelReplicationTaskAssessmentRun.go | 6 ++ .../api_op_CreateEndpoint.go | 6 ++ .../api_op_CreateEventSubscription.go | 6 ++ .../api_op_CreateReplicationInstance.go | 6 ++ .../api_op_CreateReplicationSubnetGroup.go | 6 ++ .../api_op_CreateReplicationTask.go | 6 ++ .../api_op_DeleteCertificate.go | 6 ++ .../api_op_DeleteConnection.go | 6 ++ .../api_op_DeleteEndpoint.go | 6 ++ .../api_op_DeleteEventSubscription.go | 6 ++ .../api_op_DeleteReplicationInstance.go | 6 ++ .../api_op_DeleteReplicationSubnetGroup.go | 6 ++ .../api_op_DeleteReplicationTask.go | 6 ++ ...i_op_DeleteReplicationTaskAssessmentRun.go | 6 ++ .../api_op_DescribeAccountAttributes.go | 6 ++ ...DescribeApplicableIndividualAssessments.go | 6 ++ .../api_op_DescribeCertificates.go | 6 ++ .../api_op_DescribeConnections.go | 6 ++ .../api_op_DescribeEndpointTypes.go | 6 ++ .../api_op_DescribeEndpoints.go | 6 ++ .../api_op_DescribeEventCategories.go | 6 ++ .../api_op_DescribeEventSubscriptions.go | 6 ++ .../api_op_DescribeEvents.go | 6 ++ ...p_DescribeOrderableReplicationInstances.go | 6 ++ ...pi_op_DescribePendingMaintenanceActions.go | 6 ++ .../api_op_DescribeRefreshSchemasStatus.go | 6 ++ ..._op_DescribeReplicationInstanceTaskLogs.go | 6 ++ .../api_op_DescribeReplicationInstances.go | 6 ++ .../api_op_DescribeReplicationSubnetGroups.go | 6 ++ ...escribeReplicationTaskAssessmentResults.go | 6 ++ ...p_DescribeReplicationTaskAssessmentRuns.go | 6 ++ ...ibeReplicationTaskIndividualAssessments.go | 6 ++ .../api_op_DescribeReplicationTasks.go | 6 ++ .../api_op_DescribeSchemas.go | 6 ++ .../api_op_DescribeTableStatistics.go | 6 ++ .../api_op_ImportCertificate.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ModifyEndpoint.go | 6 ++ .../api_op_ModifyEventSubscription.go | 6 ++ .../api_op_ModifyReplicationInstance.go | 6 ++ .../api_op_ModifyReplicationSubnetGroup.go | 6 ++ .../api_op_ModifyReplicationTask.go | 6 ++ .../api_op_RebootReplicationInstance.go | 6 ++ .../api_op_RefreshSchemas.go | 6 ++ .../api_op_ReloadTables.go | 6 ++ .../api_op_RemoveTagsFromResource.go | 6 ++ .../api_op_StartReplicationTask.go | 6 ++ .../api_op_StartReplicationTaskAssessment.go | 6 ++ ...pi_op_StartReplicationTaskAssessmentRun.go | 6 ++ .../api_op_StopReplicationTask.go | 6 ++ .../api_op_TestConnection.go | 6 ++ service/databasemigrationservice/go.mod | 4 +- service/databasemigrationservice/go.sum | 2 - service/dataexchange/api_client.go | 52 ++++++++-- service/dataexchange/api_op_CancelJob.go | 6 ++ service/dataexchange/api_op_CreateDataSet.go | 6 ++ service/dataexchange/api_op_CreateJob.go | 6 ++ service/dataexchange/api_op_CreateRevision.go | 6 ++ service/dataexchange/api_op_DeleteAsset.go | 6 ++ service/dataexchange/api_op_DeleteDataSet.go | 6 ++ service/dataexchange/api_op_DeleteRevision.go | 6 ++ service/dataexchange/api_op_GetAsset.go | 6 ++ service/dataexchange/api_op_GetDataSet.go | 6 ++ service/dataexchange/api_op_GetJob.go | 6 ++ service/dataexchange/api_op_GetRevision.go | 6 ++ .../api_op_ListDataSetRevisions.go | 6 ++ service/dataexchange/api_op_ListDataSets.go | 6 ++ service/dataexchange/api_op_ListJobs.go | 6 ++ .../dataexchange/api_op_ListRevisionAssets.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/dataexchange/api_op_StartJob.go | 6 ++ service/dataexchange/api_op_TagResource.go | 6 ++ service/dataexchange/api_op_UntagResource.go | 6 ++ service/dataexchange/api_op_UpdateAsset.go | 6 ++ service/dataexchange/api_op_UpdateDataSet.go | 6 ++ service/dataexchange/api_op_UpdateRevision.go | 6 ++ service/dataexchange/go.mod | 4 +- service/dataexchange/go.sum | 2 - service/datapipeline/api_client.go | 52 ++++++++-- .../datapipeline/api_op_ActivatePipeline.go | 6 ++ service/datapipeline/api_op_AddTags.go | 6 ++ service/datapipeline/api_op_CreatePipeline.go | 6 ++ .../datapipeline/api_op_DeactivatePipeline.go | 6 ++ service/datapipeline/api_op_DeletePipeline.go | 6 ++ .../datapipeline/api_op_DescribeObjects.go | 6 ++ .../datapipeline/api_op_DescribePipelines.go | 6 ++ .../datapipeline/api_op_EvaluateExpression.go | 6 ++ .../api_op_GetPipelineDefinition.go | 6 ++ service/datapipeline/api_op_ListPipelines.go | 6 ++ service/datapipeline/api_op_PollForTask.go | 6 ++ .../api_op_PutPipelineDefinition.go | 6 ++ service/datapipeline/api_op_QueryObjects.go | 6 ++ service/datapipeline/api_op_RemoveTags.go | 6 ++ .../datapipeline/api_op_ReportTaskProgress.go | 6 ++ .../api_op_ReportTaskRunnerHeartbeat.go | 6 ++ service/datapipeline/api_op_SetStatus.go | 6 ++ service/datapipeline/api_op_SetTaskStatus.go | 6 ++ .../api_op_ValidatePipelineDefinition.go | 6 ++ service/datapipeline/go.mod | 4 +- service/datapipeline/go.sum | 2 - service/datasync/api_client.go | 52 ++++++++-- .../datasync/api_op_CancelTaskExecution.go | 6 ++ service/datasync/api_op_CreateAgent.go | 6 ++ service/datasync/api_op_CreateLocationEfs.go | 6 ++ .../api_op_CreateLocationFsxWindows.go | 6 ++ service/datasync/api_op_CreateLocationNfs.go | 6 ++ .../api_op_CreateLocationObjectStorage.go | 6 ++ service/datasync/api_op_CreateLocationS3.go | 6 ++ service/datasync/api_op_CreateLocationSmb.go | 6 ++ service/datasync/api_op_CreateTask.go | 6 ++ service/datasync/api_op_DeleteAgent.go | 6 ++ service/datasync/api_op_DeleteLocation.go | 6 ++ service/datasync/api_op_DeleteTask.go | 6 ++ service/datasync/api_op_DescribeAgent.go | 6 ++ .../datasync/api_op_DescribeLocationEfs.go | 6 ++ .../api_op_DescribeLocationFsxWindows.go | 6 ++ .../datasync/api_op_DescribeLocationNfs.go | 6 ++ .../api_op_DescribeLocationObjectStorage.go | 6 ++ service/datasync/api_op_DescribeLocationS3.go | 6 ++ .../datasync/api_op_DescribeLocationSmb.go | 6 ++ service/datasync/api_op_DescribeTask.go | 6 ++ .../datasync/api_op_DescribeTaskExecution.go | 6 ++ service/datasync/api_op_ListAgents.go | 6 ++ service/datasync/api_op_ListLocations.go | 6 ++ .../datasync/api_op_ListTagsForResource.go | 6 ++ service/datasync/api_op_ListTaskExecutions.go | 6 ++ service/datasync/api_op_ListTasks.go | 6 ++ service/datasync/api_op_StartTaskExecution.go | 6 ++ service/datasync/api_op_TagResource.go | 6 ++ service/datasync/api_op_UntagResource.go | 6 ++ service/datasync/api_op_UpdateAgent.go | 6 ++ service/datasync/api_op_UpdateTask.go | 6 ++ service/datasync/go.mod | 4 +- service/datasync/go.sum | 2 - service/dax/api_client.go | 52 ++++++++-- service/dax/api_op_CreateCluster.go | 6 ++ service/dax/api_op_CreateParameterGroup.go | 6 ++ service/dax/api_op_CreateSubnetGroup.go | 6 ++ .../dax/api_op_DecreaseReplicationFactor.go | 6 ++ service/dax/api_op_DeleteCluster.go | 6 ++ service/dax/api_op_DeleteParameterGroup.go | 6 ++ service/dax/api_op_DeleteSubnetGroup.go | 6 ++ service/dax/api_op_DescribeClusters.go | 6 ++ .../dax/api_op_DescribeDefaultParameters.go | 6 ++ service/dax/api_op_DescribeEvents.go | 6 ++ service/dax/api_op_DescribeParameterGroups.go | 6 ++ service/dax/api_op_DescribeParameters.go | 6 ++ service/dax/api_op_DescribeSubnetGroups.go | 6 ++ .../dax/api_op_IncreaseReplicationFactor.go | 6 ++ service/dax/api_op_ListTags.go | 6 ++ service/dax/api_op_RebootNode.go | 6 ++ service/dax/api_op_TagResource.go | 6 ++ service/dax/api_op_UntagResource.go | 6 ++ service/dax/api_op_UpdateCluster.go | 6 ++ service/dax/api_op_UpdateParameterGroup.go | 6 ++ service/dax/api_op_UpdateSubnetGroup.go | 6 ++ service/dax/go.mod | 4 +- service/dax/go.sum | 2 - service/detective/api_client.go | 52 ++++++++-- service/detective/api_op_AcceptInvitation.go | 6 ++ service/detective/api_op_CreateGraph.go | 6 ++ service/detective/api_op_CreateMembers.go | 6 ++ service/detective/api_op_DeleteGraph.go | 6 ++ service/detective/api_op_DeleteMembers.go | 6 ++ .../api_op_DisassociateMembership.go | 6 ++ service/detective/api_op_GetMembers.go | 6 ++ service/detective/api_op_ListGraphs.go | 6 ++ service/detective/api_op_ListInvitations.go | 6 ++ service/detective/api_op_ListMembers.go | 6 ++ service/detective/api_op_RejectInvitation.go | 6 ++ .../detective/api_op_StartMonitoringMember.go | 6 ++ service/detective/go.mod | 4 +- service/detective/go.sum | 2 - service/devicefarm/api_client.go | 52 ++++++++-- service/devicefarm/api_op_CreateDevicePool.go | 6 ++ .../api_op_CreateInstanceProfile.go | 6 ++ .../devicefarm/api_op_CreateNetworkProfile.go | 6 ++ service/devicefarm/api_op_CreateProject.go | 6 ++ .../api_op_CreateRemoteAccessSession.go | 6 ++ .../api_op_CreateTestGridProject.go | 6 ++ .../devicefarm/api_op_CreateTestGridUrl.go | 6 ++ service/devicefarm/api_op_CreateUpload.go | 6 ++ .../api_op_CreateVPCEConfiguration.go | 6 ++ service/devicefarm/api_op_DeleteDevicePool.go | 6 ++ .../api_op_DeleteInstanceProfile.go | 6 ++ .../devicefarm/api_op_DeleteNetworkProfile.go | 6 ++ service/devicefarm/api_op_DeleteProject.go | 6 ++ .../api_op_DeleteRemoteAccessSession.go | 6 ++ service/devicefarm/api_op_DeleteRun.go | 6 ++ .../api_op_DeleteTestGridProject.go | 6 ++ service/devicefarm/api_op_DeleteUpload.go | 6 ++ .../api_op_DeleteVPCEConfiguration.go | 6 ++ .../devicefarm/api_op_GetAccountSettings.go | 6 ++ service/devicefarm/api_op_GetDevice.go | 6 ++ .../devicefarm/api_op_GetDeviceInstance.go | 6 ++ service/devicefarm/api_op_GetDevicePool.go | 6 ++ .../api_op_GetDevicePoolCompatibility.go | 6 ++ .../devicefarm/api_op_GetInstanceProfile.go | 6 ++ service/devicefarm/api_op_GetJob.go | 6 ++ .../devicefarm/api_op_GetNetworkProfile.go | 6 ++ .../devicefarm/api_op_GetOfferingStatus.go | 6 ++ service/devicefarm/api_op_GetProject.go | 6 ++ .../api_op_GetRemoteAccessSession.go | 6 ++ service/devicefarm/api_op_GetRun.go | 6 ++ service/devicefarm/api_op_GetSuite.go | 6 ++ service/devicefarm/api_op_GetTest.go | 6 ++ .../devicefarm/api_op_GetTestGridProject.go | 6 ++ .../devicefarm/api_op_GetTestGridSession.go | 6 ++ service/devicefarm/api_op_GetUpload.go | 6 ++ .../devicefarm/api_op_GetVPCEConfiguration.go | 6 ++ .../api_op_InstallToRemoteAccessSession.go | 6 ++ service/devicefarm/api_op_ListArtifacts.go | 6 ++ .../devicefarm/api_op_ListDeviceInstances.go | 6 ++ service/devicefarm/api_op_ListDevicePools.go | 6 ++ service/devicefarm/api_op_ListDevices.go | 6 ++ .../devicefarm/api_op_ListInstanceProfiles.go | 6 ++ service/devicefarm/api_op_ListJobs.go | 6 ++ .../devicefarm/api_op_ListNetworkProfiles.go | 6 ++ .../api_op_ListOfferingPromotions.go | 6 ++ .../api_op_ListOfferingTransactions.go | 6 ++ service/devicefarm/api_op_ListOfferings.go | 6 ++ service/devicefarm/api_op_ListProjects.go | 6 ++ .../api_op_ListRemoteAccessSessions.go | 6 ++ service/devicefarm/api_op_ListRuns.go | 6 ++ service/devicefarm/api_op_ListSamples.go | 6 ++ service/devicefarm/api_op_ListSuites.go | 6 ++ .../devicefarm/api_op_ListTagsForResource.go | 6 ++ .../devicefarm/api_op_ListTestGridProjects.go | 6 ++ .../api_op_ListTestGridSessionActions.go | 6 ++ .../api_op_ListTestGridSessionArtifacts.go | 6 ++ .../devicefarm/api_op_ListTestGridSessions.go | 6 ++ service/devicefarm/api_op_ListTests.go | 6 ++ .../devicefarm/api_op_ListUniqueProblems.go | 6 ++ service/devicefarm/api_op_ListUploads.go | 6 ++ .../api_op_ListVPCEConfigurations.go | 6 ++ service/devicefarm/api_op_PurchaseOffering.go | 6 ++ service/devicefarm/api_op_RenewOffering.go | 6 ++ service/devicefarm/api_op_ScheduleRun.go | 6 ++ service/devicefarm/api_op_StopJob.go | 6 ++ .../api_op_StopRemoteAccessSession.go | 6 ++ service/devicefarm/api_op_StopRun.go | 6 ++ service/devicefarm/api_op_TagResource.go | 6 ++ service/devicefarm/api_op_UntagResource.go | 6 ++ .../devicefarm/api_op_UpdateDeviceInstance.go | 6 ++ service/devicefarm/api_op_UpdateDevicePool.go | 6 ++ .../api_op_UpdateInstanceProfile.go | 6 ++ .../devicefarm/api_op_UpdateNetworkProfile.go | 6 ++ service/devicefarm/api_op_UpdateProject.go | 6 ++ .../api_op_UpdateTestGridProject.go | 6 ++ service/devicefarm/api_op_UpdateUpload.go | 6 ++ .../api_op_UpdateVPCEConfiguration.go | 6 ++ service/devicefarm/go.mod | 4 +- service/devicefarm/go.sum | 2 - service/directconnect/api_client.go | 52 ++++++++-- ...DirectConnectGatewayAssociationProposal.go | 6 ++ ...api_op_AllocateConnectionOnInterconnect.go | 6 ++ .../api_op_AllocateHostedConnection.go | 6 ++ .../api_op_AllocatePrivateVirtualInterface.go | 6 ++ .../api_op_AllocatePublicVirtualInterface.go | 6 ++ .../api_op_AllocateTransitVirtualInterface.go | 6 ++ .../api_op_AssociateConnectionWithLag.go | 6 ++ .../api_op_AssociateHostedConnection.go | 6 ++ .../api_op_AssociateVirtualInterface.go | 6 ++ .../directconnect/api_op_ConfirmConnection.go | 6 ++ .../api_op_ConfirmPrivateVirtualInterface.go | 6 ++ .../api_op_ConfirmPublicVirtualInterface.go | 6 ++ .../api_op_ConfirmTransitVirtualInterface.go | 6 ++ service/directconnect/api_op_CreateBGPPeer.go | 6 ++ .../directconnect/api_op_CreateConnection.go | 6 ++ .../api_op_CreateDirectConnectGateway.go | 6 ++ ...p_CreateDirectConnectGatewayAssociation.go | 6 ++ ...DirectConnectGatewayAssociationProposal.go | 6 ++ .../api_op_CreateInterconnect.go | 6 ++ service/directconnect/api_op_CreateLag.go | 6 ++ .../api_op_CreatePrivateVirtualInterface.go | 6 ++ .../api_op_CreatePublicVirtualInterface.go | 6 ++ .../api_op_CreateTransitVirtualInterface.go | 6 ++ service/directconnect/api_op_DeleteBGPPeer.go | 6 ++ .../directconnect/api_op_DeleteConnection.go | 6 ++ .../api_op_DeleteDirectConnectGateway.go | 6 ++ ...p_DeleteDirectConnectGatewayAssociation.go | 6 ++ ...DirectConnectGatewayAssociationProposal.go | 6 ++ .../api_op_DeleteInterconnect.go | 6 ++ service/directconnect/api_op_DeleteLag.go | 6 ++ .../api_op_DeleteVirtualInterface.go | 6 ++ .../api_op_DescribeConnectionLoa.go | 6 ++ .../api_op_DescribeConnections.go | 6 ++ ...pi_op_DescribeConnectionsOnInterconnect.go | 6 ++ ...irectConnectGatewayAssociationProposals.go | 6 ++ ...escribeDirectConnectGatewayAssociations.go | 6 ++ ...DescribeDirectConnectGatewayAttachments.go | 6 ++ .../api_op_DescribeDirectConnectGateways.go | 6 ++ .../api_op_DescribeHostedConnections.go | 6 ++ .../api_op_DescribeInterconnectLoa.go | 6 ++ .../api_op_DescribeInterconnects.go | 6 ++ service/directconnect/api_op_DescribeLags.go | 6 ++ service/directconnect/api_op_DescribeLoa.go | 6 ++ .../directconnect/api_op_DescribeLocations.go | 6 ++ service/directconnect/api_op_DescribeTags.go | 6 ++ .../api_op_DescribeVirtualGateways.go | 6 ++ .../api_op_DescribeVirtualInterfaces.go | 6 ++ .../api_op_DisassociateConnectionFromLag.go | 6 ++ .../api_op_ListVirtualInterfaceTestHistory.go | 6 ++ .../api_op_StartBgpFailoverTest.go | 6 ++ .../api_op_StopBgpFailoverTest.go | 6 ++ service/directconnect/api_op_TagResource.go | 6 ++ service/directconnect/api_op_UntagResource.go | 6 ++ ...p_UpdateDirectConnectGatewayAssociation.go | 6 ++ service/directconnect/api_op_UpdateLag.go | 6 ++ ...api_op_UpdateVirtualInterfaceAttributes.go | 6 ++ service/directconnect/go.mod | 4 +- service/directconnect/go.sum | 2 - service/directoryservice/api_client.go | 52 ++++++++-- .../api_op_AcceptSharedDirectory.go | 6 ++ .../directoryservice/api_op_AddIpRoutes.go | 6 ++ .../api_op_AddTagsToResource.go | 6 ++ .../api_op_CancelSchemaExtension.go | 6 ++ .../api_op_ConnectDirectory.go | 6 ++ .../directoryservice/api_op_CreateAlias.go | 6 ++ .../directoryservice/api_op_CreateComputer.go | 6 ++ .../api_op_CreateConditionalForwarder.go | 6 ++ .../api_op_CreateDirectory.go | 6 ++ .../api_op_CreateLogSubscription.go | 6 ++ .../api_op_CreateMicrosoftAD.go | 6 ++ .../directoryservice/api_op_CreateSnapshot.go | 6 ++ .../directoryservice/api_op_CreateTrust.go | 6 ++ .../api_op_DeleteConditionalForwarder.go | 6 ++ .../api_op_DeleteDirectory.go | 6 ++ .../api_op_DeleteLogSubscription.go | 6 ++ .../directoryservice/api_op_DeleteSnapshot.go | 6 ++ .../directoryservice/api_op_DeleteTrust.go | 6 ++ .../api_op_DeregisterCertificate.go | 6 ++ .../api_op_DeregisterEventTopic.go | 6 ++ .../api_op_DescribeCertificate.go | 6 ++ .../api_op_DescribeConditionalForwarders.go | 6 ++ .../api_op_DescribeDirectories.go | 6 ++ .../api_op_DescribeDomainControllers.go | 6 ++ .../api_op_DescribeEventTopics.go | 6 ++ .../api_op_DescribeLDAPSSettings.go | 6 ++ .../api_op_DescribeSharedDirectories.go | 6 ++ .../api_op_DescribeSnapshots.go | 6 ++ .../directoryservice/api_op_DescribeTrusts.go | 6 ++ .../directoryservice/api_op_DisableLDAPS.go | 6 ++ .../directoryservice/api_op_DisableRadius.go | 6 ++ service/directoryservice/api_op_DisableSso.go | 6 ++ .../directoryservice/api_op_EnableLDAPS.go | 6 ++ .../directoryservice/api_op_EnableRadius.go | 6 ++ service/directoryservice/api_op_EnableSso.go | 6 ++ .../api_op_GetDirectoryLimits.go | 6 ++ .../api_op_GetSnapshotLimits.go | 6 ++ .../api_op_ListCertificates.go | 6 ++ .../directoryservice/api_op_ListIpRoutes.go | 6 ++ .../api_op_ListLogSubscriptions.go | 6 ++ .../api_op_ListSchemaExtensions.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_RegisterCertificate.go | 6 ++ .../api_op_RegisterEventTopic.go | 6 ++ .../api_op_RejectSharedDirectory.go | 6 ++ .../directoryservice/api_op_RemoveIpRoutes.go | 6 ++ .../api_op_RemoveTagsFromResource.go | 6 ++ .../api_op_ResetUserPassword.go | 6 ++ .../api_op_RestoreFromSnapshot.go | 6 ++ .../directoryservice/api_op_ShareDirectory.go | 6 ++ .../api_op_StartSchemaExtension.go | 6 ++ .../api_op_UnshareDirectory.go | 6 ++ .../api_op_UpdateConditionalForwarder.go | 6 ++ .../api_op_UpdateNumberOfDomainControllers.go | 6 ++ .../directoryservice/api_op_UpdateRadius.go | 6 ++ .../directoryservice/api_op_UpdateTrust.go | 6 ++ .../directoryservice/api_op_VerifyTrust.go | 6 ++ service/directoryservice/go.mod | 4 +- service/directoryservice/go.sum | 2 - service/dlm/api_client.go | 52 ++++++++-- service/dlm/api_op_CreateLifecyclePolicy.go | 6 ++ service/dlm/api_op_DeleteLifecyclePolicy.go | 6 ++ service/dlm/api_op_GetLifecyclePolicies.go | 6 ++ service/dlm/api_op_GetLifecyclePolicy.go | 6 ++ service/dlm/api_op_ListTagsForResource.go | 6 ++ service/dlm/api_op_TagResource.go | 6 ++ service/dlm/api_op_UntagResource.go | 6 ++ service/dlm/api_op_UpdateLifecyclePolicy.go | 6 ++ service/dlm/go.mod | 4 +- service/dlm/go.sum | 2 - service/docdb/api_client.go | 52 ++++++++-- service/docdb/api_op_AddTagsToResource.go | 6 ++ .../api_op_ApplyPendingMaintenanceAction.go | 6 ++ .../api_op_CopyDBClusterParameterGroup.go | 6 ++ service/docdb/api_op_CopyDBClusterSnapshot.go | 6 ++ service/docdb/api_op_CreateDBCluster.go | 6 ++ .../api_op_CreateDBClusterParameterGroup.go | 6 ++ .../docdb/api_op_CreateDBClusterSnapshot.go | 6 ++ service/docdb/api_op_CreateDBInstance.go | 6 ++ service/docdb/api_op_CreateDBSubnetGroup.go | 6 ++ service/docdb/api_op_DeleteDBCluster.go | 6 ++ .../api_op_DeleteDBClusterParameterGroup.go | 6 ++ .../docdb/api_op_DeleteDBClusterSnapshot.go | 6 ++ service/docdb/api_op_DeleteDBInstance.go | 6 ++ service/docdb/api_op_DeleteDBSubnetGroup.go | 6 ++ service/docdb/api_op_DescribeCertificates.go | 6 ++ ...api_op_DescribeDBClusterParameterGroups.go | 6 ++ .../api_op_DescribeDBClusterParameters.go | 6 ++ ..._op_DescribeDBClusterSnapshotAttributes.go | 6 ++ .../api_op_DescribeDBClusterSnapshots.go | 6 ++ service/docdb/api_op_DescribeDBClusters.go | 6 ++ .../docdb/api_op_DescribeDBEngineVersions.go | 6 ++ service/docdb/api_op_DescribeDBInstances.go | 6 ++ .../docdb/api_op_DescribeDBSubnetGroups.go | 6 ++ ..._DescribeEngineDefaultClusterParameters.go | 6 ++ .../docdb/api_op_DescribeEventCategories.go | 6 ++ service/docdb/api_op_DescribeEvents.go | 6 ++ ...i_op_DescribeOrderableDBInstanceOptions.go | 6 ++ ...pi_op_DescribePendingMaintenanceActions.go | 6 ++ service/docdb/api_op_FailoverDBCluster.go | 6 ++ service/docdb/api_op_ListTagsForResource.go | 6 ++ service/docdb/api_op_ModifyDBCluster.go | 6 ++ .../api_op_ModifyDBClusterParameterGroup.go | 6 ++ ...api_op_ModifyDBClusterSnapshotAttribute.go | 6 ++ service/docdb/api_op_ModifyDBInstance.go | 6 ++ service/docdb/api_op_ModifyDBSubnetGroup.go | 6 ++ service/docdb/api_op_RebootDBInstance.go | 6 ++ .../docdb/api_op_RemoveTagsFromResource.go | 6 ++ .../api_op_ResetDBClusterParameterGroup.go | 6 ++ .../api_op_RestoreDBClusterFromSnapshot.go | 6 ++ .../api_op_RestoreDBClusterToPointInTime.go | 6 ++ service/docdb/api_op_StartDBCluster.go | 6 ++ service/docdb/api_op_StopDBCluster.go | 6 ++ service/docdb/go.mod | 4 +- service/docdb/go.sum | 2 - service/dynamodb/api_client.go | 52 ++++++++-- service/dynamodb/api_op_BatchGetItem.go | 6 ++ service/dynamodb/api_op_BatchWriteItem.go | 6 ++ service/dynamodb/api_op_CreateBackup.go | 6 ++ service/dynamodb/api_op_CreateGlobalTable.go | 6 ++ service/dynamodb/api_op_CreateTable.go | 6 ++ service/dynamodb/api_op_DeleteBackup.go | 6 ++ service/dynamodb/api_op_DeleteItem.go | 6 ++ service/dynamodb/api_op_DeleteTable.go | 6 ++ service/dynamodb/api_op_DescribeBackup.go | 6 ++ .../api_op_DescribeContinuousBackups.go | 6 ++ .../api_op_DescribeContributorInsights.go | 6 ++ service/dynamodb/api_op_DescribeEndpoints.go | 6 ++ .../dynamodb/api_op_DescribeGlobalTable.go | 6 ++ .../api_op_DescribeGlobalTableSettings.go | 6 ++ service/dynamodb/api_op_DescribeLimits.go | 6 ++ service/dynamodb/api_op_DescribeTable.go | 6 ++ .../api_op_DescribeTableReplicaAutoScaling.go | 6 ++ service/dynamodb/api_op_DescribeTimeToLive.go | 6 ++ service/dynamodb/api_op_GetItem.go | 6 ++ service/dynamodb/api_op_ListBackups.go | 6 ++ .../api_op_ListContributorInsights.go | 6 ++ service/dynamodb/api_op_ListGlobalTables.go | 6 ++ service/dynamodb/api_op_ListTables.go | 6 ++ service/dynamodb/api_op_ListTagsOfResource.go | 6 ++ service/dynamodb/api_op_PutItem.go | 6 ++ service/dynamodb/api_op_Query.go | 6 ++ .../dynamodb/api_op_RestoreTableFromBackup.go | 6 ++ .../api_op_RestoreTableToPointInTime.go | 6 ++ service/dynamodb/api_op_Scan.go | 6 ++ service/dynamodb/api_op_TagResource.go | 6 ++ service/dynamodb/api_op_TransactGetItems.go | 6 ++ service/dynamodb/api_op_TransactWriteItems.go | 6 ++ service/dynamodb/api_op_UntagResource.go | 6 ++ .../api_op_UpdateContinuousBackups.go | 6 ++ .../api_op_UpdateContributorInsights.go | 6 ++ service/dynamodb/api_op_UpdateGlobalTable.go | 6 ++ .../api_op_UpdateGlobalTableSettings.go | 6 ++ service/dynamodb/api_op_UpdateItem.go | 6 ++ service/dynamodb/api_op_UpdateTable.go | 6 ++ .../api_op_UpdateTableReplicaAutoScaling.go | 6 ++ service/dynamodb/api_op_UpdateTimeToLive.go | 6 ++ service/dynamodb/go.mod | 4 +- service/dynamodb/go.sum | 4 - service/dynamodbstreams/api_client.go | 52 ++++++++-- .../dynamodbstreams/api_op_DescribeStream.go | 6 ++ service/dynamodbstreams/api_op_GetRecords.go | 6 ++ .../api_op_GetShardIterator.go | 6 ++ service/dynamodbstreams/api_op_ListStreams.go | 6 ++ service/dynamodbstreams/go.mod | 4 +- service/dynamodbstreams/go.sum | 2 - service/ebs/api_client.go | 52 ++++++++-- service/ebs/api_op_CompleteSnapshot.go | 6 ++ service/ebs/api_op_GetSnapshotBlock.go | 6 ++ service/ebs/api_op_ListChangedBlocks.go | 6 ++ service/ebs/api_op_ListSnapshotBlocks.go | 6 ++ service/ebs/api_op_PutSnapshotBlock.go | 6 ++ service/ebs/api_op_StartSnapshot.go | 6 ++ service/ebs/go.mod | 4 +- service/ebs/go.sum | 2 - service/ec2/api_client.go | 52 ++++++++-- ...op_AcceptReservedInstancesExchangeQuote.go | 6 ++ ...p_AcceptTransitGatewayPeeringAttachment.go | 6 ++ ...pi_op_AcceptTransitGatewayVpcAttachment.go | 6 ++ .../api_op_AcceptVpcEndpointConnections.go | 6 ++ .../ec2/api_op_AcceptVpcPeeringConnection.go | 6 ++ service/ec2/api_op_AdvertiseByoipCidr.go | 6 ++ service/ec2/api_op_AllocateAddress.go | 6 ++ service/ec2/api_op_AllocateHosts.go | 6 ++ ...ySecurityGroupsToClientVpnTargetNetwork.go | 6 ++ service/ec2/api_op_AssignIpv6Addresses.go | 6 ++ .../ec2/api_op_AssignPrivateIpAddresses.go | 6 ++ service/ec2/api_op_AssociateAddress.go | 6 ++ .../api_op_AssociateClientVpnTargetNetwork.go | 6 ++ service/ec2/api_op_AssociateDhcpOptions.go | 6 ++ ...i_op_AssociateEnclaveCertificateIamRole.go | 6 ++ .../ec2/api_op_AssociateIamInstanceProfile.go | 6 ++ service/ec2/api_op_AssociateRouteTable.go | 6 ++ .../ec2/api_op_AssociateSubnetCidrBlock.go | 6 ++ ..._AssociateTransitGatewayMulticastDomain.go | 6 ++ ...pi_op_AssociateTransitGatewayRouteTable.go | 6 ++ service/ec2/api_op_AssociateVpcCidrBlock.go | 6 ++ service/ec2/api_op_AttachClassicLinkVpc.go | 6 ++ service/ec2/api_op_AttachInternetGateway.go | 6 ++ service/ec2/api_op_AttachNetworkInterface.go | 6 ++ service/ec2/api_op_AttachVolume.go | 6 ++ service/ec2/api_op_AttachVpnGateway.go | 6 ++ .../ec2/api_op_AuthorizeClientVpnIngress.go | 6 ++ .../api_op_AuthorizeSecurityGroupEgress.go | 6 ++ .../api_op_AuthorizeSecurityGroupIngress.go | 6 ++ service/ec2/api_op_BundleInstance.go | 6 ++ service/ec2/api_op_CancelBundleTask.go | 6 ++ .../ec2/api_op_CancelCapacityReservation.go | 6 ++ service/ec2/api_op_CancelConversionTask.go | 6 ++ service/ec2/api_op_CancelExportTask.go | 6 ++ service/ec2/api_op_CancelImportTask.go | 6 ++ .../api_op_CancelReservedInstancesListing.go | 6 ++ service/ec2/api_op_CancelSpotFleetRequests.go | 6 ++ .../ec2/api_op_CancelSpotInstanceRequests.go | 6 ++ service/ec2/api_op_ConfirmProductInstance.go | 6 ++ service/ec2/api_op_CopyFpgaImage.go | 6 ++ service/ec2/api_op_CopyImage.go | 6 ++ service/ec2/api_op_CopySnapshot.go | 6 ++ .../ec2/api_op_CreateCapacityReservation.go | 6 ++ service/ec2/api_op_CreateCarrierGateway.go | 6 ++ service/ec2/api_op_CreateClientVpnEndpoint.go | 6 ++ service/ec2/api_op_CreateClientVpnRoute.go | 6 ++ service/ec2/api_op_CreateCustomerGateway.go | 6 ++ service/ec2/api_op_CreateDefaultSubnet.go | 6 ++ service/ec2/api_op_CreateDefaultVpc.go | 6 ++ service/ec2/api_op_CreateDhcpOptions.go | 6 ++ .../api_op_CreateEgressOnlyInternetGateway.go | 6 ++ service/ec2/api_op_CreateFleet.go | 6 ++ service/ec2/api_op_CreateFlowLogs.go | 6 ++ service/ec2/api_op_CreateFpgaImage.go | 6 ++ service/ec2/api_op_CreateImage.go | 6 ++ .../ec2/api_op_CreateInstanceExportTask.go | 6 ++ service/ec2/api_op_CreateInternetGateway.go | 6 ++ service/ec2/api_op_CreateKeyPair.go | 6 ++ service/ec2/api_op_CreateLaunchTemplate.go | 6 ++ .../ec2/api_op_CreateLaunchTemplateVersion.go | 6 ++ service/ec2/api_op_CreateLocalGatewayRoute.go | 6 ++ ...ateLocalGatewayRouteTableVpcAssociation.go | 6 ++ service/ec2/api_op_CreateManagedPrefixList.go | 6 ++ service/ec2/api_op_CreateNatGateway.go | 6 ++ service/ec2/api_op_CreateNetworkAcl.go | 6 ++ service/ec2/api_op_CreateNetworkAclEntry.go | 6 ++ service/ec2/api_op_CreateNetworkInterface.go | 6 ++ ...api_op_CreateNetworkInterfacePermission.go | 6 ++ service/ec2/api_op_CreatePlacementGroup.go | 6 ++ .../api_op_CreateReservedInstancesListing.go | 6 ++ service/ec2/api_op_CreateRoute.go | 6 ++ service/ec2/api_op_CreateRouteTable.go | 6 ++ service/ec2/api_op_CreateSecurityGroup.go | 6 ++ service/ec2/api_op_CreateSnapshot.go | 6 ++ service/ec2/api_op_CreateSnapshots.go | 6 ++ .../api_op_CreateSpotDatafeedSubscription.go | 6 ++ service/ec2/api_op_CreateSubnet.go | 6 ++ service/ec2/api_op_CreateTags.go | 6 ++ .../ec2/api_op_CreateTrafficMirrorFilter.go | 6 ++ .../api_op_CreateTrafficMirrorFilterRule.go | 6 ++ .../ec2/api_op_CreateTrafficMirrorSession.go | 6 ++ .../ec2/api_op_CreateTrafficMirrorTarget.go | 6 ++ service/ec2/api_op_CreateTransitGateway.go | 6 ++ ..._op_CreateTransitGatewayMulticastDomain.go | 6 ++ ...p_CreateTransitGatewayPeeringAttachment.go | 6 ++ ...CreateTransitGatewayPrefixListReference.go | 6 ++ .../ec2/api_op_CreateTransitGatewayRoute.go | 6 ++ .../api_op_CreateTransitGatewayRouteTable.go | 6 ++ ...pi_op_CreateTransitGatewayVpcAttachment.go | 6 ++ service/ec2/api_op_CreateVolume.go | 6 ++ service/ec2/api_op_CreateVpc.go | 6 ++ service/ec2/api_op_CreateVpcEndpoint.go | 6 ++ ...CreateVpcEndpointConnectionNotification.go | 6 ++ ...p_CreateVpcEndpointServiceConfiguration.go | 6 ++ .../ec2/api_op_CreateVpcPeeringConnection.go | 6 ++ service/ec2/api_op_CreateVpnConnection.go | 6 ++ .../ec2/api_op_CreateVpnConnectionRoute.go | 6 ++ service/ec2/api_op_CreateVpnGateway.go | 6 ++ service/ec2/api_op_DeleteCarrierGateway.go | 6 ++ service/ec2/api_op_DeleteClientVpnEndpoint.go | 6 ++ service/ec2/api_op_DeleteClientVpnRoute.go | 6 ++ service/ec2/api_op_DeleteCustomerGateway.go | 6 ++ service/ec2/api_op_DeleteDhcpOptions.go | 6 ++ .../api_op_DeleteEgressOnlyInternetGateway.go | 6 ++ service/ec2/api_op_DeleteFleets.go | 6 ++ service/ec2/api_op_DeleteFlowLogs.go | 6 ++ service/ec2/api_op_DeleteFpgaImage.go | 6 ++ service/ec2/api_op_DeleteInternetGateway.go | 6 ++ service/ec2/api_op_DeleteKeyPair.go | 6 ++ service/ec2/api_op_DeleteLaunchTemplate.go | 6 ++ .../api_op_DeleteLaunchTemplateVersions.go | 6 ++ service/ec2/api_op_DeleteLocalGatewayRoute.go | 6 ++ ...eteLocalGatewayRouteTableVpcAssociation.go | 6 ++ service/ec2/api_op_DeleteManagedPrefixList.go | 6 ++ service/ec2/api_op_DeleteNatGateway.go | 6 ++ service/ec2/api_op_DeleteNetworkAcl.go | 6 ++ service/ec2/api_op_DeleteNetworkAclEntry.go | 6 ++ service/ec2/api_op_DeleteNetworkInterface.go | 6 ++ ...api_op_DeleteNetworkInterfacePermission.go | 6 ++ service/ec2/api_op_DeletePlacementGroup.go | 6 ++ .../api_op_DeleteQueuedReservedInstances.go | 6 ++ service/ec2/api_op_DeleteRoute.go | 6 ++ service/ec2/api_op_DeleteRouteTable.go | 6 ++ service/ec2/api_op_DeleteSecurityGroup.go | 6 ++ service/ec2/api_op_DeleteSnapshot.go | 6 ++ .../api_op_DeleteSpotDatafeedSubscription.go | 6 ++ service/ec2/api_op_DeleteSubnet.go | 6 ++ service/ec2/api_op_DeleteTags.go | 6 ++ .../ec2/api_op_DeleteTrafficMirrorFilter.go | 6 ++ .../api_op_DeleteTrafficMirrorFilterRule.go | 6 ++ .../ec2/api_op_DeleteTrafficMirrorSession.go | 6 ++ .../ec2/api_op_DeleteTrafficMirrorTarget.go | 6 ++ service/ec2/api_op_DeleteTransitGateway.go | 6 ++ ..._op_DeleteTransitGatewayMulticastDomain.go | 6 ++ ...p_DeleteTransitGatewayPeeringAttachment.go | 6 ++ ...DeleteTransitGatewayPrefixListReference.go | 6 ++ .../ec2/api_op_DeleteTransitGatewayRoute.go | 6 ++ .../api_op_DeleteTransitGatewayRouteTable.go | 6 ++ ...pi_op_DeleteTransitGatewayVpcAttachment.go | 6 ++ service/ec2/api_op_DeleteVolume.go | 6 ++ service/ec2/api_op_DeleteVpc.go | 6 ++ ...eleteVpcEndpointConnectionNotifications.go | 6 ++ ..._DeleteVpcEndpointServiceConfigurations.go | 6 ++ service/ec2/api_op_DeleteVpcEndpoints.go | 6 ++ .../ec2/api_op_DeleteVpcPeeringConnection.go | 6 ++ service/ec2/api_op_DeleteVpnConnection.go | 6 ++ .../ec2/api_op_DeleteVpnConnectionRoute.go | 6 ++ service/ec2/api_op_DeleteVpnGateway.go | 6 ++ service/ec2/api_op_DeprovisionByoipCidr.go | 6 ++ service/ec2/api_op_DeregisterImage.go | 6 ++ ...sterInstanceEventNotificationAttributes.go | 6 ++ ...sterTransitGatewayMulticastGroupMembers.go | 6 ++ ...sterTransitGatewayMulticastGroupSources.go | 6 ++ .../ec2/api_op_DescribeAccountAttributes.go | 6 ++ service/ec2/api_op_DescribeAddresses.go | 6 ++ .../ec2/api_op_DescribeAggregateIdFormat.go | 6 ++ .../ec2/api_op_DescribeAvailabilityZones.go | 6 ++ service/ec2/api_op_DescribeBundleTasks.go | 6 ++ service/ec2/api_op_DescribeByoipCidrs.go | 6 ++ .../api_op_DescribeCapacityReservations.go | 6 ++ service/ec2/api_op_DescribeCarrierGateways.go | 6 ++ .../api_op_DescribeClassicLinkInstances.go | 6 ++ ..._op_DescribeClientVpnAuthorizationRules.go | 6 ++ .../api_op_DescribeClientVpnConnections.go | 6 ++ .../ec2/api_op_DescribeClientVpnEndpoints.go | 6 ++ service/ec2/api_op_DescribeClientVpnRoutes.go | 6 ++ .../api_op_DescribeClientVpnTargetNetworks.go | 6 ++ service/ec2/api_op_DescribeCoipPools.go | 6 ++ service/ec2/api_op_DescribeConversionTasks.go | 6 ++ .../ec2/api_op_DescribeCustomerGateways.go | 6 ++ service/ec2/api_op_DescribeDhcpOptions.go | 6 ++ ...i_op_DescribeEgressOnlyInternetGateways.go | 6 ++ service/ec2/api_op_DescribeElasticGpus.go | 6 ++ .../ec2/api_op_DescribeExportImageTasks.go | 6 ++ service/ec2/api_op_DescribeExportTasks.go | 6 ++ .../api_op_DescribeFastSnapshotRestores.go | 6 ++ service/ec2/api_op_DescribeFleetHistory.go | 6 ++ service/ec2/api_op_DescribeFleetInstances.go | 6 ++ service/ec2/api_op_DescribeFleets.go | 6 ++ service/ec2/api_op_DescribeFlowLogs.go | 6 ++ .../ec2/api_op_DescribeFpgaImageAttribute.go | 6 ++ service/ec2/api_op_DescribeFpgaImages.go | 6 ++ ...api_op_DescribeHostReservationOfferings.go | 6 ++ .../ec2/api_op_DescribeHostReservations.go | 6 ++ service/ec2/api_op_DescribeHosts.go | 6 ++ ..._DescribeIamInstanceProfileAssociations.go | 6 ++ service/ec2/api_op_DescribeIdFormat.go | 6 ++ .../ec2/api_op_DescribeIdentityIdFormat.go | 6 ++ service/ec2/api_op_DescribeImageAttribute.go | 6 ++ service/ec2/api_op_DescribeImages.go | 6 ++ .../ec2/api_op_DescribeImportImageTasks.go | 6 ++ .../ec2/api_op_DescribeImportSnapshotTasks.go | 6 ++ .../ec2/api_op_DescribeInstanceAttribute.go | 6 ++ ...op_DescribeInstanceCreditSpecifications.go | 6 ++ ...ribeInstanceEventNotificationAttributes.go | 6 ++ service/ec2/api_op_DescribeInstanceStatus.go | 6 ++ .../api_op_DescribeInstanceTypeOfferings.go | 6 ++ service/ec2/api_op_DescribeInstanceTypes.go | 6 ++ service/ec2/api_op_DescribeInstances.go | 6 ++ .../ec2/api_op_DescribeInternetGateways.go | 6 ++ service/ec2/api_op_DescribeIpv6Pools.go | 6 ++ service/ec2/api_op_DescribeKeyPairs.go | 6 ++ .../api_op_DescribeLaunchTemplateVersions.go | 6 ++ service/ec2/api_op_DescribeLaunchTemplates.go | 6 ++ ...eTableVirtualInterfaceGroupAssociations.go | 6 ++ ...beLocalGatewayRouteTableVpcAssociations.go | 6 ++ .../api_op_DescribeLocalGatewayRouteTables.go | 6 ++ ...cribeLocalGatewayVirtualInterfaceGroups.go | 6 ++ ...p_DescribeLocalGatewayVirtualInterfaces.go | 6 ++ service/ec2/api_op_DescribeLocalGateways.go | 6 ++ .../ec2/api_op_DescribeManagedPrefixLists.go | 6 ++ service/ec2/api_op_DescribeMovingAddresses.go | 6 ++ service/ec2/api_op_DescribeNatGateways.go | 6 ++ service/ec2/api_op_DescribeNetworkAcls.go | 6 ++ ...pi_op_DescribeNetworkInterfaceAttribute.go | 6 ++ ..._op_DescribeNetworkInterfacePermissions.go | 6 ++ .../ec2/api_op_DescribeNetworkInterfaces.go | 6 ++ service/ec2/api_op_DescribePlacementGroups.go | 6 ++ service/ec2/api_op_DescribePrefixLists.go | 6 ++ .../ec2/api_op_DescribePrincipalIdFormat.go | 6 ++ service/ec2/api_op_DescribePublicIpv4Pools.go | 6 ++ service/ec2/api_op_DescribeRegions.go | 6 ++ .../ec2/api_op_DescribeReservedInstances.go | 6 ++ ...pi_op_DescribeReservedInstancesListings.go | 6 ++ ..._DescribeReservedInstancesModifications.go | 6 ++ ...i_op_DescribeReservedInstancesOfferings.go | 6 ++ service/ec2/api_op_DescribeRouteTables.go | 6 ++ ...p_DescribeScheduledInstanceAvailability.go | 6 ++ .../ec2/api_op_DescribeScheduledInstances.go | 6 ++ .../api_op_DescribeSecurityGroupReferences.go | 6 ++ service/ec2/api_op_DescribeSecurityGroups.go | 6 ++ .../ec2/api_op_DescribeSnapshotAttribute.go | 6 ++ service/ec2/api_op_DescribeSnapshots.go | 6 ++ ...api_op_DescribeSpotDatafeedSubscription.go | 6 ++ .../ec2/api_op_DescribeSpotFleetInstances.go | 6 ++ .../api_op_DescribeSpotFleetRequestHistory.go | 6 ++ .../ec2/api_op_DescribeSpotFleetRequests.go | 6 ++ .../api_op_DescribeSpotInstanceRequests.go | 6 ++ .../ec2/api_op_DescribeSpotPriceHistory.go | 6 ++ .../ec2/api_op_DescribeStaleSecurityGroups.go | 6 ++ service/ec2/api_op_DescribeSubnets.go | 6 ++ service/ec2/api_op_DescribeTags.go | 6 ++ .../api_op_DescribeTrafficMirrorFilters.go | 6 ++ .../api_op_DescribeTrafficMirrorSessions.go | 6 ++ .../api_op_DescribeTrafficMirrorTargets.go | 6 ++ ...pi_op_DescribeTransitGatewayAttachments.go | 6 ++ ..._DescribeTransitGatewayMulticastDomains.go | 6 ++ ...escribeTransitGatewayPeeringAttachments.go | 6 ++ ...pi_op_DescribeTransitGatewayRouteTables.go | 6 ++ ...op_DescribeTransitGatewayVpcAttachments.go | 6 ++ service/ec2/api_op_DescribeTransitGateways.go | 6 ++ service/ec2/api_op_DescribeVolumeAttribute.go | 6 ++ service/ec2/api_op_DescribeVolumeStatus.go | 6 ++ service/ec2/api_op_DescribeVolumes.go | 6 ++ .../api_op_DescribeVolumesModifications.go | 6 ++ service/ec2/api_op_DescribeVpcAttribute.go | 6 ++ service/ec2/api_op_DescribeVpcClassicLink.go | 6 ++ ...api_op_DescribeVpcClassicLinkDnsSupport.go | 6 ++ ...cribeVpcEndpointConnectionNotifications.go | 6 ++ .../api_op_DescribeVpcEndpointConnections.go | 6 ++ ...escribeVpcEndpointServiceConfigurations.go | 6 ++ ...p_DescribeVpcEndpointServicePermissions.go | 6 ++ .../ec2/api_op_DescribeVpcEndpointServices.go | 6 ++ service/ec2/api_op_DescribeVpcEndpoints.go | 6 ++ .../api_op_DescribeVpcPeeringConnections.go | 6 ++ service/ec2/api_op_DescribeVpcs.go | 6 ++ service/ec2/api_op_DescribeVpnConnections.go | 6 ++ service/ec2/api_op_DescribeVpnGateways.go | 6 ++ service/ec2/api_op_DetachClassicLinkVpc.go | 6 ++ service/ec2/api_op_DetachInternetGateway.go | 6 ++ service/ec2/api_op_DetachNetworkInterface.go | 6 ++ service/ec2/api_op_DetachVolume.go | 6 ++ service/ec2/api_op_DetachVpnGateway.go | 6 ++ .../api_op_DisableEbsEncryptionByDefault.go | 6 ++ .../ec2/api_op_DisableFastSnapshotRestores.go | 6 ++ ...ableTransitGatewayRouteTablePropagation.go | 6 ++ .../ec2/api_op_DisableVgwRoutePropagation.go | 6 ++ service/ec2/api_op_DisableVpcClassicLink.go | 6 ++ .../api_op_DisableVpcClassicLinkDnsSupport.go | 6 ++ service/ec2/api_op_DisassociateAddress.go | 6 ++ ...i_op_DisassociateClientVpnTargetNetwork.go | 6 ++ ...p_DisassociateEnclaveCertificateIamRole.go | 6 ++ .../api_op_DisassociateIamInstanceProfile.go | 6 ++ service/ec2/api_op_DisassociateRouteTable.go | 6 ++ .../ec2/api_op_DisassociateSubnetCidrBlock.go | 6 ++ ...sassociateTransitGatewayMulticastDomain.go | 6 ++ ...op_DisassociateTransitGatewayRouteTable.go | 6 ++ .../ec2/api_op_DisassociateVpcCidrBlock.go | 6 ++ .../api_op_EnableEbsEncryptionByDefault.go | 6 ++ .../ec2/api_op_EnableFastSnapshotRestores.go | 6 ++ ...ableTransitGatewayRouteTablePropagation.go | 6 ++ .../ec2/api_op_EnableVgwRoutePropagation.go | 6 ++ service/ec2/api_op_EnableVolumeIO.go | 6 ++ service/ec2/api_op_EnableVpcClassicLink.go | 6 ++ .../api_op_EnableVpcClassicLinkDnsSupport.go | 6 ++ ...lientVpnClientCertificateRevocationList.go | 6 ++ ...i_op_ExportClientVpnClientConfiguration.go | 6 ++ service/ec2/api_op_ExportImage.go | 6 ++ .../ec2/api_op_ExportTransitGatewayRoutes.go | 6 ++ ...GetAssociatedEnclaveCertificateIamRoles.go | 6 ++ .../ec2/api_op_GetAssociatedIpv6PoolCidrs.go | 6 ++ .../ec2/api_op_GetCapacityReservationUsage.go | 6 ++ service/ec2/api_op_GetCoipPoolUsage.go | 6 ++ service/ec2/api_op_GetConsoleOutput.go | 6 ++ service/ec2/api_op_GetConsoleScreenshot.go | 6 ++ .../api_op_GetDefaultCreditSpecification.go | 6 ++ service/ec2/api_op_GetEbsDefaultKmsKeyId.go | 6 ++ .../ec2/api_op_GetEbsEncryptionByDefault.go | 6 ++ .../api_op_GetGroupsForCapacityReservation.go | 6 ++ ...pi_op_GetHostReservationPurchasePreview.go | 6 ++ service/ec2/api_op_GetLaunchTemplateData.go | 6 ++ ...api_op_GetManagedPrefixListAssociations.go | 6 ++ .../ec2/api_op_GetManagedPrefixListEntries.go | 6 ++ service/ec2/api_op_GetPasswordData.go | 6 ++ ...pi_op_GetReservedInstancesExchangeQuote.go | 6 ++ ...GetTransitGatewayAttachmentPropagations.go | 6 ++ ...ansitGatewayMulticastDomainAssociations.go | 6 ++ ...p_GetTransitGatewayPrefixListReferences.go | 6 ++ ...GetTransitGatewayRouteTableAssociations.go | 6 ++ ...GetTransitGatewayRouteTablePropagations.go | 6 ++ ...lientVpnClientCertificateRevocationList.go | 6 ++ service/ec2/api_op_ImportImage.go | 6 ++ service/ec2/api_op_ImportInstance.go | 6 ++ service/ec2/api_op_ImportKeyPair.go | 6 ++ service/ec2/api_op_ImportSnapshot.go | 6 ++ service/ec2/api_op_ImportVolume.go | 6 ++ .../ec2/api_op_ModifyAvailabilityZoneGroup.go | 6 ++ .../ec2/api_op_ModifyCapacityReservation.go | 6 ++ service/ec2/api_op_ModifyClientVpnEndpoint.go | 6 ++ ...api_op_ModifyDefaultCreditSpecification.go | 6 ++ .../ec2/api_op_ModifyEbsDefaultKmsKeyId.go | 6 ++ service/ec2/api_op_ModifyFleet.go | 6 ++ .../ec2/api_op_ModifyFpgaImageAttribute.go | 6 ++ service/ec2/api_op_ModifyHosts.go | 6 ++ service/ec2/api_op_ModifyIdFormat.go | 6 ++ service/ec2/api_op_ModifyIdentityIdFormat.go | 6 ++ service/ec2/api_op_ModifyImageAttribute.go | 6 ++ service/ec2/api_op_ModifyInstanceAttribute.go | 6 ++ ...fyInstanceCapacityReservationAttributes.go | 6 ++ ...pi_op_ModifyInstanceCreditSpecification.go | 6 ++ .../api_op_ModifyInstanceEventStartTime.go | 6 ++ .../api_op_ModifyInstanceMetadataOptions.go | 6 ++ service/ec2/api_op_ModifyInstancePlacement.go | 6 ++ service/ec2/api_op_ModifyLaunchTemplate.go | 6 ++ service/ec2/api_op_ModifyManagedPrefixList.go | 6 ++ .../api_op_ModifyNetworkInterfaceAttribute.go | 6 ++ service/ec2/api_op_ModifyReservedInstances.go | 6 ++ service/ec2/api_op_ModifySnapshotAttribute.go | 6 ++ service/ec2/api_op_ModifySpotFleetRequest.go | 6 ++ service/ec2/api_op_ModifySubnetAttribute.go | 6 ++ ...odifyTrafficMirrorFilterNetworkServices.go | 6 ++ .../api_op_ModifyTrafficMirrorFilterRule.go | 6 ++ .../ec2/api_op_ModifyTrafficMirrorSession.go | 6 ++ service/ec2/api_op_ModifyTransitGateway.go | 6 ++ ...ModifyTransitGatewayPrefixListReference.go | 6 ++ ...pi_op_ModifyTransitGatewayVpcAttachment.go | 6 ++ service/ec2/api_op_ModifyVolume.go | 6 ++ service/ec2/api_op_ModifyVolumeAttribute.go | 6 ++ service/ec2/api_op_ModifyVpcAttribute.go | 6 ++ service/ec2/api_op_ModifyVpcEndpoint.go | 6 ++ ...ModifyVpcEndpointConnectionNotification.go | 6 ++ ...p_ModifyVpcEndpointServiceConfiguration.go | 6 ++ ..._op_ModifyVpcEndpointServicePermissions.go | 6 ++ ...pi_op_ModifyVpcPeeringConnectionOptions.go | 6 ++ service/ec2/api_op_ModifyVpcTenancy.go | 6 ++ service/ec2/api_op_ModifyVpnConnection.go | 6 ++ .../ec2/api_op_ModifyVpnConnectionOptions.go | 6 ++ .../ec2/api_op_ModifyVpnTunnelCertificate.go | 6 ++ service/ec2/api_op_ModifyVpnTunnelOptions.go | 6 ++ service/ec2/api_op_MonitorInstances.go | 6 ++ service/ec2/api_op_MoveAddressToVpc.go | 6 ++ service/ec2/api_op_ProvisionByoipCidr.go | 6 ++ service/ec2/api_op_PurchaseHostReservation.go | 6 ++ ...pi_op_PurchaseReservedInstancesOffering.go | 6 ++ .../ec2/api_op_PurchaseScheduledInstances.go | 6 ++ service/ec2/api_op_RebootInstances.go | 6 ++ service/ec2/api_op_RegisterImage.go | 6 ++ ...sterInstanceEventNotificationAttributes.go | 6 ++ ...sterTransitGatewayMulticastGroupMembers.go | 6 ++ ...sterTransitGatewayMulticastGroupSources.go | 6 ++ ...p_RejectTransitGatewayPeeringAttachment.go | 6 ++ ...pi_op_RejectTransitGatewayVpcAttachment.go | 6 ++ .../api_op_RejectVpcEndpointConnections.go | 6 ++ .../ec2/api_op_RejectVpcPeeringConnection.go | 6 ++ service/ec2/api_op_ReleaseAddress.go | 6 ++ service/ec2/api_op_ReleaseHosts.go | 6 ++ ...op_ReplaceIamInstanceProfileAssociation.go | 6 ++ .../api_op_ReplaceNetworkAclAssociation.go | 6 ++ service/ec2/api_op_ReplaceNetworkAclEntry.go | 6 ++ service/ec2/api_op_ReplaceRoute.go | 6 ++ .../api_op_ReplaceRouteTableAssociation.go | 6 ++ .../ec2/api_op_ReplaceTransitGatewayRoute.go | 6 ++ service/ec2/api_op_ReportInstanceStatus.go | 6 ++ service/ec2/api_op_RequestSpotFleet.go | 6 ++ service/ec2/api_op_RequestSpotInstances.go | 6 ++ service/ec2/api_op_ResetEbsDefaultKmsKeyId.go | 6 ++ service/ec2/api_op_ResetFpgaImageAttribute.go | 6 ++ service/ec2/api_op_ResetImageAttribute.go | 6 ++ service/ec2/api_op_ResetInstanceAttribute.go | 6 ++ .../api_op_ResetNetworkInterfaceAttribute.go | 6 ++ service/ec2/api_op_ResetSnapshotAttribute.go | 6 ++ service/ec2/api_op_RestoreAddressToClassic.go | 6 ++ .../api_op_RestoreManagedPrefixListVersion.go | 6 ++ service/ec2/api_op_RevokeClientVpnIngress.go | 6 ++ .../ec2/api_op_RevokeSecurityGroupEgress.go | 6 ++ .../ec2/api_op_RevokeSecurityGroupIngress.go | 6 ++ service/ec2/api_op_RunInstances.go | 6 ++ service/ec2/api_op_RunScheduledInstances.go | 6 ++ .../ec2/api_op_SearchLocalGatewayRoutes.go | 6 ++ ..._op_SearchTransitGatewayMulticastGroups.go | 6 ++ .../ec2/api_op_SearchTransitGatewayRoutes.go | 6 ++ service/ec2/api_op_SendDiagnosticInterrupt.go | 6 ++ service/ec2/api_op_StartInstances.go | 6 ++ ...pcEndpointServicePrivateDnsVerification.go | 6 ++ service/ec2/api_op_StopInstances.go | 6 ++ .../api_op_TerminateClientVpnConnections.go | 6 ++ service/ec2/api_op_TerminateInstances.go | 6 ++ service/ec2/api_op_UnassignIpv6Addresses.go | 6 ++ .../ec2/api_op_UnassignPrivateIpAddresses.go | 6 ++ service/ec2/api_op_UnmonitorInstances.go | 6 ++ ...dateSecurityGroupRuleDescriptionsEgress.go | 6 ++ ...ateSecurityGroupRuleDescriptionsIngress.go | 6 ++ service/ec2/api_op_WithdrawByoipCidr.go | 6 ++ service/ec2/go.mod | 2 +- service/ec2/go.sum | 4 - service/ec2instanceconnect/api_client.go | 52 ++++++++-- .../api_op_SendSSHPublicKey.go | 6 ++ service/ec2instanceconnect/go.mod | 4 +- service/ec2instanceconnect/go.sum | 2 - service/ecr/api_client.go | 52 ++++++++-- .../ecr/api_op_BatchCheckLayerAvailability.go | 6 ++ service/ecr/api_op_BatchDeleteImage.go | 6 ++ service/ecr/api_op_BatchGetImage.go | 6 ++ service/ecr/api_op_CompleteLayerUpload.go | 6 ++ service/ecr/api_op_CreateRepository.go | 6 ++ service/ecr/api_op_DeleteLifecyclePolicy.go | 6 ++ service/ecr/api_op_DeleteRepository.go | 6 ++ service/ecr/api_op_DeleteRepositoryPolicy.go | 6 ++ .../ecr/api_op_DescribeImageScanFindings.go | 6 ++ service/ecr/api_op_DescribeImages.go | 6 ++ service/ecr/api_op_DescribeRepositories.go | 6 ++ service/ecr/api_op_GetAuthorizationToken.go | 6 ++ service/ecr/api_op_GetDownloadUrlForLayer.go | 6 ++ service/ecr/api_op_GetLifecyclePolicy.go | 6 ++ .../ecr/api_op_GetLifecyclePolicyPreview.go | 6 ++ service/ecr/api_op_GetRepositoryPolicy.go | 6 ++ service/ecr/api_op_InitiateLayerUpload.go | 6 ++ service/ecr/api_op_ListImages.go | 6 ++ service/ecr/api_op_ListTagsForResource.go | 6 ++ service/ecr/api_op_PutImage.go | 6 ++ .../api_op_PutImageScanningConfiguration.go | 6 ++ service/ecr/api_op_PutImageTagMutability.go | 6 ++ service/ecr/api_op_PutLifecyclePolicy.go | 6 ++ service/ecr/api_op_SetRepositoryPolicy.go | 6 ++ service/ecr/api_op_StartImageScan.go | 6 ++ .../ecr/api_op_StartLifecyclePolicyPreview.go | 6 ++ service/ecr/api_op_TagResource.go | 6 ++ service/ecr/api_op_UntagResource.go | 6 ++ service/ecr/api_op_UploadLayerPart.go | 6 ++ service/ecr/go.mod | 4 +- service/ecr/go.sum | 2 - service/ecs/api_client.go | 52 ++++++++-- service/ecs/api_op_CreateCapacityProvider.go | 6 ++ service/ecs/api_op_CreateCluster.go | 6 ++ service/ecs/api_op_CreateService.go | 6 ++ service/ecs/api_op_CreateTaskSet.go | 6 ++ service/ecs/api_op_DeleteAccountSetting.go | 6 ++ service/ecs/api_op_DeleteAttributes.go | 6 ++ service/ecs/api_op_DeleteCapacityProvider.go | 6 ++ service/ecs/api_op_DeleteCluster.go | 6 ++ service/ecs/api_op_DeleteService.go | 6 ++ service/ecs/api_op_DeleteTaskSet.go | 6 ++ .../ecs/api_op_DeregisterContainerInstance.go | 6 ++ .../ecs/api_op_DeregisterTaskDefinition.go | 6 ++ .../ecs/api_op_DescribeCapacityProviders.go | 6 ++ service/ecs/api_op_DescribeClusters.go | 6 ++ .../ecs/api_op_DescribeContainerInstances.go | 6 ++ service/ecs/api_op_DescribeServices.go | 6 ++ service/ecs/api_op_DescribeTaskDefinition.go | 6 ++ service/ecs/api_op_DescribeTaskSets.go | 6 ++ service/ecs/api_op_DescribeTasks.go | 6 ++ service/ecs/api_op_DiscoverPollEndpoint.go | 6 ++ service/ecs/api_op_ListAccountSettings.go | 6 ++ service/ecs/api_op_ListAttributes.go | 6 ++ service/ecs/api_op_ListClusters.go | 6 ++ service/ecs/api_op_ListContainerInstances.go | 6 ++ service/ecs/api_op_ListServices.go | 6 ++ service/ecs/api_op_ListTagsForResource.go | 6 ++ .../ecs/api_op_ListTaskDefinitionFamilies.go | 6 ++ service/ecs/api_op_ListTaskDefinitions.go | 6 ++ service/ecs/api_op_ListTasks.go | 6 ++ service/ecs/api_op_PutAccountSetting.go | 6 ++ .../ecs/api_op_PutAccountSettingDefault.go | 6 ++ service/ecs/api_op_PutAttributes.go | 6 ++ .../ecs/api_op_PutClusterCapacityProviders.go | 6 ++ .../ecs/api_op_RegisterContainerInstance.go | 6 ++ service/ecs/api_op_RegisterTaskDefinition.go | 6 ++ service/ecs/api_op_RunTask.go | 6 ++ service/ecs/api_op_StartTask.go | 6 ++ service/ecs/api_op_StopTask.go | 6 ++ .../api_op_SubmitAttachmentStateChanges.go | 6 ++ .../ecs/api_op_SubmitContainerStateChange.go | 6 ++ service/ecs/api_op_SubmitTaskStateChange.go | 6 ++ service/ecs/api_op_TagResource.go | 6 ++ service/ecs/api_op_UntagResource.go | 6 ++ service/ecs/api_op_UpdateClusterSettings.go | 6 ++ service/ecs/api_op_UpdateContainerAgent.go | 6 ++ .../api_op_UpdateContainerInstancesState.go | 6 ++ service/ecs/api_op_UpdateService.go | 6 ++ .../ecs/api_op_UpdateServicePrimaryTaskSet.go | 6 ++ service/ecs/api_op_UpdateTaskSet.go | 6 ++ service/ecs/go.mod | 4 +- service/ecs/go.sum | 2 - service/efs/api_client.go | 52 ++++++++-- service/efs/api_op_CreateAccessPoint.go | 6 ++ service/efs/api_op_CreateFileSystem.go | 6 ++ service/efs/api_op_CreateMountTarget.go | 6 ++ service/efs/api_op_CreateTags.go | 6 ++ service/efs/api_op_DeleteAccessPoint.go | 6 ++ service/efs/api_op_DeleteFileSystem.go | 6 ++ service/efs/api_op_DeleteFileSystemPolicy.go | 6 ++ service/efs/api_op_DeleteMountTarget.go | 6 ++ service/efs/api_op_DeleteTags.go | 6 ++ service/efs/api_op_DescribeAccessPoints.go | 6 ++ service/efs/api_op_DescribeBackupPolicy.go | 6 ++ .../efs/api_op_DescribeFileSystemPolicy.go | 6 ++ service/efs/api_op_DescribeFileSystems.go | 6 ++ .../api_op_DescribeLifecycleConfiguration.go | 6 ++ ...pi_op_DescribeMountTargetSecurityGroups.go | 6 ++ service/efs/api_op_DescribeMountTargets.go | 6 ++ service/efs/api_op_DescribeTags.go | 6 ++ service/efs/api_op_ListTagsForResource.go | 6 ++ .../api_op_ModifyMountTargetSecurityGroups.go | 6 ++ service/efs/api_op_PutBackupPolicy.go | 6 ++ service/efs/api_op_PutFileSystemPolicy.go | 6 ++ .../efs/api_op_PutLifecycleConfiguration.go | 6 ++ service/efs/api_op_TagResource.go | 6 ++ service/efs/api_op_UntagResource.go | 6 ++ service/efs/api_op_UpdateFileSystem.go | 6 ++ service/efs/go.mod | 4 +- service/efs/go.sum | 2 - service/eks/api_client.go | 52 ++++++++-- service/eks/api_op_CreateCluster.go | 6 ++ service/eks/api_op_CreateFargateProfile.go | 6 ++ service/eks/api_op_CreateNodegroup.go | 6 ++ service/eks/api_op_DeleteCluster.go | 6 ++ service/eks/api_op_DeleteFargateProfile.go | 6 ++ service/eks/api_op_DeleteNodegroup.go | 6 ++ service/eks/api_op_DescribeCluster.go | 6 ++ service/eks/api_op_DescribeFargateProfile.go | 6 ++ service/eks/api_op_DescribeNodegroup.go | 6 ++ service/eks/api_op_DescribeUpdate.go | 6 ++ service/eks/api_op_ListClusters.go | 6 ++ service/eks/api_op_ListFargateProfiles.go | 6 ++ service/eks/api_op_ListNodegroups.go | 6 ++ service/eks/api_op_ListTagsForResource.go | 6 ++ service/eks/api_op_ListUpdates.go | 6 ++ service/eks/api_op_TagResource.go | 6 ++ service/eks/api_op_UntagResource.go | 6 ++ service/eks/api_op_UpdateClusterConfig.go | 6 ++ service/eks/api_op_UpdateClusterVersion.go | 6 ++ service/eks/api_op_UpdateNodegroupConfig.go | 6 ++ service/eks/api_op_UpdateNodegroupVersion.go | 6 ++ service/eks/go.mod | 4 +- service/eks/go.sum | 2 - service/elasticache/api_client.go | 52 ++++++++-- .../elasticache/api_op_AddTagsToResource.go | 6 ++ ...i_op_AuthorizeCacheSecurityGroupIngress.go | 6 ++ .../api_op_BatchApplyUpdateAction.go | 6 ++ .../api_op_BatchStopUpdateAction.go | 6 ++ .../elasticache/api_op_CompleteMigration.go | 6 ++ service/elasticache/api_op_CopySnapshot.go | 6 ++ .../elasticache/api_op_CreateCacheCluster.go | 6 ++ .../api_op_CreateCacheParameterGroup.go | 6 ++ .../api_op_CreateCacheSecurityGroup.go | 6 ++ .../api_op_CreateCacheSubnetGroup.go | 6 ++ .../api_op_CreateGlobalReplicationGroup.go | 6 ++ .../api_op_CreateReplicationGroup.go | 6 ++ service/elasticache/api_op_CreateSnapshot.go | 6 ++ service/elasticache/api_op_CreateUser.go | 6 ++ service/elasticache/api_op_CreateUserGroup.go | 6 ++ ...reaseNodeGroupsInGlobalReplicationGroup.go | 6 ++ .../api_op_DecreaseReplicaCount.go | 6 ++ .../elasticache/api_op_DeleteCacheCluster.go | 6 ++ .../api_op_DeleteCacheParameterGroup.go | 6 ++ .../api_op_DeleteCacheSecurityGroup.go | 6 ++ .../api_op_DeleteCacheSubnetGroup.go | 6 ++ .../api_op_DeleteGlobalReplicationGroup.go | 6 ++ .../api_op_DeleteReplicationGroup.go | 6 ++ service/elasticache/api_op_DeleteSnapshot.go | 6 ++ service/elasticache/api_op_DeleteUser.go | 6 ++ service/elasticache/api_op_DeleteUserGroup.go | 6 ++ .../api_op_DescribeCacheClusters.go | 6 ++ .../api_op_DescribeCacheEngineVersions.go | 6 ++ .../api_op_DescribeCacheParameterGroups.go | 6 ++ .../api_op_DescribeCacheParameters.go | 6 ++ .../api_op_DescribeCacheSecurityGroups.go | 6 ++ .../api_op_DescribeCacheSubnetGroups.go | 6 ++ .../api_op_DescribeEngineDefaultParameters.go | 6 ++ service/elasticache/api_op_DescribeEvents.go | 6 ++ .../api_op_DescribeGlobalReplicationGroups.go | 6 ++ .../api_op_DescribeReplicationGroups.go | 6 ++ .../api_op_DescribeReservedCacheNodes.go | 6 ++ ..._op_DescribeReservedCacheNodesOfferings.go | 6 ++ .../api_op_DescribeServiceUpdates.go | 6 ++ .../elasticache/api_op_DescribeSnapshots.go | 6 ++ .../api_op_DescribeUpdateActions.go | 6 ++ .../elasticache/api_op_DescribeUserGroups.go | 6 ++ service/elasticache/api_op_DescribeUsers.go | 6 ++ ...i_op_DisassociateGlobalReplicationGroup.go | 6 ++ .../api_op_FailoverGlobalReplicationGroup.go | 6 ++ ...reaseNodeGroupsInGlobalReplicationGroup.go | 6 ++ .../api_op_IncreaseReplicaCount.go | 6 ++ ...api_op_ListAllowedNodeTypeModifications.go | 6 ++ .../elasticache/api_op_ListTagsForResource.go | 6 ++ .../elasticache/api_op_ModifyCacheCluster.go | 6 ++ .../api_op_ModifyCacheParameterGroup.go | 6 ++ .../api_op_ModifyCacheSubnetGroup.go | 6 ++ .../api_op_ModifyGlobalReplicationGroup.go | 6 ++ .../api_op_ModifyReplicationGroup.go | 6 ++ ...odifyReplicationGroupShardConfiguration.go | 6 ++ service/elasticache/api_op_ModifyUser.go | 6 ++ service/elasticache/api_op_ModifyUserGroup.go | 6 ++ ...i_op_PurchaseReservedCacheNodesOffering.go | 6 ++ ..._RebalanceSlotsInGlobalReplicationGroup.go | 6 ++ .../elasticache/api_op_RebootCacheCluster.go | 6 ++ .../api_op_RemoveTagsFromResource.go | 6 ++ .../api_op_ResetCacheParameterGroup.go | 6 ++ .../api_op_RevokeCacheSecurityGroupIngress.go | 6 ++ service/elasticache/api_op_StartMigration.go | 6 ++ service/elasticache/api_op_TestFailover.go | 6 ++ service/elasticache/go.mod | 4 +- service/elasticache/go.sum | 2 - service/elasticbeanstalk/api_client.go | 52 ++++++++-- .../api_op_AbortEnvironmentUpdate.go | 6 ++ .../api_op_ApplyEnvironmentManagedAction.go | 6 ++ ...i_op_AssociateEnvironmentOperationsRole.go | 6 ++ .../api_op_CheckDNSAvailability.go | 6 ++ .../api_op_ComposeEnvironments.go | 6 ++ .../api_op_CreateApplication.go | 6 ++ .../api_op_CreateApplicationVersion.go | 6 ++ .../api_op_CreateConfigurationTemplate.go | 6 ++ .../api_op_CreateEnvironment.go | 6 ++ .../api_op_CreatePlatformVersion.go | 6 ++ .../api_op_CreateStorageLocation.go | 6 ++ .../api_op_DeleteApplication.go | 6 ++ .../api_op_DeleteApplicationVersion.go | 6 ++ .../api_op_DeleteConfigurationTemplate.go | 6 ++ .../api_op_DeleteEnvironmentConfiguration.go | 6 ++ .../api_op_DeletePlatformVersion.go | 6 ++ .../api_op_DescribeAccountAttributes.go | 6 ++ .../api_op_DescribeApplicationVersions.go | 6 ++ .../api_op_DescribeApplications.go | 6 ++ .../api_op_DescribeConfigurationOptions.go | 6 ++ .../api_op_DescribeConfigurationSettings.go | 6 ++ .../api_op_DescribeEnvironmentHealth.go | 6 ++ ...DescribeEnvironmentManagedActionHistory.go | 6 ++ ...pi_op_DescribeEnvironmentManagedActions.go | 6 ++ .../api_op_DescribeEnvironmentResources.go | 6 ++ .../api_op_DescribeEnvironments.go | 6 ++ .../elasticbeanstalk/api_op_DescribeEvents.go | 6 ++ .../api_op_DescribeInstancesHealth.go | 6 ++ .../api_op_DescribePlatformVersion.go | 6 ++ ...p_DisassociateEnvironmentOperationsRole.go | 6 ++ .../api_op_ListAvailableSolutionStacks.go | 6 ++ .../api_op_ListPlatformBranches.go | 6 ++ .../api_op_ListPlatformVersions.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_RebuildEnvironment.go | 6 ++ .../api_op_RequestEnvironmentInfo.go | 6 ++ .../api_op_RestartAppServer.go | 6 ++ .../api_op_RetrieveEnvironmentInfo.go | 6 ++ .../api_op_SwapEnvironmentCNAMEs.go | 6 ++ .../api_op_TerminateEnvironment.go | 6 ++ .../api_op_UpdateApplication.go | 6 ++ ...i_op_UpdateApplicationResourceLifecycle.go | 6 ++ .../api_op_UpdateApplicationVersion.go | 6 ++ .../api_op_UpdateConfigurationTemplate.go | 6 ++ .../api_op_UpdateEnvironment.go | 6 ++ .../api_op_UpdateTagsForResource.go | 6 ++ .../api_op_ValidateConfigurationSettings.go | 6 ++ service/elasticbeanstalk/go.mod | 4 +- service/elasticbeanstalk/go.sum | 2 - service/elasticinference/api_client.go | 52 ++++++++-- .../api_op_DescribeAcceleratorOfferings.go | 6 ++ .../api_op_DescribeAcceleratorTypes.go | 6 ++ .../api_op_DescribeAccelerators.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../elasticinference/api_op_TagResource.go | 6 ++ .../elasticinference/api_op_UntagResource.go | 6 ++ service/elasticinference/go.mod | 4 +- service/elasticinference/go.sum | 2 - service/elasticloadbalancing/api_client.go | 52 ++++++++-- .../elasticloadbalancing/api_op_AddTags.go | 6 ++ ...pi_op_ApplySecurityGroupsToLoadBalancer.go | 6 ++ .../api_op_AttachLoadBalancerToSubnets.go | 6 ++ .../api_op_ConfigureHealthCheck.go | 6 ++ .../api_op_CreateAppCookieStickinessPolicy.go | 6 ++ .../api_op_CreateLBCookieStickinessPolicy.go | 6 ++ .../api_op_CreateLoadBalancer.go | 6 ++ .../api_op_CreateLoadBalancerListeners.go | 6 ++ .../api_op_CreateLoadBalancerPolicy.go | 6 ++ .../api_op_DeleteLoadBalancer.go | 6 ++ .../api_op_DeleteLoadBalancerListeners.go | 6 ++ .../api_op_DeleteLoadBalancerPolicy.go | 6 ++ ..._op_DeregisterInstancesFromLoadBalancer.go | 6 ++ .../api_op_DescribeAccountLimits.go | 6 ++ .../api_op_DescribeInstanceHealth.go | 6 ++ .../api_op_DescribeLoadBalancerAttributes.go | 6 ++ .../api_op_DescribeLoadBalancerPolicies.go | 6 ++ .../api_op_DescribeLoadBalancerPolicyTypes.go | 6 ++ .../api_op_DescribeLoadBalancers.go | 6 ++ .../api_op_DescribeTags.go | 6 ++ .../api_op_DetachLoadBalancerFromSubnets.go | 6 ++ ...DisableAvailabilityZonesForLoadBalancer.go | 6 ++ ..._EnableAvailabilityZonesForLoadBalancer.go | 6 ++ .../api_op_ModifyLoadBalancerAttributes.go | 6 ++ ...pi_op_RegisterInstancesWithLoadBalancer.go | 6 ++ .../elasticloadbalancing/api_op_RemoveTags.go | 6 ++ ...p_SetLoadBalancerListenerSSLCertificate.go | 6 ++ ...SetLoadBalancerPoliciesForBackendServer.go | 6 ++ ...pi_op_SetLoadBalancerPoliciesOfListener.go | 6 ++ service/elasticloadbalancing/go.mod | 4 +- service/elasticloadbalancing/go.sum | 2 - service/elasticloadbalancingv2/api_client.go | 52 ++++++++-- .../api_op_AddListenerCertificates.go | 6 ++ .../elasticloadbalancingv2/api_op_AddTags.go | 6 ++ .../api_op_CreateListener.go | 6 ++ .../api_op_CreateLoadBalancer.go | 6 ++ .../api_op_CreateRule.go | 6 ++ .../api_op_CreateTargetGroup.go | 6 ++ .../api_op_DeleteListener.go | 6 ++ .../api_op_DeleteLoadBalancer.go | 6 ++ .../api_op_DeleteRule.go | 6 ++ .../api_op_DeleteTargetGroup.go | 6 ++ .../api_op_DeregisterTargets.go | 6 ++ .../api_op_DescribeAccountLimits.go | 6 ++ .../api_op_DescribeListenerCertificates.go | 6 ++ .../api_op_DescribeListeners.go | 6 ++ .../api_op_DescribeLoadBalancerAttributes.go | 6 ++ .../api_op_DescribeLoadBalancers.go | 6 ++ .../api_op_DescribeRules.go | 6 ++ .../api_op_DescribeSSLPolicies.go | 6 ++ .../api_op_DescribeTags.go | 6 ++ .../api_op_DescribeTargetGroupAttributes.go | 6 ++ .../api_op_DescribeTargetGroups.go | 6 ++ .../api_op_DescribeTargetHealth.go | 6 ++ .../api_op_ModifyListener.go | 6 ++ .../api_op_ModifyLoadBalancerAttributes.go | 6 ++ .../api_op_ModifyRule.go | 6 ++ .../api_op_ModifyTargetGroup.go | 6 ++ .../api_op_ModifyTargetGroupAttributes.go | 6 ++ .../api_op_RegisterTargets.go | 6 ++ .../api_op_RemoveListenerCertificates.go | 6 ++ .../api_op_RemoveTags.go | 6 ++ .../api_op_SetIpAddressType.go | 6 ++ .../api_op_SetRulePriorities.go | 6 ++ .../api_op_SetSecurityGroups.go | 6 ++ .../api_op_SetSubnets.go | 6 ++ service/elasticloadbalancingv2/go.mod | 4 +- service/elasticloadbalancingv2/go.sum | 2 - service/elasticsearchservice/api_client.go | 52 ++++++++-- ...ceptInboundCrossClusterSearchConnection.go | 6 ++ .../elasticsearchservice/api_op_AddTags.go | 6 ++ .../api_op_AssociatePackage.go | 6 ++ ...ancelElasticsearchServiceSoftwareUpdate.go | 6 ++ .../api_op_CreateElasticsearchDomain.go | 6 ++ ...ateOutboundCrossClusterSearchConnection.go | 6 ++ .../api_op_CreatePackage.go | 6 ++ .../api_op_DeleteElasticsearchDomain.go | 6 ++ .../api_op_DeleteElasticsearchServiceRole.go | 6 ++ ...leteInboundCrossClusterSearchConnection.go | 6 ++ ...eteOutboundCrossClusterSearchConnection.go | 6 ++ .../api_op_DeletePackage.go | 6 ++ .../api_op_DescribeElasticsearchDomain.go | 6 ++ ...pi_op_DescribeElasticsearchDomainConfig.go | 6 ++ .../api_op_DescribeElasticsearchDomains.go | 6 ++ ...DescribeElasticsearchInstanceTypeLimits.go | 6 ++ ...ibeInboundCrossClusterSearchConnections.go | 6 ++ ...beOutboundCrossClusterSearchConnections.go | 6 ++ .../api_op_DescribePackages.go | 6 ++ ...eReservedElasticsearchInstanceOfferings.go | 6 ++ ..._DescribeReservedElasticsearchInstances.go | 6 ++ .../api_op_DissociatePackage.go | 6 ++ ...i_op_GetCompatibleElasticsearchVersions.go | 6 ++ .../api_op_GetUpgradeHistory.go | 6 ++ .../api_op_GetUpgradeStatus.go | 6 ++ .../api_op_ListDomainNames.go | 6 ++ .../api_op_ListDomainsForPackage.go | 6 ++ .../api_op_ListElasticsearchInstanceTypes.go | 6 ++ .../api_op_ListElasticsearchVersions.go | 6 ++ .../api_op_ListPackagesForDomain.go | 6 ++ .../elasticsearchservice/api_op_ListTags.go | 6 ++ ...seReservedElasticsearchInstanceOffering.go | 6 ++ ...jectInboundCrossClusterSearchConnection.go | 6 ++ .../elasticsearchservice/api_op_RemoveTags.go | 6 ++ ...StartElasticsearchServiceSoftwareUpdate.go | 6 ++ .../api_op_UpdateElasticsearchDomainConfig.go | 6 ++ .../api_op_UpgradeElasticsearchDomain.go | 6 ++ service/elasticsearchservice/go.mod | 4 +- service/elasticsearchservice/go.sum | 2 - service/elastictranscoder/api_client.go | 52 ++++++++-- service/elastictranscoder/api_op_CancelJob.go | 6 ++ service/elastictranscoder/api_op_CreateJob.go | 6 ++ .../api_op_CreatePipeline.go | 6 ++ .../elastictranscoder/api_op_CreatePreset.go | 6 ++ .../api_op_DeletePipeline.go | 6 ++ .../elastictranscoder/api_op_DeletePreset.go | 6 ++ .../api_op_ListJobsByPipeline.go | 6 ++ .../api_op_ListJobsByStatus.go | 6 ++ .../elastictranscoder/api_op_ListPipelines.go | 6 ++ .../elastictranscoder/api_op_ListPresets.go | 6 ++ service/elastictranscoder/api_op_ReadJob.go | 6 ++ .../elastictranscoder/api_op_ReadPipeline.go | 6 ++ .../elastictranscoder/api_op_ReadPreset.go | 6 ++ service/elastictranscoder/api_op_TestRole.go | 6 ++ .../api_op_UpdatePipeline.go | 6 ++ .../api_op_UpdatePipelineNotifications.go | 6 ++ .../api_op_UpdatePipelineStatus.go | 6 ++ service/elastictranscoder/go.mod | 4 +- service/elastictranscoder/go.sum | 2 - service/emr/api_client.go | 52 ++++++++-- service/emr/api_op_AddInstanceFleet.go | 6 ++ service/emr/api_op_AddInstanceGroups.go | 6 ++ service/emr/api_op_AddJobFlowSteps.go | 6 ++ service/emr/api_op_AddTags.go | 6 ++ service/emr/api_op_CancelSteps.go | 6 ++ .../emr/api_op_CreateSecurityConfiguration.go | 6 ++ .../emr/api_op_DeleteSecurityConfiguration.go | 6 ++ service/emr/api_op_DescribeCluster.go | 6 ++ service/emr/api_op_DescribeJobFlows.go | 6 ++ .../emr/api_op_DescribeNotebookExecution.go | 6 ++ .../api_op_DescribeSecurityConfiguration.go | 6 ++ service/emr/api_op_DescribeStep.go | 6 ++ ...pi_op_GetBlockPublicAccessConfiguration.go | 6 ++ service/emr/api_op_GetManagedScalingPolicy.go | 6 ++ service/emr/api_op_ListBootstrapActions.go | 6 ++ service/emr/api_op_ListClusters.go | 6 ++ service/emr/api_op_ListInstanceFleets.go | 6 ++ service/emr/api_op_ListInstanceGroups.go | 6 ++ service/emr/api_op_ListInstances.go | 6 ++ service/emr/api_op_ListNotebookExecutions.go | 6 ++ .../emr/api_op_ListSecurityConfigurations.go | 6 ++ service/emr/api_op_ListSteps.go | 6 ++ service/emr/api_op_ModifyCluster.go | 6 ++ service/emr/api_op_ModifyInstanceFleet.go | 6 ++ service/emr/api_op_ModifyInstanceGroups.go | 6 ++ service/emr/api_op_PutAutoScalingPolicy.go | 6 ++ ...pi_op_PutBlockPublicAccessConfiguration.go | 6 ++ service/emr/api_op_PutManagedScalingPolicy.go | 6 ++ service/emr/api_op_RemoveAutoScalingPolicy.go | 6 ++ .../emr/api_op_RemoveManagedScalingPolicy.go | 6 ++ service/emr/api_op_RemoveTags.go | 6 ++ service/emr/api_op_RunJobFlow.go | 6 ++ .../emr/api_op_SetTerminationProtection.go | 6 ++ service/emr/api_op_SetVisibleToAllUsers.go | 6 ++ service/emr/api_op_StartNotebookExecution.go | 6 ++ service/emr/api_op_StopNotebookExecution.go | 6 ++ service/emr/api_op_TerminateJobFlows.go | 6 ++ service/emr/go.mod | 4 +- service/emr/go.sum | 2 - service/eventbridge/api_client.go | 52 ++++++++-- .../eventbridge/api_op_ActivateEventSource.go | 6 ++ service/eventbridge/api_op_CreateEventBus.go | 6 ++ .../api_op_CreatePartnerEventSource.go | 6 ++ .../api_op_DeactivateEventSource.go | 6 ++ service/eventbridge/api_op_DeleteEventBus.go | 6 ++ .../api_op_DeletePartnerEventSource.go | 6 ++ service/eventbridge/api_op_DeleteRule.go | 6 ++ .../eventbridge/api_op_DescribeEventBus.go | 6 ++ .../eventbridge/api_op_DescribeEventSource.go | 6 ++ .../api_op_DescribePartnerEventSource.go | 6 ++ service/eventbridge/api_op_DescribeRule.go | 6 ++ service/eventbridge/api_op_DisableRule.go | 6 ++ service/eventbridge/api_op_EnableRule.go | 6 ++ service/eventbridge/api_op_ListEventBuses.go | 6 ++ .../eventbridge/api_op_ListEventSources.go | 6 ++ .../api_op_ListPartnerEventSourceAccounts.go | 6 ++ .../api_op_ListPartnerEventSources.go | 6 ++ .../api_op_ListRuleNamesByTarget.go | 6 ++ service/eventbridge/api_op_ListRules.go | 6 ++ .../eventbridge/api_op_ListTagsForResource.go | 6 ++ .../eventbridge/api_op_ListTargetsByRule.go | 6 ++ service/eventbridge/api_op_PutEvents.go | 6 ++ .../eventbridge/api_op_PutPartnerEvents.go | 6 ++ service/eventbridge/api_op_PutPermission.go | 6 ++ service/eventbridge/api_op_PutRule.go | 6 ++ service/eventbridge/api_op_PutTargets.go | 6 ++ .../eventbridge/api_op_RemovePermission.go | 6 ++ service/eventbridge/api_op_RemoveTargets.go | 6 ++ service/eventbridge/api_op_TagResource.go | 6 ++ .../eventbridge/api_op_TestEventPattern.go | 6 ++ service/eventbridge/api_op_UntagResource.go | 6 ++ service/eventbridge/go.mod | 4 +- service/eventbridge/go.sum | 2 - service/firehose/api_client.go | 52 ++++++++-- .../firehose/api_op_CreateDeliveryStream.go | 6 ++ .../firehose/api_op_DeleteDeliveryStream.go | 6 ++ .../firehose/api_op_DescribeDeliveryStream.go | 6 ++ .../firehose/api_op_ListDeliveryStreams.go | 6 ++ .../api_op_ListTagsForDeliveryStream.go | 6 ++ service/firehose/api_op_PutRecord.go | 6 ++ service/firehose/api_op_PutRecordBatch.go | 6 ++ .../api_op_StartDeliveryStreamEncryption.go | 6 ++ .../api_op_StopDeliveryStreamEncryption.go | 6 ++ service/firehose/api_op_TagDeliveryStream.go | 6 ++ .../firehose/api_op_UntagDeliveryStream.go | 6 ++ service/firehose/api_op_UpdateDestination.go | 6 ++ service/firehose/go.mod | 4 +- service/firehose/go.sum | 2 - service/fms/api_client.go | 52 ++++++++-- service/fms/api_op_AssociateAdminAccount.go | 6 ++ service/fms/api_op_DeleteAppsList.go | 6 ++ .../fms/api_op_DeleteNotificationChannel.go | 6 ++ service/fms/api_op_DeletePolicy.go | 6 ++ service/fms/api_op_DeleteProtocolsList.go | 6 ++ .../fms/api_op_DisassociateAdminAccount.go | 6 ++ service/fms/api_op_GetAdminAccount.go | 6 ++ service/fms/api_op_GetAppsList.go | 6 ++ service/fms/api_op_GetComplianceDetail.go | 6 ++ service/fms/api_op_GetNotificationChannel.go | 6 ++ service/fms/api_op_GetPolicy.go | 6 ++ service/fms/api_op_GetProtectionStatus.go | 6 ++ service/fms/api_op_GetProtocolsList.go | 6 ++ service/fms/api_op_GetViolationDetails.go | 6 ++ service/fms/api_op_ListAppsLists.go | 6 ++ service/fms/api_op_ListComplianceStatus.go | 6 ++ service/fms/api_op_ListMemberAccounts.go | 6 ++ service/fms/api_op_ListPolicies.go | 6 ++ service/fms/api_op_ListProtocolsLists.go | 6 ++ service/fms/api_op_ListTagsForResource.go | 6 ++ service/fms/api_op_PutAppsList.go | 6 ++ service/fms/api_op_PutNotificationChannel.go | 6 ++ service/fms/api_op_PutPolicy.go | 6 ++ service/fms/api_op_PutProtocolsList.go | 6 ++ service/fms/api_op_TagResource.go | 6 ++ service/fms/api_op_UntagResource.go | 6 ++ service/fms/go.mod | 4 +- service/fms/go.sum | 2 - service/forecast/api_client.go | 52 ++++++++-- service/forecast/api_op_CreateDataset.go | 6 ++ service/forecast/api_op_CreateDatasetGroup.go | 6 ++ .../forecast/api_op_CreateDatasetImportJob.go | 6 ++ service/forecast/api_op_CreateForecast.go | 6 ++ .../api_op_CreateForecastExportJob.go | 6 ++ service/forecast/api_op_CreatePredictor.go | 6 ++ service/forecast/api_op_DeleteDataset.go | 6 ++ service/forecast/api_op_DeleteDatasetGroup.go | 6 ++ .../forecast/api_op_DeleteDatasetImportJob.go | 6 ++ service/forecast/api_op_DeleteForecast.go | 6 ++ .../api_op_DeleteForecastExportJob.go | 6 ++ service/forecast/api_op_DeletePredictor.go | 6 ++ service/forecast/api_op_DescribeDataset.go | 6 ++ .../forecast/api_op_DescribeDatasetGroup.go | 6 ++ .../api_op_DescribeDatasetImportJob.go | 6 ++ service/forecast/api_op_DescribeForecast.go | 6 ++ .../api_op_DescribeForecastExportJob.go | 6 ++ service/forecast/api_op_DescribePredictor.go | 6 ++ service/forecast/api_op_GetAccuracyMetrics.go | 6 ++ service/forecast/api_op_ListDatasetGroups.go | 6 ++ .../forecast/api_op_ListDatasetImportJobs.go | 6 ++ service/forecast/api_op_ListDatasets.go | 6 ++ .../forecast/api_op_ListForecastExportJobs.go | 6 ++ service/forecast/api_op_ListForecasts.go | 6 ++ service/forecast/api_op_ListPredictors.go | 6 ++ .../forecast/api_op_ListTagsForResource.go | 6 ++ service/forecast/api_op_TagResource.go | 6 ++ service/forecast/api_op_UntagResource.go | 6 ++ service/forecast/api_op_UpdateDatasetGroup.go | 6 ++ service/forecast/go.mod | 4 +- service/forecast/go.sum | 2 - service/forecastquery/api_client.go | 52 ++++++++-- service/forecastquery/api_op_QueryForecast.go | 6 ++ service/forecastquery/go.mod | 4 +- service/forecastquery/go.sum | 2 - service/frauddetector/api_client.go | 52 ++++++++-- .../api_op_BatchCreateVariable.go | 6 ++ .../frauddetector/api_op_BatchGetVariable.go | 6 ++ .../api_op_CreateDetectorVersion.go | 6 ++ service/frauddetector/api_op_CreateModel.go | 6 ++ .../api_op_CreateModelVersion.go | 6 ++ service/frauddetector/api_op_CreateRule.go | 6 ++ .../frauddetector/api_op_CreateVariable.go | 6 ++ .../frauddetector/api_op_DeleteDetector.go | 6 ++ .../api_op_DeleteDetectorVersion.go | 6 ++ service/frauddetector/api_op_DeleteEvent.go | 6 ++ service/frauddetector/api_op_DeleteRule.go | 6 ++ .../frauddetector/api_op_DescribeDetector.go | 6 ++ .../api_op_DescribeModelVersions.go | 6 ++ .../api_op_GetDetectorVersion.go | 6 ++ service/frauddetector/api_op_GetDetectors.go | 6 ++ .../frauddetector/api_op_GetEntityTypes.go | 6 ++ .../api_op_GetEventPrediction.go | 6 ++ service/frauddetector/api_op_GetEventTypes.go | 6 ++ .../frauddetector/api_op_GetExternalModels.go | 6 ++ .../api_op_GetKMSEncryptionKey.go | 6 ++ service/frauddetector/api_op_GetLabels.go | 6 ++ .../frauddetector/api_op_GetModelVersion.go | 6 ++ service/frauddetector/api_op_GetModels.go | 6 ++ service/frauddetector/api_op_GetOutcomes.go | 6 ++ service/frauddetector/api_op_GetRules.go | 6 ++ service/frauddetector/api_op_GetVariables.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/frauddetector/api_op_PutDetector.go | 6 ++ service/frauddetector/api_op_PutEntityType.go | 6 ++ service/frauddetector/api_op_PutEventType.go | 6 ++ .../frauddetector/api_op_PutExternalModel.go | 6 ++ .../api_op_PutKMSEncryptionKey.go | 6 ++ service/frauddetector/api_op_PutLabel.go | 6 ++ service/frauddetector/api_op_PutOutcome.go | 6 ++ service/frauddetector/api_op_TagResource.go | 6 ++ service/frauddetector/api_op_UntagResource.go | 6 ++ .../api_op_UpdateDetectorVersion.go | 6 ++ .../api_op_UpdateDetectorVersionMetadata.go | 6 ++ .../api_op_UpdateDetectorVersionStatus.go | 6 ++ service/frauddetector/api_op_UpdateModel.go | 6 ++ .../api_op_UpdateModelVersion.go | 6 ++ .../api_op_UpdateModelVersionStatus.go | 6 ++ .../api_op_UpdateRuleMetadata.go | 6 ++ .../frauddetector/api_op_UpdateRuleVersion.go | 6 ++ .../frauddetector/api_op_UpdateVariable.go | 6 ++ service/frauddetector/go.mod | 4 +- service/frauddetector/go.sum | 2 - service/fsx/api_client.go | 52 ++++++++-- .../fsx/api_op_CancelDataRepositoryTask.go | 6 ++ service/fsx/api_op_CreateBackup.go | 6 ++ .../fsx/api_op_CreateDataRepositoryTask.go | 6 ++ service/fsx/api_op_CreateFileSystem.go | 6 ++ .../fsx/api_op_CreateFileSystemFromBackup.go | 6 ++ service/fsx/api_op_DeleteBackup.go | 6 ++ service/fsx/api_op_DeleteFileSystem.go | 6 ++ service/fsx/api_op_DescribeBackups.go | 6 ++ .../fsx/api_op_DescribeDataRepositoryTasks.go | 6 ++ service/fsx/api_op_DescribeFileSystems.go | 6 ++ service/fsx/api_op_ListTagsForResource.go | 6 ++ service/fsx/api_op_TagResource.go | 6 ++ service/fsx/api_op_UntagResource.go | 6 ++ service/fsx/api_op_UpdateFileSystem.go | 6 ++ service/fsx/go.mod | 4 +- service/fsx/go.sum | 2 - service/gamelift/api_client.go | 52 ++++++++-- service/gamelift/api_op_AcceptMatch.go | 6 ++ service/gamelift/api_op_ClaimGameServer.go | 6 ++ service/gamelift/api_op_CreateAlias.go | 6 ++ service/gamelift/api_op_CreateBuild.go | 6 ++ service/gamelift/api_op_CreateFleet.go | 6 ++ .../gamelift/api_op_CreateGameServerGroup.go | 6 ++ service/gamelift/api_op_CreateGameSession.go | 6 ++ .../gamelift/api_op_CreateGameSessionQueue.go | 6 ++ .../api_op_CreateMatchmakingConfiguration.go | 6 ++ .../api_op_CreateMatchmakingRuleSet.go | 6 ++ .../gamelift/api_op_CreatePlayerSession.go | 6 ++ .../gamelift/api_op_CreatePlayerSessions.go | 6 ++ service/gamelift/api_op_CreateScript.go | 6 ++ .../api_op_CreateVpcPeeringAuthorization.go | 6 ++ .../api_op_CreateVpcPeeringConnection.go | 6 ++ service/gamelift/api_op_DeleteAlias.go | 6 ++ service/gamelift/api_op_DeleteBuild.go | 6 ++ service/gamelift/api_op_DeleteFleet.go | 6 ++ .../gamelift/api_op_DeleteGameServerGroup.go | 6 ++ .../gamelift/api_op_DeleteGameSessionQueue.go | 6 ++ .../api_op_DeleteMatchmakingConfiguration.go | 6 ++ .../api_op_DeleteMatchmakingRuleSet.go | 6 ++ .../gamelift/api_op_DeleteScalingPolicy.go | 6 ++ service/gamelift/api_op_DeleteScript.go | 6 ++ .../api_op_DeleteVpcPeeringAuthorization.go | 6 ++ .../api_op_DeleteVpcPeeringConnection.go | 6 ++ .../gamelift/api_op_DeregisterGameServer.go | 6 ++ service/gamelift/api_op_DescribeAlias.go | 6 ++ service/gamelift/api_op_DescribeBuild.go | 6 ++ .../api_op_DescribeEC2InstanceLimits.go | 6 ++ .../api_op_DescribeFleetAttributes.go | 6 ++ .../gamelift/api_op_DescribeFleetCapacity.go | 6 ++ .../gamelift/api_op_DescribeFleetEvents.go | 6 ++ .../api_op_DescribeFleetPortSettings.go | 6 ++ .../api_op_DescribeFleetUtilization.go | 6 ++ service/gamelift/api_op_DescribeGameServer.go | 6 ++ .../api_op_DescribeGameServerGroup.go | 6 ++ .../api_op_DescribeGameServerInstances.go | 6 ++ .../api_op_DescribeGameSessionDetails.go | 6 ++ .../api_op_DescribeGameSessionPlacement.go | 6 ++ .../api_op_DescribeGameSessionQueues.go | 6 ++ .../gamelift/api_op_DescribeGameSessions.go | 6 ++ service/gamelift/api_op_DescribeInstances.go | 6 ++ .../gamelift/api_op_DescribeMatchmaking.go | 6 ++ ...pi_op_DescribeMatchmakingConfigurations.go | 6 ++ .../api_op_DescribeMatchmakingRuleSets.go | 6 ++ .../gamelift/api_op_DescribePlayerSessions.go | 6 ++ .../api_op_DescribeRuntimeConfiguration.go | 6 ++ .../api_op_DescribeScalingPolicies.go | 6 ++ service/gamelift/api_op_DescribeScript.go | 6 ++ ...api_op_DescribeVpcPeeringAuthorizations.go | 6 ++ .../api_op_DescribeVpcPeeringConnections.go | 6 ++ .../gamelift/api_op_GetGameSessionLogUrl.go | 6 ++ service/gamelift/api_op_GetInstanceAccess.go | 6 ++ service/gamelift/api_op_ListAliases.go | 6 ++ service/gamelift/api_op_ListBuilds.go | 6 ++ service/gamelift/api_op_ListFleets.go | 6 ++ .../gamelift/api_op_ListGameServerGroups.go | 6 ++ service/gamelift/api_op_ListGameServers.go | 6 ++ service/gamelift/api_op_ListScripts.go | 6 ++ .../gamelift/api_op_ListTagsForResource.go | 6 ++ service/gamelift/api_op_PutScalingPolicy.go | 6 ++ service/gamelift/api_op_RegisterGameServer.go | 6 ++ .../api_op_RequestUploadCredentials.go | 6 ++ service/gamelift/api_op_ResolveAlias.go | 6 ++ .../gamelift/api_op_ResumeGameServerGroup.go | 6 ++ service/gamelift/api_op_SearchGameSessions.go | 6 ++ service/gamelift/api_op_StartFleetActions.go | 6 ++ .../api_op_StartGameSessionPlacement.go | 6 ++ service/gamelift/api_op_StartMatchBackfill.go | 6 ++ service/gamelift/api_op_StartMatchmaking.go | 6 ++ service/gamelift/api_op_StopFleetActions.go | 6 ++ .../api_op_StopGameSessionPlacement.go | 6 ++ service/gamelift/api_op_StopMatchmaking.go | 6 ++ .../gamelift/api_op_SuspendGameServerGroup.go | 6 ++ service/gamelift/api_op_TagResource.go | 6 ++ service/gamelift/api_op_UntagResource.go | 6 ++ service/gamelift/api_op_UpdateAlias.go | 6 ++ service/gamelift/api_op_UpdateBuild.go | 6 ++ .../gamelift/api_op_UpdateFleetAttributes.go | 6 ++ .../gamelift/api_op_UpdateFleetCapacity.go | 6 ++ .../api_op_UpdateFleetPortSettings.go | 6 ++ service/gamelift/api_op_UpdateGameServer.go | 6 ++ .../gamelift/api_op_UpdateGameServerGroup.go | 6 ++ service/gamelift/api_op_UpdateGameSession.go | 6 ++ .../gamelift/api_op_UpdateGameSessionQueue.go | 6 ++ .../api_op_UpdateMatchmakingConfiguration.go | 6 ++ .../api_op_UpdateRuntimeConfiguration.go | 6 ++ service/gamelift/api_op_UpdateScript.go | 6 ++ .../api_op_ValidateMatchmakingRuleSet.go | 6 ++ service/gamelift/go.mod | 4 +- service/gamelift/go.sum | 2 - service/glacier/api_client.go | 52 ++++++++-- .../glacier/api_op_AbortMultipartUpload.go | 6 ++ service/glacier/api_op_AbortVaultLock.go | 6 ++ service/glacier/api_op_AddTagsToVault.go | 6 ++ .../glacier/api_op_CompleteMultipartUpload.go | 6 ++ service/glacier/api_op_CompleteVaultLock.go | 6 ++ service/glacier/api_op_CreateVault.go | 6 ++ service/glacier/api_op_DeleteArchive.go | 6 ++ service/glacier/api_op_DeleteVault.go | 6 ++ .../glacier/api_op_DeleteVaultAccessPolicy.go | 6 ++ .../api_op_DeleteVaultNotifications.go | 6 ++ service/glacier/api_op_DescribeJob.go | 6 ++ service/glacier/api_op_DescribeVault.go | 6 ++ .../glacier/api_op_GetDataRetrievalPolicy.go | 6 ++ service/glacier/api_op_GetJobOutput.go | 6 ++ .../glacier/api_op_GetVaultAccessPolicy.go | 6 ++ service/glacier/api_op_GetVaultLock.go | 6 ++ .../glacier/api_op_GetVaultNotifications.go | 6 ++ service/glacier/api_op_InitiateJob.go | 6 ++ .../glacier/api_op_InitiateMultipartUpload.go | 6 ++ service/glacier/api_op_InitiateVaultLock.go | 6 ++ service/glacier/api_op_ListJobs.go | 6 ++ .../glacier/api_op_ListMultipartUploads.go | 6 ++ service/glacier/api_op_ListParts.go | 6 ++ .../glacier/api_op_ListProvisionedCapacity.go | 6 ++ service/glacier/api_op_ListTagsForVault.go | 6 ++ service/glacier/api_op_ListVaults.go | 6 ++ .../api_op_PurchaseProvisionedCapacity.go | 6 ++ service/glacier/api_op_RemoveTagsFromVault.go | 6 ++ .../glacier/api_op_SetDataRetrievalPolicy.go | 6 ++ .../glacier/api_op_SetVaultAccessPolicy.go | 6 ++ .../glacier/api_op_SetVaultNotifications.go | 6 ++ service/glacier/api_op_UploadArchive.go | 6 ++ service/glacier/api_op_UploadMultipartPart.go | 6 ++ service/glacier/go.mod | 4 +- service/glacier/go.sum | 2 - service/globalaccelerator/api_client.go | 52 ++++++++-- .../api_op_AdvertiseByoipCidr.go | 6 ++ .../api_op_CreateAccelerator.go | 6 ++ .../api_op_CreateEndpointGroup.go | 6 ++ .../api_op_CreateListener.go | 6 ++ .../api_op_DeleteAccelerator.go | 6 ++ .../api_op_DeleteEndpointGroup.go | 6 ++ .../api_op_DeleteListener.go | 6 ++ .../api_op_DeprovisionByoipCidr.go | 6 ++ .../api_op_DescribeAccelerator.go | 6 ++ .../api_op_DescribeAcceleratorAttributes.go | 6 ++ .../api_op_DescribeEndpointGroup.go | 6 ++ .../api_op_DescribeListener.go | 6 ++ .../api_op_ListAccelerators.go | 6 ++ .../api_op_ListByoipCidrs.go | 6 ++ .../api_op_ListEndpointGroups.go | 6 ++ .../globalaccelerator/api_op_ListListeners.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ProvisionByoipCidr.go | 6 ++ .../globalaccelerator/api_op_TagResource.go | 6 ++ .../globalaccelerator/api_op_UntagResource.go | 6 ++ .../api_op_UpdateAccelerator.go | 6 ++ .../api_op_UpdateAcceleratorAttributes.go | 6 ++ .../api_op_UpdateEndpointGroup.go | 6 ++ .../api_op_UpdateListener.go | 6 ++ .../api_op_WithdrawByoipCidr.go | 6 ++ service/globalaccelerator/go.mod | 4 +- service/globalaccelerator/go.sum | 2 - service/glue/api_client.go | 52 ++++++++-- service/glue/api_op_BatchCreatePartition.go | 6 ++ service/glue/api_op_BatchDeleteConnection.go | 6 ++ service/glue/api_op_BatchDeletePartition.go | 6 ++ service/glue/api_op_BatchDeleteTable.go | 6 ++ .../glue/api_op_BatchDeleteTableVersion.go | 6 ++ service/glue/api_op_BatchGetCrawlers.go | 6 ++ service/glue/api_op_BatchGetDevEndpoints.go | 6 ++ service/glue/api_op_BatchGetJobs.go | 6 ++ service/glue/api_op_BatchGetPartition.go | 6 ++ service/glue/api_op_BatchGetTriggers.go | 6 ++ service/glue/api_op_BatchGetWorkflows.go | 6 ++ service/glue/api_op_BatchStopJobRun.go | 6 ++ service/glue/api_op_BatchUpdatePartition.go | 6 ++ service/glue/api_op_CancelMLTaskRun.go | 6 ++ service/glue/api_op_CreateClassifier.go | 6 ++ service/glue/api_op_CreateConnection.go | 6 ++ service/glue/api_op_CreateCrawler.go | 6 ++ service/glue/api_op_CreateDatabase.go | 6 ++ service/glue/api_op_CreateDevEndpoint.go | 6 ++ service/glue/api_op_CreateJob.go | 6 ++ service/glue/api_op_CreateMLTransform.go | 6 ++ service/glue/api_op_CreatePartition.go | 6 ++ service/glue/api_op_CreateScript.go | 6 ++ .../api_op_CreateSecurityConfiguration.go | 6 ++ service/glue/api_op_CreateTable.go | 6 ++ service/glue/api_op_CreateTrigger.go | 6 ++ .../glue/api_op_CreateUserDefinedFunction.go | 6 ++ service/glue/api_op_CreateWorkflow.go | 6 ++ service/glue/api_op_DeleteClassifier.go | 6 ++ ...i_op_DeleteColumnStatisticsForPartition.go | 6 ++ .../api_op_DeleteColumnStatisticsForTable.go | 6 ++ service/glue/api_op_DeleteConnection.go | 6 ++ service/glue/api_op_DeleteCrawler.go | 6 ++ service/glue/api_op_DeleteDatabase.go | 6 ++ service/glue/api_op_DeleteDevEndpoint.go | 6 ++ service/glue/api_op_DeleteJob.go | 6 ++ service/glue/api_op_DeleteMLTransform.go | 6 ++ service/glue/api_op_DeletePartition.go | 6 ++ service/glue/api_op_DeleteResourcePolicy.go | 6 ++ .../api_op_DeleteSecurityConfiguration.go | 6 ++ service/glue/api_op_DeleteTable.go | 6 ++ service/glue/api_op_DeleteTableVersion.go | 6 ++ service/glue/api_op_DeleteTrigger.go | 6 ++ .../glue/api_op_DeleteUserDefinedFunction.go | 6 ++ service/glue/api_op_DeleteWorkflow.go | 6 ++ service/glue/api_op_GetCatalogImportStatus.go | 6 ++ service/glue/api_op_GetClassifier.go | 6 ++ service/glue/api_op_GetClassifiers.go | 6 ++ .../api_op_GetColumnStatisticsForPartition.go | 6 ++ .../api_op_GetColumnStatisticsForTable.go | 6 ++ service/glue/api_op_GetConnection.go | 6 ++ service/glue/api_op_GetConnections.go | 6 ++ service/glue/api_op_GetCrawler.go | 6 ++ service/glue/api_op_GetCrawlerMetrics.go | 6 ++ service/glue/api_op_GetCrawlers.go | 6 ++ ...api_op_GetDataCatalogEncryptionSettings.go | 6 ++ service/glue/api_op_GetDatabase.go | 6 ++ service/glue/api_op_GetDatabases.go | 6 ++ service/glue/api_op_GetDataflowGraph.go | 6 ++ service/glue/api_op_GetDevEndpoint.go | 6 ++ service/glue/api_op_GetDevEndpoints.go | 6 ++ service/glue/api_op_GetJob.go | 6 ++ service/glue/api_op_GetJobBookmark.go | 6 ++ service/glue/api_op_GetJobRun.go | 6 ++ service/glue/api_op_GetJobRuns.go | 6 ++ service/glue/api_op_GetJobs.go | 6 ++ service/glue/api_op_GetMLTaskRun.go | 6 ++ service/glue/api_op_GetMLTaskRuns.go | 6 ++ service/glue/api_op_GetMLTransform.go | 6 ++ service/glue/api_op_GetMLTransforms.go | 6 ++ service/glue/api_op_GetMapping.go | 6 ++ service/glue/api_op_GetPartition.go | 6 ++ service/glue/api_op_GetPartitionIndexes.go | 6 ++ service/glue/api_op_GetPartitions.go | 6 ++ service/glue/api_op_GetPlan.go | 6 ++ service/glue/api_op_GetResourcePolicies.go | 6 ++ service/glue/api_op_GetResourcePolicy.go | 6 ++ .../glue/api_op_GetSecurityConfiguration.go | 6 ++ .../glue/api_op_GetSecurityConfigurations.go | 6 ++ service/glue/api_op_GetTable.go | 6 ++ service/glue/api_op_GetTableVersion.go | 6 ++ service/glue/api_op_GetTableVersions.go | 6 ++ service/glue/api_op_GetTables.go | 6 ++ service/glue/api_op_GetTags.go | 6 ++ service/glue/api_op_GetTrigger.go | 6 ++ service/glue/api_op_GetTriggers.go | 6 ++ service/glue/api_op_GetUserDefinedFunction.go | 6 ++ .../glue/api_op_GetUserDefinedFunctions.go | 6 ++ service/glue/api_op_GetWorkflow.go | 6 ++ service/glue/api_op_GetWorkflowRun.go | 6 ++ .../glue/api_op_GetWorkflowRunProperties.go | 6 ++ service/glue/api_op_GetWorkflowRuns.go | 6 ++ service/glue/api_op_ImportCatalogToGlue.go | 6 ++ service/glue/api_op_ListCrawlers.go | 6 ++ service/glue/api_op_ListDevEndpoints.go | 6 ++ service/glue/api_op_ListJobs.go | 6 ++ service/glue/api_op_ListMLTransforms.go | 6 ++ service/glue/api_op_ListTriggers.go | 6 ++ service/glue/api_op_ListWorkflows.go | 6 ++ ...api_op_PutDataCatalogEncryptionSettings.go | 6 ++ service/glue/api_op_PutResourcePolicy.go | 6 ++ .../glue/api_op_PutWorkflowRunProperties.go | 6 ++ service/glue/api_op_ResetJobBookmark.go | 6 ++ service/glue/api_op_ResumeWorkflowRun.go | 6 ++ service/glue/api_op_SearchTables.go | 6 ++ service/glue/api_op_StartCrawler.go | 6 ++ service/glue/api_op_StartCrawlerSchedule.go | 6 ++ .../glue/api_op_StartExportLabelsTaskRun.go | 6 ++ .../glue/api_op_StartImportLabelsTaskRun.go | 6 ++ service/glue/api_op_StartJobRun.go | 6 ++ .../glue/api_op_StartMLEvaluationTaskRun.go | 6 ++ ..._op_StartMLLabelingSetGenerationTaskRun.go | 6 ++ service/glue/api_op_StartTrigger.go | 6 ++ service/glue/api_op_StartWorkflowRun.go | 6 ++ service/glue/api_op_StopCrawler.go | 6 ++ service/glue/api_op_StopCrawlerSchedule.go | 6 ++ service/glue/api_op_StopTrigger.go | 6 ++ service/glue/api_op_StopWorkflowRun.go | 6 ++ service/glue/api_op_TagResource.go | 6 ++ service/glue/api_op_UntagResource.go | 6 ++ service/glue/api_op_UpdateClassifier.go | 6 ++ ...i_op_UpdateColumnStatisticsForPartition.go | 6 ++ .../api_op_UpdateColumnStatisticsForTable.go | 6 ++ service/glue/api_op_UpdateConnection.go | 6 ++ service/glue/api_op_UpdateCrawler.go | 6 ++ service/glue/api_op_UpdateCrawlerSchedule.go | 6 ++ service/glue/api_op_UpdateDatabase.go | 6 ++ service/glue/api_op_UpdateDevEndpoint.go | 6 ++ service/glue/api_op_UpdateJob.go | 6 ++ service/glue/api_op_UpdateMLTransform.go | 6 ++ service/glue/api_op_UpdatePartition.go | 6 ++ service/glue/api_op_UpdateTable.go | 6 ++ service/glue/api_op_UpdateTrigger.go | 6 ++ .../glue/api_op_UpdateUserDefinedFunction.go | 6 ++ service/glue/api_op_UpdateWorkflow.go | 6 ++ service/glue/go.mod | 4 +- service/glue/go.sum | 2 - service/greengrass/api_client.go | 52 ++++++++-- .../greengrass/api_op_AssociateRoleToGroup.go | 6 ++ .../api_op_AssociateServiceRoleToAccount.go | 6 ++ .../api_op_CreateConnectorDefinition.go | 6 ++ ...api_op_CreateConnectorDefinitionVersion.go | 6 ++ .../greengrass/api_op_CreateCoreDefinition.go | 6 ++ .../api_op_CreateCoreDefinitionVersion.go | 6 ++ service/greengrass/api_op_CreateDeployment.go | 6 ++ .../api_op_CreateDeviceDefinition.go | 6 ++ .../api_op_CreateDeviceDefinitionVersion.go | 6 ++ .../api_op_CreateFunctionDefinition.go | 6 ++ .../api_op_CreateFunctionDefinitionVersion.go | 6 ++ service/greengrass/api_op_CreateGroup.go | 6 ++ .../api_op_CreateGroupCertificateAuthority.go | 6 ++ .../greengrass/api_op_CreateGroupVersion.go | 6 ++ .../api_op_CreateLoggerDefinition.go | 6 ++ .../api_op_CreateLoggerDefinitionVersion.go | 6 ++ .../api_op_CreateResourceDefinition.go | 6 ++ .../api_op_CreateResourceDefinitionVersion.go | 6 ++ .../api_op_CreateSoftwareUpdateJob.go | 6 ++ .../api_op_CreateSubscriptionDefinition.go | 6 ++ ..._op_CreateSubscriptionDefinitionVersion.go | 6 ++ .../api_op_DeleteConnectorDefinition.go | 6 ++ .../greengrass/api_op_DeleteCoreDefinition.go | 6 ++ .../api_op_DeleteDeviceDefinition.go | 6 ++ .../api_op_DeleteFunctionDefinition.go | 6 ++ service/greengrass/api_op_DeleteGroup.go | 6 ++ .../api_op_DeleteLoggerDefinition.go | 6 ++ .../api_op_DeleteResourceDefinition.go | 6 ++ .../api_op_DeleteSubscriptionDefinition.go | 6 ++ .../api_op_DisassociateRoleFromGroup.go | 6 ++ ...i_op_DisassociateServiceRoleFromAccount.go | 6 ++ .../greengrass/api_op_GetAssociatedRole.go | 6 ++ .../api_op_GetBulkDeploymentStatus.go | 6 ++ .../greengrass/api_op_GetConnectivityInfo.go | 6 ++ .../api_op_GetConnectorDefinition.go | 6 ++ .../api_op_GetConnectorDefinitionVersion.go | 6 ++ .../greengrass/api_op_GetCoreDefinition.go | 6 ++ .../api_op_GetCoreDefinitionVersion.go | 6 ++ .../greengrass/api_op_GetDeploymentStatus.go | 6 ++ .../greengrass/api_op_GetDeviceDefinition.go | 6 ++ .../api_op_GetDeviceDefinitionVersion.go | 6 ++ .../api_op_GetFunctionDefinition.go | 6 ++ .../api_op_GetFunctionDefinitionVersion.go | 6 ++ service/greengrass/api_op_GetGroup.go | 6 ++ .../api_op_GetGroupCertificateAuthority.go | 6 ++ ...api_op_GetGroupCertificateConfiguration.go | 6 ++ service/greengrass/api_op_GetGroupVersion.go | 6 ++ .../greengrass/api_op_GetLoggerDefinition.go | 6 ++ .../api_op_GetLoggerDefinitionVersion.go | 6 ++ .../api_op_GetResourceDefinition.go | 6 ++ .../api_op_GetResourceDefinitionVersion.go | 6 ++ .../api_op_GetServiceRoleForAccount.go | 6 ++ .../api_op_GetSubscriptionDefinition.go | 6 ++ ...api_op_GetSubscriptionDefinitionVersion.go | 6 ++ .../api_op_GetThingRuntimeConfiguration.go | 6 ++ ...pi_op_ListBulkDeploymentDetailedReports.go | 6 ++ .../greengrass/api_op_ListBulkDeployments.go | 6 ++ .../api_op_ListConnectorDefinitionVersions.go | 6 ++ .../api_op_ListConnectorDefinitions.go | 6 ++ .../api_op_ListCoreDefinitionVersions.go | 6 ++ .../greengrass/api_op_ListCoreDefinitions.go | 6 ++ service/greengrass/api_op_ListDeployments.go | 6 ++ .../api_op_ListDeviceDefinitionVersions.go | 6 ++ .../api_op_ListDeviceDefinitions.go | 6 ++ .../api_op_ListFunctionDefinitionVersions.go | 6 ++ .../api_op_ListFunctionDefinitions.go | 6 ++ .../api_op_ListGroupCertificateAuthorities.go | 6 ++ .../greengrass/api_op_ListGroupVersions.go | 6 ++ service/greengrass/api_op_ListGroups.go | 6 ++ .../api_op_ListLoggerDefinitionVersions.go | 6 ++ .../api_op_ListLoggerDefinitions.go | 6 ++ .../api_op_ListResourceDefinitionVersions.go | 6 ++ .../api_op_ListResourceDefinitions.go | 6 ++ ...i_op_ListSubscriptionDefinitionVersions.go | 6 ++ .../api_op_ListSubscriptionDefinitions.go | 6 ++ .../greengrass/api_op_ListTagsForResource.go | 6 ++ service/greengrass/api_op_ResetDeployments.go | 6 ++ .../greengrass/api_op_StartBulkDeployment.go | 6 ++ .../greengrass/api_op_StopBulkDeployment.go | 6 ++ service/greengrass/api_op_TagResource.go | 6 ++ service/greengrass/api_op_UntagResource.go | 6 ++ .../api_op_UpdateConnectivityInfo.go | 6 ++ .../api_op_UpdateConnectorDefinition.go | 6 ++ .../greengrass/api_op_UpdateCoreDefinition.go | 6 ++ .../api_op_UpdateDeviceDefinition.go | 6 ++ .../api_op_UpdateFunctionDefinition.go | 6 ++ service/greengrass/api_op_UpdateGroup.go | 6 ++ ..._op_UpdateGroupCertificateConfiguration.go | 6 ++ .../api_op_UpdateLoggerDefinition.go | 6 ++ .../api_op_UpdateResourceDefinition.go | 6 ++ .../api_op_UpdateSubscriptionDefinition.go | 6 ++ .../api_op_UpdateThingRuntimeConfiguration.go | 6 ++ service/greengrass/go.mod | 4 +- service/greengrass/go.sum | 2 - service/groundstation/api_client.go | 52 ++++++++-- service/groundstation/api_op_CancelContact.go | 6 ++ service/groundstation/api_op_CreateConfig.go | 6 ++ .../api_op_CreateDataflowEndpointGroup.go | 6 ++ .../api_op_CreateMissionProfile.go | 6 ++ service/groundstation/api_op_DeleteConfig.go | 6 ++ .../api_op_DeleteDataflowEndpointGroup.go | 6 ++ .../api_op_DeleteMissionProfile.go | 6 ++ .../groundstation/api_op_DescribeContact.go | 6 ++ service/groundstation/api_op_GetConfig.go | 6 ++ .../api_op_GetDataflowEndpointGroup.go | 6 ++ .../groundstation/api_op_GetMinuteUsage.go | 6 ++ .../groundstation/api_op_GetMissionProfile.go | 6 ++ service/groundstation/api_op_GetSatellite.go | 6 ++ service/groundstation/api_op_ListConfigs.go | 6 ++ service/groundstation/api_op_ListContacts.go | 6 ++ .../api_op_ListDataflowEndpointGroups.go | 6 ++ .../api_op_ListGroundStations.go | 6 ++ .../api_op_ListMissionProfiles.go | 6 ++ .../groundstation/api_op_ListSatellites.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../groundstation/api_op_ReserveContact.go | 6 ++ service/groundstation/api_op_TagResource.go | 6 ++ service/groundstation/api_op_UntagResource.go | 6 ++ service/groundstation/api_op_UpdateConfig.go | 6 ++ .../api_op_UpdateMissionProfile.go | 6 ++ service/groundstation/go.mod | 4 +- service/groundstation/go.sum | 2 - service/guardduty/api_client.go | 52 ++++++++-- service/guardduty/api_op_AcceptInvitation.go | 6 ++ service/guardduty/api_op_ArchiveFindings.go | 6 ++ service/guardduty/api_op_CreateDetector.go | 6 ++ service/guardduty/api_op_CreateFilter.go | 6 ++ service/guardduty/api_op_CreateIPSet.go | 6 ++ service/guardduty/api_op_CreateMembers.go | 6 ++ .../api_op_CreatePublishingDestination.go | 6 ++ .../guardduty/api_op_CreateSampleFindings.go | 6 ++ .../guardduty/api_op_CreateThreatIntelSet.go | 6 ++ .../guardduty/api_op_DeclineInvitations.go | 6 ++ service/guardduty/api_op_DeleteDetector.go | 6 ++ service/guardduty/api_op_DeleteFilter.go | 6 ++ service/guardduty/api_op_DeleteIPSet.go | 6 ++ service/guardduty/api_op_DeleteInvitations.go | 6 ++ service/guardduty/api_op_DeleteMembers.go | 6 ++ .../api_op_DeletePublishingDestination.go | 6 ++ .../guardduty/api_op_DeleteThreatIntelSet.go | 6 ++ ...pi_op_DescribeOrganizationConfiguration.go | 6 ++ .../api_op_DescribePublishingDestination.go | 6 ++ .../api_op_DisableOrganizationAdminAccount.go | 6 ++ .../api_op_DisassociateFromMasterAccount.go | 6 ++ .../guardduty/api_op_DisassociateMembers.go | 6 ++ .../api_op_EnableOrganizationAdminAccount.go | 6 ++ service/guardduty/api_op_GetDetector.go | 6 ++ service/guardduty/api_op_GetFilter.go | 6 ++ service/guardduty/api_op_GetFindings.go | 6 ++ .../guardduty/api_op_GetFindingsStatistics.go | 6 ++ service/guardduty/api_op_GetIPSet.go | 6 ++ .../guardduty/api_op_GetInvitationsCount.go | 6 ++ service/guardduty/api_op_GetMasterAccount.go | 6 ++ .../guardduty/api_op_GetMemberDetectors.go | 6 ++ service/guardduty/api_op_GetMembers.go | 6 ++ service/guardduty/api_op_GetThreatIntelSet.go | 6 ++ .../guardduty/api_op_GetUsageStatistics.go | 6 ++ service/guardduty/api_op_InviteMembers.go | 6 ++ service/guardduty/api_op_ListDetectors.go | 6 ++ service/guardduty/api_op_ListFilters.go | 6 ++ service/guardduty/api_op_ListFindings.go | 6 ++ service/guardduty/api_op_ListIPSets.go | 6 ++ service/guardduty/api_op_ListInvitations.go | 6 ++ service/guardduty/api_op_ListMembers.go | 6 ++ .../api_op_ListOrganizationAdminAccounts.go | 6 ++ .../api_op_ListPublishingDestinations.go | 6 ++ .../guardduty/api_op_ListTagsForResource.go | 6 ++ .../guardduty/api_op_ListThreatIntelSets.go | 6 ++ .../api_op_StartMonitoringMembers.go | 6 ++ .../guardduty/api_op_StopMonitoringMembers.go | 6 ++ service/guardduty/api_op_TagResource.go | 6 ++ service/guardduty/api_op_UnarchiveFindings.go | 6 ++ service/guardduty/api_op_UntagResource.go | 6 ++ service/guardduty/api_op_UpdateDetector.go | 6 ++ service/guardduty/api_op_UpdateFilter.go | 6 ++ .../api_op_UpdateFindingsFeedback.go | 6 ++ service/guardduty/api_op_UpdateIPSet.go | 6 ++ .../guardduty/api_op_UpdateMemberDetectors.go | 6 ++ .../api_op_UpdateOrganizationConfiguration.go | 6 ++ .../api_op_UpdatePublishingDestination.go | 6 ++ .../guardduty/api_op_UpdateThreatIntelSet.go | 6 ++ service/guardduty/go.mod | 4 +- service/guardduty/go.sum | 2 - service/health/api_client.go | 52 ++++++++-- ...DescribeAffectedAccountsForOrganization.go | 6 ++ .../health/api_op_DescribeAffectedEntities.go | 6 ++ ...DescribeAffectedEntitiesForOrganization.go | 6 ++ .../health/api_op_DescribeEntityAggregates.go | 6 ++ .../health/api_op_DescribeEventAggregates.go | 6 ++ service/health/api_op_DescribeEventDetails.go | 6 ++ ..._op_DescribeEventDetailsForOrganization.go | 6 ++ service/health/api_op_DescribeEventTypes.go | 6 ++ service/health/api_op_DescribeEvents.go | 6 ++ .../api_op_DescribeEventsForOrganization.go | 6 ++ ...cribeHealthServiceStatusForOrganization.go | 6 ++ ...sableHealthServiceAccessForOrganization.go | 6 ++ ...nableHealthServiceAccessForOrganization.go | 6 ++ service/health/go.mod | 4 +- service/health/go.sum | 2 - service/honeycode/api_client.go | 52 ++++++++-- service/honeycode/api_op_GetScreenData.go | 6 ++ .../api_op_InvokeScreenAutomation.go | 6 ++ service/honeycode/go.mod | 4 +- service/honeycode/go.sum | 2 - service/iam/api_client.go | 52 ++++++++-- ...i_op_AddClientIDToOpenIDConnectProvider.go | 6 ++ .../iam/api_op_AddRoleToInstanceProfile.go | 6 ++ service/iam/api_op_AddUserToGroup.go | 6 ++ service/iam/api_op_AttachGroupPolicy.go | 6 ++ service/iam/api_op_AttachRolePolicy.go | 6 ++ service/iam/api_op_AttachUserPolicy.go | 6 ++ service/iam/api_op_ChangePassword.go | 6 ++ service/iam/api_op_CreateAccessKey.go | 6 ++ service/iam/api_op_CreateAccountAlias.go | 6 ++ service/iam/api_op_CreateGroup.go | 6 ++ service/iam/api_op_CreateInstanceProfile.go | 6 ++ service/iam/api_op_CreateLoginProfile.go | 6 ++ .../iam/api_op_CreateOpenIDConnectProvider.go | 6 ++ service/iam/api_op_CreatePolicy.go | 6 ++ service/iam/api_op_CreatePolicyVersion.go | 6 ++ service/iam/api_op_CreateRole.go | 6 ++ service/iam/api_op_CreateSAMLProvider.go | 6 ++ service/iam/api_op_CreateServiceLinkedRole.go | 6 ++ .../api_op_CreateServiceSpecificCredential.go | 6 ++ service/iam/api_op_CreateUser.go | 6 ++ service/iam/api_op_CreateVirtualMFADevice.go | 6 ++ service/iam/api_op_DeactivateMFADevice.go | 6 ++ service/iam/api_op_DeleteAccessKey.go | 6 ++ service/iam/api_op_DeleteAccountAlias.go | 6 ++ .../iam/api_op_DeleteAccountPasswordPolicy.go | 6 ++ service/iam/api_op_DeleteGroup.go | 6 ++ service/iam/api_op_DeleteGroupPolicy.go | 6 ++ service/iam/api_op_DeleteInstanceProfile.go | 6 ++ service/iam/api_op_DeleteLoginProfile.go | 6 ++ .../iam/api_op_DeleteOpenIDConnectProvider.go | 6 ++ service/iam/api_op_DeletePolicy.go | 6 ++ service/iam/api_op_DeletePolicyVersion.go | 6 ++ service/iam/api_op_DeleteRole.go | 6 ++ .../api_op_DeleteRolePermissionsBoundary.go | 6 ++ service/iam/api_op_DeleteRolePolicy.go | 6 ++ service/iam/api_op_DeleteSAMLProvider.go | 6 ++ service/iam/api_op_DeleteSSHPublicKey.go | 6 ++ service/iam/api_op_DeleteServerCertificate.go | 6 ++ service/iam/api_op_DeleteServiceLinkedRole.go | 6 ++ .../api_op_DeleteServiceSpecificCredential.go | 6 ++ .../iam/api_op_DeleteSigningCertificate.go | 6 ++ service/iam/api_op_DeleteUser.go | 6 ++ .../api_op_DeleteUserPermissionsBoundary.go | 6 ++ service/iam/api_op_DeleteUserPolicy.go | 6 ++ service/iam/api_op_DeleteVirtualMFADevice.go | 6 ++ service/iam/api_op_DetachGroupPolicy.go | 6 ++ service/iam/api_op_DetachRolePolicy.go | 6 ++ service/iam/api_op_DetachUserPolicy.go | 6 ++ service/iam/api_op_EnableMFADevice.go | 6 ++ .../iam/api_op_GenerateCredentialReport.go | 6 ++ ...pi_op_GenerateOrganizationsAccessReport.go | 6 ++ ...i_op_GenerateServiceLastAccessedDetails.go | 6 ++ service/iam/api_op_GetAccessKeyLastUsed.go | 6 ++ .../api_op_GetAccountAuthorizationDetails.go | 6 ++ .../iam/api_op_GetAccountPasswordPolicy.go | 6 ++ service/iam/api_op_GetAccountSummary.go | 6 ++ .../api_op_GetContextKeysForCustomPolicy.go | 6 ++ ...api_op_GetContextKeysForPrincipalPolicy.go | 6 ++ service/iam/api_op_GetCredentialReport.go | 6 ++ service/iam/api_op_GetGroup.go | 6 ++ service/iam/api_op_GetGroupPolicy.go | 6 ++ service/iam/api_op_GetInstanceProfile.go | 6 ++ service/iam/api_op_GetLoginProfile.go | 6 ++ .../iam/api_op_GetOpenIDConnectProvider.go | 6 ++ .../api_op_GetOrganizationsAccessReport.go | 6 ++ service/iam/api_op_GetPolicy.go | 6 ++ service/iam/api_op_GetPolicyVersion.go | 6 ++ service/iam/api_op_GetRole.go | 6 ++ service/iam/api_op_GetRolePolicy.go | 6 ++ service/iam/api_op_GetSAMLProvider.go | 6 ++ service/iam/api_op_GetSSHPublicKey.go | 6 ++ service/iam/api_op_GetServerCertificate.go | 6 ++ .../api_op_GetServiceLastAccessedDetails.go | 6 ++ ...tServiceLastAccessedDetailsWithEntities.go | 6 ++ ...i_op_GetServiceLinkedRoleDeletionStatus.go | 6 ++ service/iam/api_op_GetUser.go | 6 ++ service/iam/api_op_GetUserPolicy.go | 6 ++ service/iam/api_op_ListAccessKeys.go | 6 ++ service/iam/api_op_ListAccountAliases.go | 6 ++ .../iam/api_op_ListAttachedGroupPolicies.go | 6 ++ .../iam/api_op_ListAttachedRolePolicies.go | 6 ++ .../iam/api_op_ListAttachedUserPolicies.go | 6 ++ service/iam/api_op_ListEntitiesForPolicy.go | 6 ++ service/iam/api_op_ListGroupPolicies.go | 6 ++ service/iam/api_op_ListGroups.go | 6 ++ service/iam/api_op_ListGroupsForUser.go | 6 ++ service/iam/api_op_ListInstanceProfiles.go | 6 ++ .../iam/api_op_ListInstanceProfilesForRole.go | 6 ++ service/iam/api_op_ListMFADevices.go | 6 ++ .../iam/api_op_ListOpenIDConnectProviders.go | 6 ++ service/iam/api_op_ListPolicies.go | 6 ++ ...pi_op_ListPoliciesGrantingServiceAccess.go | 6 ++ service/iam/api_op_ListPolicyVersions.go | 6 ++ service/iam/api_op_ListRolePolicies.go | 6 ++ service/iam/api_op_ListRoleTags.go | 6 ++ service/iam/api_op_ListRoles.go | 6 ++ service/iam/api_op_ListSAMLProviders.go | 6 ++ service/iam/api_op_ListSSHPublicKeys.go | 6 ++ service/iam/api_op_ListServerCertificates.go | 6 ++ .../api_op_ListServiceSpecificCredentials.go | 6 ++ service/iam/api_op_ListSigningCertificates.go | 6 ++ service/iam/api_op_ListUserPolicies.go | 6 ++ service/iam/api_op_ListUserTags.go | 6 ++ service/iam/api_op_ListUsers.go | 6 ++ service/iam/api_op_ListVirtualMFADevices.go | 6 ++ service/iam/api_op_PutGroupPolicy.go | 6 ++ .../iam/api_op_PutRolePermissionsBoundary.go | 6 ++ service/iam/api_op_PutRolePolicy.go | 6 ++ .../iam/api_op_PutUserPermissionsBoundary.go | 6 ++ service/iam/api_op_PutUserPolicy.go | 6 ++ ...RemoveClientIDFromOpenIDConnectProvider.go | 6 ++ .../api_op_RemoveRoleFromInstanceProfile.go | 6 ++ service/iam/api_op_RemoveUserFromGroup.go | 6 ++ .../api_op_ResetServiceSpecificCredential.go | 6 ++ service/iam/api_op_ResyncMFADevice.go | 6 ++ service/iam/api_op_SetDefaultPolicyVersion.go | 6 ++ ...i_op_SetSecurityTokenServicePreferences.go | 6 ++ service/iam/api_op_SimulateCustomPolicy.go | 6 ++ service/iam/api_op_SimulatePrincipalPolicy.go | 6 ++ service/iam/api_op_TagRole.go | 6 ++ service/iam/api_op_TagUser.go | 6 ++ service/iam/api_op_UntagRole.go | 6 ++ service/iam/api_op_UntagUser.go | 6 ++ service/iam/api_op_UpdateAccessKey.go | 6 ++ .../iam/api_op_UpdateAccountPasswordPolicy.go | 6 ++ service/iam/api_op_UpdateAssumeRolePolicy.go | 6 ++ service/iam/api_op_UpdateGroup.go | 6 ++ service/iam/api_op_UpdateLoginProfile.go | 6 ++ ...p_UpdateOpenIDConnectProviderThumbprint.go | 6 ++ service/iam/api_op_UpdateRole.go | 6 ++ service/iam/api_op_UpdateRoleDescription.go | 6 ++ service/iam/api_op_UpdateSAMLProvider.go | 6 ++ service/iam/api_op_UpdateSSHPublicKey.go | 6 ++ service/iam/api_op_UpdateServerCertificate.go | 6 ++ .../api_op_UpdateServiceSpecificCredential.go | 6 ++ .../iam/api_op_UpdateSigningCertificate.go | 6 ++ service/iam/api_op_UpdateUser.go | 6 ++ service/iam/api_op_UploadSSHPublicKey.go | 6 ++ service/iam/api_op_UploadServerCertificate.go | 6 ++ .../iam/api_op_UploadSigningCertificate.go | 6 ++ service/iam/go.mod | 4 +- service/iam/go.sum | 2 - service/identitystore/api_client.go | 52 ++++++++-- service/identitystore/api_op_DescribeGroup.go | 6 ++ service/identitystore/api_op_DescribeUser.go | 6 ++ service/identitystore/api_op_ListGroups.go | 6 ++ service/identitystore/api_op_ListUsers.go | 6 ++ service/identitystore/go.mod | 4 +- service/identitystore/go.sum | 2 - service/imagebuilder/api_client.go | 52 ++++++++-- .../api_op_CancelImageCreation.go | 6 ++ .../imagebuilder/api_op_CreateComponent.go | 6 ++ .../api_op_CreateDistributionConfiguration.go | 6 ++ service/imagebuilder/api_op_CreateImage.go | 6 ++ .../api_op_CreateImagePipeline.go | 6 ++ .../imagebuilder/api_op_CreateImageRecipe.go | 6 ++ ...pi_op_CreateInfrastructureConfiguration.go | 6 ++ .../imagebuilder/api_op_DeleteComponent.go | 6 ++ .../api_op_DeleteDistributionConfiguration.go | 6 ++ service/imagebuilder/api_op_DeleteImage.go | 6 ++ .../api_op_DeleteImagePipeline.go | 6 ++ .../imagebuilder/api_op_DeleteImageRecipe.go | 6 ++ ...pi_op_DeleteInfrastructureConfiguration.go | 6 ++ service/imagebuilder/api_op_GetComponent.go | 6 ++ .../imagebuilder/api_op_GetComponentPolicy.go | 6 ++ .../api_op_GetDistributionConfiguration.go | 6 ++ service/imagebuilder/api_op_GetImage.go | 6 ++ .../imagebuilder/api_op_GetImagePipeline.go | 6 ++ service/imagebuilder/api_op_GetImagePolicy.go | 6 ++ service/imagebuilder/api_op_GetImageRecipe.go | 6 ++ .../api_op_GetImageRecipePolicy.go | 6 ++ .../api_op_GetInfrastructureConfiguration.go | 6 ++ .../imagebuilder/api_op_ImportComponent.go | 6 ++ .../api_op_ListComponentBuildVersions.go | 6 ++ service/imagebuilder/api_op_ListComponents.go | 6 ++ .../api_op_ListDistributionConfigurations.go | 6 ++ .../api_op_ListImageBuildVersions.go | 6 ++ .../api_op_ListImagePipelineImages.go | 6 ++ .../imagebuilder/api_op_ListImagePipelines.go | 6 ++ .../imagebuilder/api_op_ListImageRecipes.go | 6 ++ service/imagebuilder/api_op_ListImages.go | 6 ++ ...api_op_ListInfrastructureConfigurations.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../imagebuilder/api_op_PutComponentPolicy.go | 6 ++ service/imagebuilder/api_op_PutImagePolicy.go | 6 ++ .../api_op_PutImageRecipePolicy.go | 6 ++ .../api_op_StartImagePipelineExecution.go | 6 ++ service/imagebuilder/api_op_TagResource.go | 6 ++ service/imagebuilder/api_op_UntagResource.go | 6 ++ .../api_op_UpdateDistributionConfiguration.go | 6 ++ .../api_op_UpdateImagePipeline.go | 6 ++ ...pi_op_UpdateInfrastructureConfiguration.go | 6 ++ service/imagebuilder/go.mod | 4 +- service/imagebuilder/go.sum | 2 - service/inspector/api_client.go | 52 ++++++++-- .../api_op_AddAttributesToFindings.go | 6 ++ .../api_op_CreateAssessmentTarget.go | 6 ++ .../api_op_CreateAssessmentTemplate.go | 6 ++ .../api_op_CreateExclusionsPreview.go | 6 ++ .../inspector/api_op_CreateResourceGroup.go | 6 ++ .../inspector/api_op_DeleteAssessmentRun.go | 6 ++ .../api_op_DeleteAssessmentTarget.go | 6 ++ .../api_op_DeleteAssessmentTemplate.go | 6 ++ .../api_op_DescribeAssessmentRuns.go | 6 ++ .../api_op_DescribeAssessmentTargets.go | 6 ++ .../api_op_DescribeAssessmentTemplates.go | 6 ++ .../api_op_DescribeCrossAccountAccessRole.go | 6 ++ .../inspector/api_op_DescribeExclusions.go | 6 ++ service/inspector/api_op_DescribeFindings.go | 6 ++ .../api_op_DescribeResourceGroups.go | 6 ++ .../inspector/api_op_DescribeRulesPackages.go | 6 ++ .../inspector/api_op_GetAssessmentReport.go | 6 ++ .../inspector/api_op_GetExclusionsPreview.go | 6 ++ .../inspector/api_op_GetTelemetryMetadata.go | 6 ++ .../api_op_ListAssessmentRunAgents.go | 6 ++ .../inspector/api_op_ListAssessmentRuns.go | 6 ++ .../inspector/api_op_ListAssessmentTargets.go | 6 ++ .../api_op_ListAssessmentTemplates.go | 6 ++ .../api_op_ListEventSubscriptions.go | 6 ++ service/inspector/api_op_ListExclusions.go | 6 ++ service/inspector/api_op_ListFindings.go | 6 ++ service/inspector/api_op_ListRulesPackages.go | 6 ++ .../inspector/api_op_ListTagsForResource.go | 6 ++ service/inspector/api_op_PreviewAgents.go | 6 ++ .../api_op_RegisterCrossAccountAccessRole.go | 6 ++ .../api_op_RemoveAttributesFromFindings.go | 6 ++ .../inspector/api_op_SetTagsForResource.go | 6 ++ .../inspector/api_op_StartAssessmentRun.go | 6 ++ service/inspector/api_op_StopAssessmentRun.go | 6 ++ service/inspector/api_op_SubscribeToEvent.go | 6 ++ .../inspector/api_op_UnsubscribeFromEvent.go | 6 ++ .../api_op_UpdateAssessmentTarget.go | 6 ++ service/inspector/go.mod | 4 +- service/inspector/go.sum | 2 - service/internal/accept-encoding/go.sum | 2 - service/internal/benchmark/go.mod | 2 +- service/internal/benchmark/go.sum | 4 - service/internal/integrationtest/config.go | 11 +-- service/internal/integrationtest/go.mod | 2 +- service/internal/integrationtest/go.sum | 4 - service/internal/presigned-url/go.sum | 2 - service/internal/s3shared/go.sum | 2 - service/iot/api_client.go | 52 ++++++++-- .../iot/api_op_AcceptCertificateTransfer.go | 6 ++ service/iot/api_op_AddThingToBillingGroup.go | 6 ++ service/iot/api_op_AddThingToThingGroup.go | 6 ++ service/iot/api_op_AssociateTargetsWithJob.go | 6 ++ service/iot/api_op_AttachPolicy.go | 6 ++ service/iot/api_op_AttachPrincipalPolicy.go | 6 ++ service/iot/api_op_AttachSecurityProfile.go | 6 ++ service/iot/api_op_AttachThingPrincipal.go | 6 ++ ...api_op_CancelAuditMitigationActionsTask.go | 6 ++ service/iot/api_op_CancelAuditTask.go | 6 ++ .../iot/api_op_CancelCertificateTransfer.go | 6 ++ service/iot/api_op_CancelJob.go | 6 ++ service/iot/api_op_CancelJobExecution.go | 6 ++ service/iot/api_op_ClearDefaultAuthorizer.go | 6 ++ .../iot/api_op_ConfirmTopicRuleDestination.go | 6 ++ service/iot/api_op_CreateAuditSuppression.go | 6 ++ service/iot/api_op_CreateAuthorizer.go | 6 ++ service/iot/api_op_CreateBillingGroup.go | 6 ++ .../iot/api_op_CreateCertificateFromCsr.go | 6 ++ service/iot/api_op_CreateDimension.go | 6 ++ .../iot/api_op_CreateDomainConfiguration.go | 6 ++ service/iot/api_op_CreateDynamicThingGroup.go | 6 ++ service/iot/api_op_CreateJob.go | 6 ++ .../iot/api_op_CreateKeysAndCertificate.go | 6 ++ service/iot/api_op_CreateMitigationAction.go | 6 ++ service/iot/api_op_CreateOTAUpdate.go | 6 ++ service/iot/api_op_CreatePolicy.go | 6 ++ service/iot/api_op_CreatePolicyVersion.go | 6 ++ service/iot/api_op_CreateProvisioningClaim.go | 6 ++ .../iot/api_op_CreateProvisioningTemplate.go | 6 ++ ...pi_op_CreateProvisioningTemplateVersion.go | 6 ++ service/iot/api_op_CreateRoleAlias.go | 6 ++ service/iot/api_op_CreateScheduledAudit.go | 6 ++ service/iot/api_op_CreateSecurityProfile.go | 6 ++ service/iot/api_op_CreateStream.go | 6 ++ service/iot/api_op_CreateThing.go | 6 ++ service/iot/api_op_CreateThingGroup.go | 6 ++ service/iot/api_op_CreateThingType.go | 6 ++ service/iot/api_op_CreateTopicRule.go | 6 ++ .../iot/api_op_CreateTopicRuleDestination.go | 6 ++ .../api_op_DeleteAccountAuditConfiguration.go | 6 ++ service/iot/api_op_DeleteAuditSuppression.go | 6 ++ service/iot/api_op_DeleteAuthorizer.go | 6 ++ service/iot/api_op_DeleteBillingGroup.go | 6 ++ service/iot/api_op_DeleteCACertificate.go | 6 ++ service/iot/api_op_DeleteCertificate.go | 6 ++ service/iot/api_op_DeleteDimension.go | 6 ++ .../iot/api_op_DeleteDomainConfiguration.go | 6 ++ service/iot/api_op_DeleteDynamicThingGroup.go | 6 ++ service/iot/api_op_DeleteJob.go | 6 ++ service/iot/api_op_DeleteJobExecution.go | 6 ++ service/iot/api_op_DeleteMitigationAction.go | 6 ++ service/iot/api_op_DeleteOTAUpdate.go | 6 ++ service/iot/api_op_DeletePolicy.go | 6 ++ service/iot/api_op_DeletePolicyVersion.go | 6 ++ .../iot/api_op_DeleteProvisioningTemplate.go | 6 ++ ...pi_op_DeleteProvisioningTemplateVersion.go | 6 ++ service/iot/api_op_DeleteRegistrationCode.go | 6 ++ service/iot/api_op_DeleteRoleAlias.go | 6 ++ service/iot/api_op_DeleteScheduledAudit.go | 6 ++ service/iot/api_op_DeleteSecurityProfile.go | 6 ++ service/iot/api_op_DeleteStream.go | 6 ++ service/iot/api_op_DeleteThing.go | 6 ++ service/iot/api_op_DeleteThingGroup.go | 6 ++ service/iot/api_op_DeleteThingType.go | 6 ++ service/iot/api_op_DeleteTopicRule.go | 6 ++ .../iot/api_op_DeleteTopicRuleDestination.go | 6 ++ service/iot/api_op_DeleteV2LoggingLevel.go | 6 ++ service/iot/api_op_DeprecateThingType.go | 6 ++ ...pi_op_DescribeAccountAuditConfiguration.go | 6 ++ service/iot/api_op_DescribeAuditFinding.go | 6 ++ ...i_op_DescribeAuditMitigationActionsTask.go | 6 ++ .../iot/api_op_DescribeAuditSuppression.go | 6 ++ service/iot/api_op_DescribeAuditTask.go | 6 ++ service/iot/api_op_DescribeAuthorizer.go | 6 ++ service/iot/api_op_DescribeBillingGroup.go | 6 ++ service/iot/api_op_DescribeCACertificate.go | 6 ++ service/iot/api_op_DescribeCertificate.go | 6 ++ .../iot/api_op_DescribeDefaultAuthorizer.go | 6 ++ service/iot/api_op_DescribeDimension.go | 6 ++ .../iot/api_op_DescribeDomainConfiguration.go | 6 ++ service/iot/api_op_DescribeEndpoint.go | 6 ++ .../iot/api_op_DescribeEventConfigurations.go | 6 ++ service/iot/api_op_DescribeIndex.go | 6 ++ service/iot/api_op_DescribeJob.go | 6 ++ service/iot/api_op_DescribeJobExecution.go | 6 ++ .../iot/api_op_DescribeMitigationAction.go | 6 ++ .../api_op_DescribeProvisioningTemplate.go | 6 ++ ..._op_DescribeProvisioningTemplateVersion.go | 6 ++ service/iot/api_op_DescribeRoleAlias.go | 6 ++ service/iot/api_op_DescribeScheduledAudit.go | 6 ++ service/iot/api_op_DescribeSecurityProfile.go | 6 ++ service/iot/api_op_DescribeStream.go | 6 ++ service/iot/api_op_DescribeThing.go | 6 ++ service/iot/api_op_DescribeThingGroup.go | 6 ++ .../api_op_DescribeThingRegistrationTask.go | 6 ++ service/iot/api_op_DescribeThingType.go | 6 ++ service/iot/api_op_DetachPolicy.go | 6 ++ service/iot/api_op_DetachPrincipalPolicy.go | 6 ++ service/iot/api_op_DetachSecurityProfile.go | 6 ++ service/iot/api_op_DetachThingPrincipal.go | 6 ++ service/iot/api_op_DisableTopicRule.go | 6 ++ service/iot/api_op_EnableTopicRule.go | 6 ++ service/iot/api_op_GetCardinality.go | 6 ++ service/iot/api_op_GetEffectivePolicies.go | 6 ++ .../iot/api_op_GetIndexingConfiguration.go | 6 ++ service/iot/api_op_GetJobDocument.go | 6 ++ service/iot/api_op_GetLoggingOptions.go | 6 ++ service/iot/api_op_GetOTAUpdate.go | 6 ++ service/iot/api_op_GetPercentiles.go | 6 ++ service/iot/api_op_GetPolicy.go | 6 ++ service/iot/api_op_GetPolicyVersion.go | 6 ++ service/iot/api_op_GetRegistrationCode.go | 6 ++ service/iot/api_op_GetStatistics.go | 6 ++ service/iot/api_op_GetTopicRule.go | 6 ++ service/iot/api_op_GetTopicRuleDestination.go | 6 ++ service/iot/api_op_GetV2LoggingOptions.go | 6 ++ service/iot/api_op_ListActiveViolations.go | 6 ++ service/iot/api_op_ListAttachedPolicies.go | 6 ++ service/iot/api_op_ListAuditFindings.go | 6 ++ ...op_ListAuditMitigationActionsExecutions.go | 6 ++ .../api_op_ListAuditMitigationActionsTasks.go | 6 ++ service/iot/api_op_ListAuditSuppressions.go | 6 ++ service/iot/api_op_ListAuditTasks.go | 6 ++ service/iot/api_op_ListAuthorizers.go | 6 ++ service/iot/api_op_ListBillingGroups.go | 6 ++ service/iot/api_op_ListCACertificates.go | 6 ++ service/iot/api_op_ListCertificates.go | 6 ++ service/iot/api_op_ListCertificatesByCA.go | 6 ++ service/iot/api_op_ListDimensions.go | 6 ++ .../iot/api_op_ListDomainConfigurations.go | 6 ++ service/iot/api_op_ListIndices.go | 6 ++ service/iot/api_op_ListJobExecutionsForJob.go | 6 ++ .../iot/api_op_ListJobExecutionsForThing.go | 6 ++ service/iot/api_op_ListJobs.go | 6 ++ service/iot/api_op_ListMitigationActions.go | 6 ++ service/iot/api_op_ListOTAUpdates.go | 6 ++ .../iot/api_op_ListOutgoingCertificates.go | 6 ++ service/iot/api_op_ListPolicies.go | 6 ++ service/iot/api_op_ListPolicyPrincipals.go | 6 ++ service/iot/api_op_ListPolicyVersions.go | 6 ++ service/iot/api_op_ListPrincipalPolicies.go | 6 ++ service/iot/api_op_ListPrincipalThings.go | 6 ++ ...api_op_ListProvisioningTemplateVersions.go | 6 ++ .../iot/api_op_ListProvisioningTemplates.go | 6 ++ service/iot/api_op_ListRoleAliases.go | 6 ++ service/iot/api_op_ListScheduledAudits.go | 6 ++ service/iot/api_op_ListSecurityProfiles.go | 6 ++ .../api_op_ListSecurityProfilesForTarget.go | 6 ++ service/iot/api_op_ListStreams.go | 6 ++ service/iot/api_op_ListTagsForResource.go | 6 ++ service/iot/api_op_ListTargetsForPolicy.go | 6 ++ .../api_op_ListTargetsForSecurityProfile.go | 6 ++ service/iot/api_op_ListThingGroups.go | 6 ++ service/iot/api_op_ListThingGroupsForThing.go | 6 ++ service/iot/api_op_ListThingPrincipals.go | 6 ++ ...api_op_ListThingRegistrationTaskReports.go | 6 ++ .../iot/api_op_ListThingRegistrationTasks.go | 6 ++ service/iot/api_op_ListThingTypes.go | 6 ++ service/iot/api_op_ListThings.go | 6 ++ .../iot/api_op_ListThingsInBillingGroup.go | 6 ++ service/iot/api_op_ListThingsInThingGroup.go | 6 ++ .../iot/api_op_ListTopicRuleDestinations.go | 6 ++ service/iot/api_op_ListTopicRules.go | 6 ++ service/iot/api_op_ListV2LoggingLevels.go | 6 ++ service/iot/api_op_ListViolationEvents.go | 6 ++ service/iot/api_op_RegisterCACertificate.go | 6 ++ service/iot/api_op_RegisterCertificate.go | 6 ++ .../api_op_RegisterCertificateWithoutCA.go | 6 ++ service/iot/api_op_RegisterThing.go | 6 ++ .../iot/api_op_RejectCertificateTransfer.go | 6 ++ .../iot/api_op_RemoveThingFromBillingGroup.go | 6 ++ .../iot/api_op_RemoveThingFromThingGroup.go | 6 ++ service/iot/api_op_ReplaceTopicRule.go | 6 ++ service/iot/api_op_SearchIndex.go | 6 ++ service/iot/api_op_SetDefaultAuthorizer.go | 6 ++ service/iot/api_op_SetDefaultPolicyVersion.go | 6 ++ service/iot/api_op_SetLoggingOptions.go | 6 ++ service/iot/api_op_SetV2LoggingLevel.go | 6 ++ service/iot/api_op_SetV2LoggingOptions.go | 6 ++ .../api_op_StartAuditMitigationActionsTask.go | 6 ++ service/iot/api_op_StartOnDemandAuditTask.go | 6 ++ .../iot/api_op_StartThingRegistrationTask.go | 6 ++ .../iot/api_op_StopThingRegistrationTask.go | 6 ++ service/iot/api_op_TagResource.go | 6 ++ service/iot/api_op_TestAuthorization.go | 6 ++ service/iot/api_op_TestInvokeAuthorizer.go | 6 ++ service/iot/api_op_TransferCertificate.go | 6 ++ service/iot/api_op_UntagResource.go | 6 ++ .../api_op_UpdateAccountAuditConfiguration.go | 6 ++ service/iot/api_op_UpdateAuditSuppression.go | 6 ++ service/iot/api_op_UpdateAuthorizer.go | 6 ++ service/iot/api_op_UpdateBillingGroup.go | 6 ++ service/iot/api_op_UpdateCACertificate.go | 6 ++ service/iot/api_op_UpdateCertificate.go | 6 ++ service/iot/api_op_UpdateDimension.go | 6 ++ .../iot/api_op_UpdateDomainConfiguration.go | 6 ++ service/iot/api_op_UpdateDynamicThingGroup.go | 6 ++ .../iot/api_op_UpdateEventConfigurations.go | 6 ++ .../iot/api_op_UpdateIndexingConfiguration.go | 6 ++ service/iot/api_op_UpdateJob.go | 6 ++ service/iot/api_op_UpdateMitigationAction.go | 6 ++ .../iot/api_op_UpdateProvisioningTemplate.go | 6 ++ service/iot/api_op_UpdateRoleAlias.go | 6 ++ service/iot/api_op_UpdateScheduledAudit.go | 6 ++ service/iot/api_op_UpdateSecurityProfile.go | 6 ++ service/iot/api_op_UpdateStream.go | 6 ++ service/iot/api_op_UpdateThing.go | 6 ++ service/iot/api_op_UpdateThingGroup.go | 6 ++ .../iot/api_op_UpdateThingGroupsForThing.go | 6 ++ .../iot/api_op_UpdateTopicRuleDestination.go | 6 ++ ...api_op_ValidateSecurityProfileBehaviors.go | 6 ++ service/iot/go.mod | 4 +- service/iot/go.sum | 2 - service/iot1clickdevicesservice/api_client.go | 52 ++++++++-- .../api_op_ClaimDevicesByClaimCode.go | 6 ++ .../api_op_DescribeDevice.go | 6 ++ .../api_op_FinalizeDeviceClaim.go | 6 ++ .../api_op_GetDeviceMethods.go | 6 ++ .../api_op_InitiateDeviceClaim.go | 6 ++ .../api_op_InvokeDeviceMethod.go | 6 ++ .../api_op_ListDeviceEvents.go | 6 ++ .../api_op_ListDevices.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_TagResource.go | 6 ++ .../api_op_UnclaimDevice.go | 6 ++ .../api_op_UntagResource.go | 6 ++ .../api_op_UpdateDeviceState.go | 6 ++ service/iot1clickdevicesservice/go.mod | 4 +- service/iot1clickdevicesservice/go.sum | 2 - service/iot1clickprojects/api_client.go | 52 ++++++++-- .../api_op_AssociateDeviceWithPlacement.go | 6 ++ .../api_op_CreatePlacement.go | 6 ++ .../iot1clickprojects/api_op_CreateProject.go | 6 ++ .../api_op_DeletePlacement.go | 6 ++ .../iot1clickprojects/api_op_DeleteProject.go | 6 ++ .../api_op_DescribePlacement.go | 6 ++ .../api_op_DescribeProject.go | 6 ++ .../api_op_DisassociateDeviceFromPlacement.go | 6 ++ .../api_op_GetDevicesInPlacement.go | 6 ++ .../api_op_ListPlacements.go | 6 ++ .../iot1clickprojects/api_op_ListProjects.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../iot1clickprojects/api_op_TagResource.go | 6 ++ .../iot1clickprojects/api_op_UntagResource.go | 6 ++ .../api_op_UpdatePlacement.go | 6 ++ .../iot1clickprojects/api_op_UpdateProject.go | 6 ++ service/iot1clickprojects/go.mod | 4 +- service/iot1clickprojects/go.sum | 2 - service/iotanalytics/api_client.go | 52 ++++++++-- .../iotanalytics/api_op_BatchPutMessage.go | 6 ++ .../api_op_CancelPipelineReprocessing.go | 6 ++ service/iotanalytics/api_op_CreateChannel.go | 6 ++ service/iotanalytics/api_op_CreateDataset.go | 6 ++ .../api_op_CreateDatasetContent.go | 6 ++ .../iotanalytics/api_op_CreateDatastore.go | 6 ++ service/iotanalytics/api_op_CreatePipeline.go | 6 ++ service/iotanalytics/api_op_DeleteChannel.go | 6 ++ service/iotanalytics/api_op_DeleteDataset.go | 6 ++ .../api_op_DeleteDatasetContent.go | 6 ++ .../iotanalytics/api_op_DeleteDatastore.go | 6 ++ service/iotanalytics/api_op_DeletePipeline.go | 6 ++ .../iotanalytics/api_op_DescribeChannel.go | 6 ++ .../iotanalytics/api_op_DescribeDataset.go | 6 ++ .../iotanalytics/api_op_DescribeDatastore.go | 6 ++ .../api_op_DescribeLoggingOptions.go | 6 ++ .../iotanalytics/api_op_DescribePipeline.go | 6 ++ .../iotanalytics/api_op_GetDatasetContent.go | 6 ++ service/iotanalytics/api_op_ListChannels.go | 6 ++ .../api_op_ListDatasetContents.go | 6 ++ service/iotanalytics/api_op_ListDatasets.go | 6 ++ service/iotanalytics/api_op_ListDatastores.go | 6 ++ service/iotanalytics/api_op_ListPipelines.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../iotanalytics/api_op_PutLoggingOptions.go | 6 ++ .../api_op_RunPipelineActivity.go | 6 ++ .../iotanalytics/api_op_SampleChannelData.go | 6 ++ .../api_op_StartPipelineReprocessing.go | 6 ++ service/iotanalytics/api_op_TagResource.go | 6 ++ service/iotanalytics/api_op_UntagResource.go | 6 ++ service/iotanalytics/api_op_UpdateChannel.go | 6 ++ service/iotanalytics/api_op_UpdateDataset.go | 6 ++ .../iotanalytics/api_op_UpdateDatastore.go | 6 ++ service/iotanalytics/api_op_UpdatePipeline.go | 6 ++ service/iotanalytics/go.mod | 4 +- service/iotanalytics/go.sum | 2 - service/iotdataplane/api_client.go | 52 ++++++++-- .../iotdataplane/api_op_DeleteThingShadow.go | 6 ++ service/iotdataplane/api_op_GetThingShadow.go | 6 ++ .../api_op_ListNamedShadowsForThing.go | 6 ++ service/iotdataplane/api_op_Publish.go | 6 ++ .../iotdataplane/api_op_UpdateThingShadow.go | 6 ++ service/iotdataplane/go.mod | 4 +- service/iotdataplane/go.sum | 2 - service/iotevents/api_client.go | 52 ++++++++-- .../iotevents/api_op_CreateDetectorModel.go | 6 ++ service/iotevents/api_op_CreateInput.go | 6 ++ .../iotevents/api_op_DeleteDetectorModel.go | 6 ++ service/iotevents/api_op_DeleteInput.go | 6 ++ .../iotevents/api_op_DescribeDetectorModel.go | 6 ++ service/iotevents/api_op_DescribeInput.go | 6 ++ .../api_op_DescribeLoggingOptions.go | 6 ++ .../api_op_ListDetectorModelVersions.go | 6 ++ .../iotevents/api_op_ListDetectorModels.go | 6 ++ service/iotevents/api_op_ListInputs.go | 6 ++ .../iotevents/api_op_ListTagsForResource.go | 6 ++ service/iotevents/api_op_PutLoggingOptions.go | 6 ++ service/iotevents/api_op_TagResource.go | 6 ++ service/iotevents/api_op_UntagResource.go | 6 ++ .../iotevents/api_op_UpdateDetectorModel.go | 6 ++ service/iotevents/api_op_UpdateInput.go | 6 ++ service/iotevents/go.mod | 4 +- service/iotevents/go.sum | 2 - service/ioteventsdata/api_client.go | 52 ++++++++-- .../ioteventsdata/api_op_BatchPutMessage.go | 6 ++ .../api_op_BatchUpdateDetector.go | 6 ++ .../ioteventsdata/api_op_DescribeDetector.go | 6 ++ service/ioteventsdata/api_op_ListDetectors.go | 6 ++ service/ioteventsdata/go.mod | 4 +- service/ioteventsdata/go.sum | 2 - service/iotjobsdataplane/api_client.go | 52 ++++++++-- .../api_op_DescribeJobExecution.go | 6 ++ .../api_op_GetPendingJobExecutions.go | 6 ++ .../api_op_StartNextPendingJobExecution.go | 6 ++ .../api_op_UpdateJobExecution.go | 6 ++ service/iotjobsdataplane/go.mod | 4 +- service/iotjobsdataplane/go.sum | 2 - service/iotsecuretunneling/api_client.go | 52 ++++++++-- .../iotsecuretunneling/api_op_CloseTunnel.go | 6 ++ .../api_op_DescribeTunnel.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../iotsecuretunneling/api_op_ListTunnels.go | 6 ++ .../iotsecuretunneling/api_op_OpenTunnel.go | 6 ++ .../iotsecuretunneling/api_op_TagResource.go | 6 ++ .../api_op_UntagResource.go | 6 ++ service/iotsecuretunneling/go.mod | 4 +- service/iotsecuretunneling/go.sum | 2 - service/iotsitewise/api_client.go | 52 ++++++++-- service/iotsitewise/api_op_AssociateAssets.go | 6 ++ .../api_op_BatchAssociateProjectAssets.go | 6 ++ .../api_op_BatchDisassociateProjectAssets.go | 6 ++ .../api_op_BatchPutAssetPropertyValue.go | 6 ++ .../iotsitewise/api_op_CreateAccessPolicy.go | 6 ++ service/iotsitewise/api_op_CreateAsset.go | 6 ++ .../iotsitewise/api_op_CreateAssetModel.go | 6 ++ service/iotsitewise/api_op_CreateDashboard.go | 6 ++ service/iotsitewise/api_op_CreateGateway.go | 6 ++ service/iotsitewise/api_op_CreatePortal.go | 6 ++ .../api_op_CreatePresignedPortalUrl.go | 6 ++ service/iotsitewise/api_op_CreateProject.go | 6 ++ .../iotsitewise/api_op_DeleteAccessPolicy.go | 6 ++ service/iotsitewise/api_op_DeleteAsset.go | 6 ++ .../iotsitewise/api_op_DeleteAssetModel.go | 6 ++ service/iotsitewise/api_op_DeleteDashboard.go | 6 ++ service/iotsitewise/api_op_DeleteGateway.go | 6 ++ service/iotsitewise/api_op_DeletePortal.go | 6 ++ service/iotsitewise/api_op_DeleteProject.go | 6 ++ .../api_op_DescribeAccessPolicy.go | 6 ++ service/iotsitewise/api_op_DescribeAsset.go | 6 ++ .../iotsitewise/api_op_DescribeAssetModel.go | 6 ++ .../api_op_DescribeAssetProperty.go | 6 ++ .../iotsitewise/api_op_DescribeDashboard.go | 6 ++ service/iotsitewise/api_op_DescribeGateway.go | 6 ++ ..._DescribeGatewayCapabilityConfiguration.go | 6 ++ .../api_op_DescribeLoggingOptions.go | 6 ++ service/iotsitewise/api_op_DescribePortal.go | 6 ++ service/iotsitewise/api_op_DescribeProject.go | 6 ++ .../iotsitewise/api_op_DisassociateAssets.go | 6 ++ .../api_op_GetAssetPropertyAggregates.go | 6 ++ .../api_op_GetAssetPropertyValue.go | 6 ++ .../api_op_GetAssetPropertyValueHistory.go | 6 ++ .../iotsitewise/api_op_ListAccessPolicies.go | 6 ++ service/iotsitewise/api_op_ListAssetModels.go | 6 ++ service/iotsitewise/api_op_ListAssets.go | 6 ++ .../api_op_ListAssociatedAssets.go | 6 ++ service/iotsitewise/api_op_ListDashboards.go | 6 ++ service/iotsitewise/api_op_ListGateways.go | 6 ++ service/iotsitewise/api_op_ListPortals.go | 6 ++ .../iotsitewise/api_op_ListProjectAssets.go | 6 ++ service/iotsitewise/api_op_ListProjects.go | 6 ++ .../iotsitewise/api_op_ListTagsForResource.go | 6 ++ .../iotsitewise/api_op_PutLoggingOptions.go | 6 ++ service/iotsitewise/api_op_TagResource.go | 6 ++ service/iotsitewise/api_op_UntagResource.go | 6 ++ .../iotsitewise/api_op_UpdateAccessPolicy.go | 6 ++ service/iotsitewise/api_op_UpdateAsset.go | 6 ++ .../iotsitewise/api_op_UpdateAssetModel.go | 6 ++ .../iotsitewise/api_op_UpdateAssetProperty.go | 6 ++ service/iotsitewise/api_op_UpdateDashboard.go | 6 ++ service/iotsitewise/api_op_UpdateGateway.go | 6 ++ ...op_UpdateGatewayCapabilityConfiguration.go | 6 ++ service/iotsitewise/api_op_UpdatePortal.go | 6 ++ service/iotsitewise/api_op_UpdateProject.go | 6 ++ service/iotsitewise/go.mod | 4 +- service/iotsitewise/go.sum | 2 - service/iotthingsgraph/api_client.go | 52 ++++++++-- .../api_op_AssociateEntityToThing.go | 6 ++ .../api_op_CreateFlowTemplate.go | 6 ++ .../api_op_CreateSystemInstance.go | 6 ++ .../api_op_CreateSystemTemplate.go | 6 ++ .../api_op_DeleteFlowTemplate.go | 6 ++ .../iotthingsgraph/api_op_DeleteNamespace.go | 6 ++ .../api_op_DeleteSystemInstance.go | 6 ++ .../api_op_DeleteSystemTemplate.go | 6 ++ .../api_op_DeploySystemInstance.go | 6 ++ .../api_op_DeprecateFlowTemplate.go | 6 ++ .../api_op_DeprecateSystemTemplate.go | 6 ++ .../api_op_DescribeNamespace.go | 6 ++ .../api_op_DissociateEntityFromThing.go | 6 ++ service/iotthingsgraph/api_op_GetEntities.go | 6 ++ .../iotthingsgraph/api_op_GetFlowTemplate.go | 6 ++ .../api_op_GetFlowTemplateRevisions.go | 6 ++ .../api_op_GetNamespaceDeletionStatus.go | 6 ++ .../api_op_GetSystemInstance.go | 6 ++ .../api_op_GetSystemTemplate.go | 6 ++ .../api_op_GetSystemTemplateRevisions.go | 6 ++ .../iotthingsgraph/api_op_GetUploadStatus.go | 6 ++ .../api_op_ListFlowExecutionMessages.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../iotthingsgraph/api_op_SearchEntities.go | 6 ++ .../api_op_SearchFlowExecutions.go | 6 ++ .../api_op_SearchFlowTemplates.go | 6 ++ .../api_op_SearchSystemInstances.go | 6 ++ .../api_op_SearchSystemTemplates.go | 6 ++ service/iotthingsgraph/api_op_SearchThings.go | 6 ++ service/iotthingsgraph/api_op_TagResource.go | 6 ++ .../api_op_UndeploySystemInstance.go | 6 ++ .../iotthingsgraph/api_op_UntagResource.go | 6 ++ .../api_op_UpdateFlowTemplate.go | 6 ++ .../api_op_UpdateSystemTemplate.go | 6 ++ .../api_op_UploadEntityDefinitions.go | 6 ++ service/iotthingsgraph/go.mod | 4 +- service/iotthingsgraph/go.sum | 2 - service/ivs/api_client.go | 52 ++++++++-- service/ivs/api_op_BatchGetChannel.go | 6 ++ service/ivs/api_op_BatchGetStreamKey.go | 6 ++ service/ivs/api_op_CreateChannel.go | 6 ++ service/ivs/api_op_CreateStreamKey.go | 6 ++ service/ivs/api_op_DeleteChannel.go | 6 ++ service/ivs/api_op_DeletePlaybackKeyPair.go | 6 ++ service/ivs/api_op_DeleteStreamKey.go | 6 ++ service/ivs/api_op_GetChannel.go | 6 ++ service/ivs/api_op_GetPlaybackKeyPair.go | 6 ++ service/ivs/api_op_GetStream.go | 6 ++ service/ivs/api_op_GetStreamKey.go | 6 ++ service/ivs/api_op_ImportPlaybackKeyPair.go | 6 ++ service/ivs/api_op_ListChannels.go | 6 ++ service/ivs/api_op_ListPlaybackKeyPairs.go | 6 ++ service/ivs/api_op_ListStreamKeys.go | 6 ++ service/ivs/api_op_ListStreams.go | 6 ++ service/ivs/api_op_ListTagsForResource.go | 6 ++ service/ivs/api_op_PutMetadata.go | 6 ++ service/ivs/api_op_StopStream.go | 6 ++ service/ivs/api_op_TagResource.go | 6 ++ service/ivs/api_op_UntagResource.go | 6 ++ service/ivs/api_op_UpdateChannel.go | 6 ++ service/ivs/go.mod | 4 +- service/ivs/go.sum | 2 - service/kafka/api_client.go | 52 ++++++++-- .../kafka/api_op_BatchAssociateScramSecret.go | 6 ++ .../api_op_BatchDisassociateScramSecret.go | 6 ++ service/kafka/api_op_CreateCluster.go | 6 ++ service/kafka/api_op_CreateConfiguration.go | 6 ++ service/kafka/api_op_DeleteCluster.go | 6 ++ service/kafka/api_op_DeleteConfiguration.go | 6 ++ service/kafka/api_op_DescribeCluster.go | 6 ++ .../kafka/api_op_DescribeClusterOperation.go | 6 ++ service/kafka/api_op_DescribeConfiguration.go | 6 ++ .../api_op_DescribeConfigurationRevision.go | 6 ++ service/kafka/api_op_GetBootstrapBrokers.go | 6 ++ .../api_op_GetCompatibleKafkaVersions.go | 6 ++ service/kafka/api_op_ListClusterOperations.go | 6 ++ service/kafka/api_op_ListClusters.go | 6 ++ .../api_op_ListConfigurationRevisions.go | 6 ++ service/kafka/api_op_ListConfigurations.go | 6 ++ service/kafka/api_op_ListKafkaVersions.go | 6 ++ service/kafka/api_op_ListNodes.go | 6 ++ service/kafka/api_op_ListScramSecrets.go | 6 ++ service/kafka/api_op_ListTagsForResource.go | 6 ++ service/kafka/api_op_RebootBroker.go | 6 ++ service/kafka/api_op_TagResource.go | 6 ++ service/kafka/api_op_UntagResource.go | 6 ++ service/kafka/api_op_UpdateBrokerCount.go | 6 ++ service/kafka/api_op_UpdateBrokerStorage.go | 6 ++ .../api_op_UpdateClusterConfiguration.go | 6 ++ .../kafka/api_op_UpdateClusterKafkaVersion.go | 6 ++ service/kafka/api_op_UpdateConfiguration.go | 6 ++ service/kafka/api_op_UpdateMonitoring.go | 6 ++ service/kafka/go.mod | 4 +- service/kafka/go.sum | 2 - service/kendra/api_client.go | 52 ++++++++-- service/kendra/api_op_BatchDeleteDocument.go | 6 ++ service/kendra/api_op_BatchPutDocument.go | 6 ++ service/kendra/api_op_CreateDataSource.go | 6 ++ service/kendra/api_op_CreateFaq.go | 6 ++ service/kendra/api_op_CreateIndex.go | 6 ++ service/kendra/api_op_DeleteDataSource.go | 6 ++ service/kendra/api_op_DeleteFaq.go | 6 ++ service/kendra/api_op_DeleteIndex.go | 6 ++ service/kendra/api_op_DescribeDataSource.go | 6 ++ service/kendra/api_op_DescribeFaq.go | 6 ++ service/kendra/api_op_DescribeIndex.go | 6 ++ .../kendra/api_op_ListDataSourceSyncJobs.go | 6 ++ service/kendra/api_op_ListDataSources.go | 6 ++ service/kendra/api_op_ListFaqs.go | 6 ++ service/kendra/api_op_ListIndices.go | 6 ++ service/kendra/api_op_ListTagsForResource.go | 6 ++ service/kendra/api_op_Query.go | 6 ++ .../kendra/api_op_StartDataSourceSyncJob.go | 6 ++ .../kendra/api_op_StopDataSourceSyncJob.go | 6 ++ service/kendra/api_op_SubmitFeedback.go | 6 ++ service/kendra/api_op_TagResource.go | 6 ++ service/kendra/api_op_UntagResource.go | 6 ++ service/kendra/api_op_UpdateDataSource.go | 6 ++ service/kendra/api_op_UpdateIndex.go | 6 ++ service/kendra/go.mod | 4 +- service/kendra/go.sum | 2 - service/kinesis/api_client.go | 52 ++++++++-- service/kinesis/api_op_AddTagsToStream.go | 6 ++ service/kinesis/api_op_CreateStream.go | 6 ++ .../api_op_DecreaseStreamRetentionPeriod.go | 6 ++ service/kinesis/api_op_DeleteStream.go | 6 ++ .../api_op_DeregisterStreamConsumer.go | 6 ++ service/kinesis/api_op_DescribeLimits.go | 6 ++ service/kinesis/api_op_DescribeStream.go | 6 ++ .../kinesis/api_op_DescribeStreamConsumer.go | 6 ++ .../kinesis/api_op_DescribeStreamSummary.go | 6 ++ .../api_op_DisableEnhancedMonitoring.go | 6 ++ .../api_op_EnableEnhancedMonitoring.go | 6 ++ service/kinesis/api_op_GetRecords.go | 6 ++ service/kinesis/api_op_GetShardIterator.go | 6 ++ .../api_op_IncreaseStreamRetentionPeriod.go | 6 ++ service/kinesis/api_op_ListShards.go | 6 ++ service/kinesis/api_op_ListStreamConsumers.go | 6 ++ service/kinesis/api_op_ListStreams.go | 6 ++ service/kinesis/api_op_ListTagsForStream.go | 6 ++ service/kinesis/api_op_MergeShards.go | 6 ++ service/kinesis/api_op_PutRecord.go | 6 ++ service/kinesis/api_op_PutRecords.go | 6 ++ .../kinesis/api_op_RegisterStreamConsumer.go | 6 ++ .../kinesis/api_op_RemoveTagsFromStream.go | 6 ++ service/kinesis/api_op_SplitShard.go | 6 ++ .../kinesis/api_op_StartStreamEncryption.go | 6 ++ .../kinesis/api_op_StopStreamEncryption.go | 6 ++ service/kinesis/api_op_UpdateShardCount.go | 6 ++ service/kinesis/go.mod | 4 +- service/kinesis/go.sum | 2 - service/kinesisanalytics/api_client.go | 52 ++++++++-- ...p_AddApplicationCloudWatchLoggingOption.go | 6 ++ .../api_op_AddApplicationInput.go | 6 ++ ...ApplicationInputProcessingConfiguration.go | 6 ++ .../api_op_AddApplicationOutput.go | 6 ++ ...pi_op_AddApplicationReferenceDataSource.go | 6 ++ .../api_op_CreateApplication.go | 6 ++ .../api_op_DeleteApplication.go | 6 ++ ...eleteApplicationCloudWatchLoggingOption.go | 6 ++ ...ApplicationInputProcessingConfiguration.go | 6 ++ .../api_op_DeleteApplicationOutput.go | 6 ++ ...op_DeleteApplicationReferenceDataSource.go | 6 ++ .../api_op_DescribeApplication.go | 6 ++ .../api_op_DiscoverInputSchema.go | 6 ++ .../api_op_ListApplications.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_StartApplication.go | 6 ++ .../api_op_StopApplication.go | 6 ++ .../kinesisanalytics/api_op_TagResource.go | 6 ++ .../kinesisanalytics/api_op_UntagResource.go | 6 ++ .../api_op_UpdateApplication.go | 6 ++ service/kinesisanalytics/go.mod | 4 +- service/kinesisanalytics/go.sum | 2 - service/kinesisanalyticsv2/api_client.go | 52 ++++++++-- ...p_AddApplicationCloudWatchLoggingOption.go | 6 ++ .../api_op_AddApplicationInput.go | 6 ++ ...ApplicationInputProcessingConfiguration.go | 6 ++ .../api_op_AddApplicationOutput.go | 6 ++ ...pi_op_AddApplicationReferenceDataSource.go | 6 ++ .../api_op_AddApplicationVpcConfiguration.go | 6 ++ .../api_op_CreateApplication.go | 6 ++ .../api_op_CreateApplicationSnapshot.go | 6 ++ .../api_op_DeleteApplication.go | 6 ++ ...eleteApplicationCloudWatchLoggingOption.go | 6 ++ ...ApplicationInputProcessingConfiguration.go | 6 ++ .../api_op_DeleteApplicationOutput.go | 6 ++ ...op_DeleteApplicationReferenceDataSource.go | 6 ++ .../api_op_DeleteApplicationSnapshot.go | 6 ++ ...pi_op_DeleteApplicationVpcConfiguration.go | 6 ++ .../api_op_DescribeApplication.go | 6 ++ .../api_op_DescribeApplicationSnapshot.go | 6 ++ .../api_op_DiscoverInputSchema.go | 6 ++ .../api_op_ListApplicationSnapshots.go | 6 ++ .../api_op_ListApplications.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_StartApplication.go | 6 ++ .../api_op_StopApplication.go | 6 ++ .../kinesisanalyticsv2/api_op_TagResource.go | 6 ++ .../api_op_UntagResource.go | 6 ++ .../api_op_UpdateApplication.go | 6 ++ service/kinesisanalyticsv2/go.mod | 4 +- service/kinesisanalyticsv2/go.sum | 2 - service/kinesisvideo/api_client.go | 52 ++++++++-- .../api_op_CreateSignalingChannel.go | 6 ++ service/kinesisvideo/api_op_CreateStream.go | 6 ++ .../api_op_DeleteSignalingChannel.go | 6 ++ service/kinesisvideo/api_op_DeleteStream.go | 6 ++ .../api_op_DescribeSignalingChannel.go | 6 ++ service/kinesisvideo/api_op_DescribeStream.go | 6 ++ .../kinesisvideo/api_op_GetDataEndpoint.go | 6 ++ .../api_op_GetSignalingChannelEndpoint.go | 6 ++ .../api_op_ListSignalingChannels.go | 6 ++ service/kinesisvideo/api_op_ListStreams.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../kinesisvideo/api_op_ListTagsForStream.go | 6 ++ service/kinesisvideo/api_op_TagResource.go | 6 ++ service/kinesisvideo/api_op_TagStream.go | 6 ++ service/kinesisvideo/api_op_UntagResource.go | 6 ++ service/kinesisvideo/api_op_UntagStream.go | 6 ++ .../api_op_UpdateDataRetention.go | 6 ++ .../api_op_UpdateSignalingChannel.go | 6 ++ service/kinesisvideo/api_op_UpdateStream.go | 6 ++ service/kinesisvideo/go.mod | 4 +- service/kinesisvideo/go.sum | 2 - .../kinesisvideoarchivedmedia/api_client.go | 52 ++++++++-- .../api_op_GetClip.go | 6 ++ .../api_op_GetDASHStreamingSessionURL.go | 6 ++ .../api_op_GetHLSStreamingSessionURL.go | 6 ++ .../api_op_GetMediaForFragmentList.go | 6 ++ .../api_op_ListFragments.go | 6 ++ service/kinesisvideoarchivedmedia/go.mod | 4 +- service/kinesisvideoarchivedmedia/go.sum | 2 - service/kinesisvideomedia/api_client.go | 52 ++++++++-- service/kinesisvideomedia/api_op_GetMedia.go | 6 ++ service/kinesisvideomedia/go.mod | 4 +- service/kinesisvideomedia/go.sum | 2 - service/kinesisvideosignaling/api_client.go | 52 ++++++++-- .../api_op_GetIceServerConfig.go | 6 ++ .../api_op_SendAlexaOfferToMaster.go | 6 ++ service/kinesisvideosignaling/go.mod | 4 +- service/kinesisvideosignaling/go.sum | 2 - service/kms/api_client.go | 52 ++++++++-- service/kms/api_op_CancelKeyDeletion.go | 6 ++ service/kms/api_op_ConnectCustomKeyStore.go | 6 ++ service/kms/api_op_CreateAlias.go | 6 ++ service/kms/api_op_CreateCustomKeyStore.go | 6 ++ service/kms/api_op_CreateGrant.go | 6 ++ service/kms/api_op_CreateKey.go | 6 ++ service/kms/api_op_Decrypt.go | 6 ++ service/kms/api_op_DeleteAlias.go | 6 ++ service/kms/api_op_DeleteCustomKeyStore.go | 6 ++ .../kms/api_op_DeleteImportedKeyMaterial.go | 6 ++ service/kms/api_op_DescribeCustomKeyStores.go | 6 ++ service/kms/api_op_DescribeKey.go | 6 ++ service/kms/api_op_DisableKey.go | 6 ++ service/kms/api_op_DisableKeyRotation.go | 6 ++ .../kms/api_op_DisconnectCustomKeyStore.go | 6 ++ service/kms/api_op_EnableKey.go | 6 ++ service/kms/api_op_EnableKeyRotation.go | 6 ++ service/kms/api_op_Encrypt.go | 6 ++ service/kms/api_op_GenerateDataKey.go | 6 ++ service/kms/api_op_GenerateDataKeyPair.go | 6 ++ ..._op_GenerateDataKeyPairWithoutPlaintext.go | 6 ++ .../api_op_GenerateDataKeyWithoutPlaintext.go | 6 ++ service/kms/api_op_GenerateRandom.go | 6 ++ service/kms/api_op_GetKeyPolicy.go | 6 ++ service/kms/api_op_GetKeyRotationStatus.go | 6 ++ service/kms/api_op_GetParametersForImport.go | 6 ++ service/kms/api_op_GetPublicKey.go | 6 ++ service/kms/api_op_ImportKeyMaterial.go | 6 ++ service/kms/api_op_ListAliases.go | 6 ++ service/kms/api_op_ListGrants.go | 6 ++ service/kms/api_op_ListKeyPolicies.go | 6 ++ service/kms/api_op_ListKeys.go | 6 ++ service/kms/api_op_ListResourceTags.go | 6 ++ service/kms/api_op_ListRetirableGrants.go | 6 ++ service/kms/api_op_PutKeyPolicy.go | 6 ++ service/kms/api_op_ReEncrypt.go | 6 ++ service/kms/api_op_RetireGrant.go | 6 ++ service/kms/api_op_RevokeGrant.go | 6 ++ service/kms/api_op_ScheduleKeyDeletion.go | 6 ++ service/kms/api_op_Sign.go | 6 ++ service/kms/api_op_TagResource.go | 6 ++ service/kms/api_op_UntagResource.go | 6 ++ service/kms/api_op_UpdateAlias.go | 6 ++ service/kms/api_op_UpdateCustomKeyStore.go | 6 ++ service/kms/api_op_UpdateKeyDescription.go | 6 ++ service/kms/api_op_Verify.go | 6 ++ service/kms/go.mod | 4 +- service/kms/go.sum | 2 - service/lakeformation/api_client.go | 52 ++++++++-- .../api_op_BatchGrantPermissions.go | 6 ++ .../api_op_BatchRevokePermissions.go | 6 ++ .../api_op_DeregisterResource.go | 6 ++ .../lakeformation/api_op_DescribeResource.go | 6 ++ .../api_op_GetDataLakeSettings.go | 6 ++ .../api_op_GetEffectivePermissionsForPath.go | 6 ++ .../lakeformation/api_op_GrantPermissions.go | 6 ++ .../lakeformation/api_op_ListPermissions.go | 6 ++ service/lakeformation/api_op_ListResources.go | 6 ++ .../api_op_PutDataLakeSettings.go | 6 ++ .../lakeformation/api_op_RegisterResource.go | 6 ++ .../lakeformation/api_op_RevokePermissions.go | 6 ++ .../lakeformation/api_op_UpdateResource.go | 6 ++ service/lakeformation/go.mod | 4 +- service/lakeformation/go.sum | 2 - service/lambda/api_client.go | 52 ++++++++-- .../api_op_AddLayerVersionPermission.go | 6 ++ service/lambda/api_op_AddPermission.go | 6 ++ service/lambda/api_op_CreateAlias.go | 6 ++ .../lambda/api_op_CreateEventSourceMapping.go | 6 ++ service/lambda/api_op_CreateFunction.go | 6 ++ service/lambda/api_op_DeleteAlias.go | 6 ++ .../lambda/api_op_DeleteEventSourceMapping.go | 6 ++ service/lambda/api_op_DeleteFunction.go | 6 ++ .../api_op_DeleteFunctionConcurrency.go | 6 ++ .../api_op_DeleteFunctionEventInvokeConfig.go | 6 ++ service/lambda/api_op_DeleteLayerVersion.go | 6 ++ ...i_op_DeleteProvisionedConcurrencyConfig.go | 6 ++ service/lambda/api_op_GetAccountSettings.go | 6 ++ service/lambda/api_op_GetAlias.go | 6 ++ .../lambda/api_op_GetEventSourceMapping.go | 6 ++ service/lambda/api_op_GetFunction.go | 6 ++ .../lambda/api_op_GetFunctionConcurrency.go | 6 ++ .../lambda/api_op_GetFunctionConfiguration.go | 6 ++ .../api_op_GetFunctionEventInvokeConfig.go | 6 ++ service/lambda/api_op_GetLayerVersion.go | 6 ++ service/lambda/api_op_GetLayerVersionByArn.go | 6 ++ .../lambda/api_op_GetLayerVersionPolicy.go | 6 ++ service/lambda/api_op_GetPolicy.go | 6 ++ .../api_op_GetProvisionedConcurrencyConfig.go | 6 ++ service/lambda/api_op_Invoke.go | 6 ++ service/lambda/api_op_InvokeAsync.go | 6 ++ service/lambda/api_op_ListAliases.go | 6 ++ .../lambda/api_op_ListEventSourceMappings.go | 6 ++ .../api_op_ListFunctionEventInvokeConfigs.go | 6 ++ service/lambda/api_op_ListFunctions.go | 6 ++ service/lambda/api_op_ListLayerVersions.go | 6 ++ service/lambda/api_op_ListLayers.go | 6 ++ ...pi_op_ListProvisionedConcurrencyConfigs.go | 6 ++ service/lambda/api_op_ListTags.go | 6 ++ .../lambda/api_op_ListVersionsByFunction.go | 6 ++ service/lambda/api_op_PublishLayerVersion.go | 6 ++ service/lambda/api_op_PublishVersion.go | 6 ++ .../lambda/api_op_PutFunctionConcurrency.go | 6 ++ .../api_op_PutFunctionEventInvokeConfig.go | 6 ++ .../api_op_PutProvisionedConcurrencyConfig.go | 6 ++ .../api_op_RemoveLayerVersionPermission.go | 6 ++ service/lambda/api_op_RemovePermission.go | 6 ++ service/lambda/api_op_TagResource.go | 6 ++ service/lambda/api_op_UntagResource.go | 6 ++ service/lambda/api_op_UpdateAlias.go | 6 ++ .../lambda/api_op_UpdateEventSourceMapping.go | 6 ++ service/lambda/api_op_UpdateFunctionCode.go | 6 ++ .../api_op_UpdateFunctionConfiguration.go | 6 ++ .../api_op_UpdateFunctionEventInvokeConfig.go | 6 ++ service/lambda/go.mod | 4 +- service/lambda/go.sum | 2 - service/lexmodelbuildingservice/api_client.go | 52 ++++++++-- .../api_op_CreateBotVersion.go | 6 ++ .../api_op_CreateIntentVersion.go | 6 ++ .../api_op_CreateSlotTypeVersion.go | 6 ++ .../api_op_DeleteBot.go | 6 ++ .../api_op_DeleteBotAlias.go | 6 ++ .../api_op_DeleteBotChannelAssociation.go | 6 ++ .../api_op_DeleteBotVersion.go | 6 ++ .../api_op_DeleteIntent.go | 6 ++ .../api_op_DeleteIntentVersion.go | 6 ++ .../api_op_DeleteSlotType.go | 6 ++ .../api_op_DeleteSlotTypeVersion.go | 6 ++ .../api_op_DeleteUtterances.go | 6 ++ .../lexmodelbuildingservice/api_op_GetBot.go | 6 ++ .../api_op_GetBotAlias.go | 6 ++ .../api_op_GetBotAliases.go | 6 ++ .../api_op_GetBotChannelAssociation.go | 6 ++ .../api_op_GetBotChannelAssociations.go | 6 ++ .../api_op_GetBotVersions.go | 6 ++ .../lexmodelbuildingservice/api_op_GetBots.go | 6 ++ .../api_op_GetBuiltinIntent.go | 6 ++ .../api_op_GetBuiltinIntents.go | 6 ++ .../api_op_GetBuiltinSlotTypes.go | 6 ++ .../api_op_GetExport.go | 6 ++ .../api_op_GetImport.go | 6 ++ .../api_op_GetIntent.go | 6 ++ .../api_op_GetIntentVersions.go | 6 ++ .../api_op_GetIntents.go | 6 ++ .../api_op_GetSlotType.go | 6 ++ .../api_op_GetSlotTypeVersions.go | 6 ++ .../api_op_GetSlotTypes.go | 6 ++ .../api_op_GetUtterancesView.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../lexmodelbuildingservice/api_op_PutBot.go | 6 ++ .../api_op_PutBotAlias.go | 6 ++ .../api_op_PutIntent.go | 6 ++ .../api_op_PutSlotType.go | 6 ++ .../api_op_StartImport.go | 6 ++ .../api_op_TagResource.go | 6 ++ .../api_op_UntagResource.go | 6 ++ service/lexmodelbuildingservice/go.mod | 4 +- service/lexmodelbuildingservice/go.sum | 2 - service/lexruntimeservice/api_client.go | 52 ++++++++-- .../lexruntimeservice/api_op_DeleteSession.go | 6 ++ .../lexruntimeservice/api_op_GetSession.go | 6 ++ .../lexruntimeservice/api_op_PostContent.go | 6 ++ service/lexruntimeservice/api_op_PostText.go | 6 ++ .../lexruntimeservice/api_op_PutSession.go | 6 ++ service/lexruntimeservice/go.mod | 4 +- service/lexruntimeservice/go.sum | 2 - service/licensemanager/api_client.go | 52 ++++++++-- .../api_op_CreateLicenseConfiguration.go | 6 ++ .../api_op_DeleteLicenseConfiguration.go | 6 ++ .../api_op_GetLicenseConfiguration.go | 6 ++ .../api_op_GetServiceSettings.go | 6 ++ ...ListAssociationsForLicenseConfiguration.go | 6 ++ ...iluresForLicenseConfigurationOperations.go | 6 ++ .../api_op_ListLicenseConfigurations.go | 6 ++ ...op_ListLicenseSpecificationsForResource.go | 6 ++ .../api_op_ListResourceInventory.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ ...api_op_ListUsageForLicenseConfiguration.go | 6 ++ service/licensemanager/api_op_TagResource.go | 6 ++ .../licensemanager/api_op_UntagResource.go | 6 ++ .../api_op_UpdateLicenseConfiguration.go | 6 ++ ..._UpdateLicenseSpecificationsForResource.go | 6 ++ .../api_op_UpdateServiceSettings.go | 6 ++ service/licensemanager/go.mod | 4 +- service/licensemanager/go.sum | 2 - service/lightsail/api_client.go | 52 ++++++++-- service/lightsail/api_op_AllocateStaticIp.go | 6 ++ .../api_op_AttachCertificateToDistribution.go | 6 ++ service/lightsail/api_op_AttachDisk.go | 6 ++ .../api_op_AttachInstancesToLoadBalancer.go | 6 ++ ...api_op_AttachLoadBalancerTlsCertificate.go | 6 ++ service/lightsail/api_op_AttachStaticIp.go | 6 ++ .../api_op_CloseInstancePublicPorts.go | 6 ++ service/lightsail/api_op_CopySnapshot.go | 6 ++ service/lightsail/api_op_CreateCertificate.go | 6 ++ .../api_op_CreateCloudFormationStack.go | 6 ++ .../lightsail/api_op_CreateContactMethod.go | 6 ++ service/lightsail/api_op_CreateDisk.go | 6 ++ .../api_op_CreateDiskFromSnapshot.go | 6 ++ .../lightsail/api_op_CreateDiskSnapshot.go | 6 ++ .../lightsail/api_op_CreateDistribution.go | 6 ++ service/lightsail/api_op_CreateDomain.go | 6 ++ service/lightsail/api_op_CreateDomainEntry.go | 6 ++ .../api_op_CreateInstanceSnapshot.go | 6 ++ service/lightsail/api_op_CreateInstances.go | 6 ++ .../api_op_CreateInstancesFromSnapshot.go | 6 ++ service/lightsail/api_op_CreateKeyPair.go | 6 ++ .../lightsail/api_op_CreateLoadBalancer.go | 6 ++ ...api_op_CreateLoadBalancerTlsCertificate.go | 6 ++ .../api_op_CreateRelationalDatabase.go | 6 ++ ...op_CreateRelationalDatabaseFromSnapshot.go | 6 ++ ...api_op_CreateRelationalDatabaseSnapshot.go | 6 ++ service/lightsail/api_op_DeleteAlarm.go | 6 ++ .../lightsail/api_op_DeleteAutoSnapshot.go | 6 ++ service/lightsail/api_op_DeleteCertificate.go | 6 ++ .../lightsail/api_op_DeleteContactMethod.go | 6 ++ service/lightsail/api_op_DeleteDisk.go | 6 ++ .../lightsail/api_op_DeleteDiskSnapshot.go | 6 ++ .../lightsail/api_op_DeleteDistribution.go | 6 ++ service/lightsail/api_op_DeleteDomain.go | 6 ++ service/lightsail/api_op_DeleteDomainEntry.go | 6 ++ service/lightsail/api_op_DeleteInstance.go | 6 ++ .../api_op_DeleteInstanceSnapshot.go | 6 ++ service/lightsail/api_op_DeleteKeyPair.go | 6 ++ .../lightsail/api_op_DeleteKnownHostKeys.go | 6 ++ .../lightsail/api_op_DeleteLoadBalancer.go | 6 ++ ...api_op_DeleteLoadBalancerTlsCertificate.go | 6 ++ .../api_op_DeleteRelationalDatabase.go | 6 ++ ...api_op_DeleteRelationalDatabaseSnapshot.go | 6 ++ ...pi_op_DetachCertificateFromDistribution.go | 6 ++ service/lightsail/api_op_DetachDisk.go | 6 ++ .../api_op_DetachInstancesFromLoadBalancer.go | 6 ++ service/lightsail/api_op_DetachStaticIp.go | 6 ++ service/lightsail/api_op_DisableAddOn.go | 6 ++ .../api_op_DownloadDefaultKeyPair.go | 6 ++ service/lightsail/api_op_EnableAddOn.go | 6 ++ service/lightsail/api_op_ExportSnapshot.go | 6 ++ service/lightsail/api_op_GetActiveNames.go | 6 ++ service/lightsail/api_op_GetAlarms.go | 6 ++ service/lightsail/api_op_GetAutoSnapshots.go | 6 ++ service/lightsail/api_op_GetBlueprints.go | 6 ++ service/lightsail/api_op_GetBundles.go | 6 ++ service/lightsail/api_op_GetCertificates.go | 6 ++ .../api_op_GetCloudFormationStackRecords.go | 6 ++ service/lightsail/api_op_GetContactMethods.go | 6 ++ service/lightsail/api_op_GetDisk.go | 6 ++ service/lightsail/api_op_GetDiskSnapshot.go | 6 ++ service/lightsail/api_op_GetDiskSnapshots.go | 6 ++ service/lightsail/api_op_GetDisks.go | 6 ++ .../api_op_GetDistributionBundles.go | 6 ++ .../api_op_GetDistributionLatestCacheReset.go | 6 ++ .../api_op_GetDistributionMetricData.go | 6 ++ service/lightsail/api_op_GetDistributions.go | 6 ++ service/lightsail/api_op_GetDomain.go | 6 ++ service/lightsail/api_op_GetDomains.go | 6 ++ .../api_op_GetExportSnapshotRecords.go | 6 ++ service/lightsail/api_op_GetInstance.go | 6 ++ .../api_op_GetInstanceAccessDetails.go | 6 ++ .../lightsail/api_op_GetInstanceMetricData.go | 6 ++ .../lightsail/api_op_GetInstancePortStates.go | 6 ++ .../lightsail/api_op_GetInstanceSnapshot.go | 6 ++ .../lightsail/api_op_GetInstanceSnapshots.go | 6 ++ service/lightsail/api_op_GetInstanceState.go | 6 ++ service/lightsail/api_op_GetInstances.go | 6 ++ service/lightsail/api_op_GetKeyPair.go | 6 ++ service/lightsail/api_op_GetKeyPairs.go | 6 ++ service/lightsail/api_op_GetLoadBalancer.go | 6 ++ .../api_op_GetLoadBalancerMetricData.go | 6 ++ .../api_op_GetLoadBalancerTlsCertificates.go | 6 ++ service/lightsail/api_op_GetLoadBalancers.go | 6 ++ service/lightsail/api_op_GetOperation.go | 6 ++ service/lightsail/api_op_GetOperations.go | 6 ++ .../api_op_GetOperationsForResource.go | 6 ++ service/lightsail/api_op_GetRegions.go | 6 ++ .../lightsail/api_op_GetRelationalDatabase.go | 6 ++ .../api_op_GetRelationalDatabaseBlueprints.go | 6 ++ .../api_op_GetRelationalDatabaseBundles.go | 6 ++ .../api_op_GetRelationalDatabaseEvents.go | 6 ++ .../api_op_GetRelationalDatabaseLogEvents.go | 6 ++ .../api_op_GetRelationalDatabaseLogStreams.go | 6 ++ ...GetRelationalDatabaseMasterUserPassword.go | 6 ++ .../api_op_GetRelationalDatabaseMetricData.go | 6 ++ .../api_op_GetRelationalDatabaseParameters.go | 6 ++ .../api_op_GetRelationalDatabaseSnapshot.go | 6 ++ .../api_op_GetRelationalDatabaseSnapshots.go | 6 ++ .../api_op_GetRelationalDatabases.go | 6 ++ service/lightsail/api_op_GetStaticIp.go | 6 ++ service/lightsail/api_op_GetStaticIps.go | 6 ++ service/lightsail/api_op_ImportKeyPair.go | 6 ++ service/lightsail/api_op_IsVpcPeered.go | 6 ++ .../api_op_OpenInstancePublicPorts.go | 6 ++ service/lightsail/api_op_PeerVpc.go | 6 ++ service/lightsail/api_op_PutAlarm.go | 6 ++ .../api_op_PutInstancePublicPorts.go | 6 ++ service/lightsail/api_op_RebootInstance.go | 6 ++ .../api_op_RebootRelationalDatabase.go | 6 ++ service/lightsail/api_op_ReleaseStaticIp.go | 6 ++ .../api_op_ResetDistributionCache.go | 6 ++ .../api_op_SendContactMethodVerification.go | 6 ++ service/lightsail/api_op_StartInstance.go | 6 ++ .../api_op_StartRelationalDatabase.go | 6 ++ service/lightsail/api_op_StopInstance.go | 6 ++ .../api_op_StopRelationalDatabase.go | 6 ++ service/lightsail/api_op_TagResource.go | 6 ++ service/lightsail/api_op_TestAlarm.go | 6 ++ service/lightsail/api_op_UnpeerVpc.go | 6 ++ service/lightsail/api_op_UntagResource.go | 6 ++ .../lightsail/api_op_UpdateDistribution.go | 6 ++ .../api_op_UpdateDistributionBundle.go | 6 ++ service/lightsail/api_op_UpdateDomainEntry.go | 6 ++ .../api_op_UpdateLoadBalancerAttribute.go | 6 ++ .../api_op_UpdateRelationalDatabase.go | 6 ++ ...i_op_UpdateRelationalDatabaseParameters.go | 6 ++ service/lightsail/go.mod | 4 +- service/lightsail/go.sum | 2 - service/machinelearning/api_client.go | 52 ++++++++-- service/machinelearning/api_op_AddTags.go | 6 ++ .../api_op_CreateBatchPrediction.go | 6 ++ .../api_op_CreateDataSourceFromRDS.go | 6 ++ .../api_op_CreateDataSourceFromRedshift.go | 6 ++ .../api_op_CreateDataSourceFromS3.go | 6 ++ .../api_op_CreateEvaluation.go | 6 ++ .../machinelearning/api_op_CreateMLModel.go | 6 ++ .../api_op_CreateRealtimeEndpoint.go | 6 ++ .../api_op_DeleteBatchPrediction.go | 6 ++ .../api_op_DeleteDataSource.go | 6 ++ .../api_op_DeleteEvaluation.go | 6 ++ .../machinelearning/api_op_DeleteMLModel.go | 6 ++ .../api_op_DeleteRealtimeEndpoint.go | 6 ++ service/machinelearning/api_op_DeleteTags.go | 6 ++ .../api_op_DescribeBatchPredictions.go | 6 ++ .../api_op_DescribeDataSources.go | 6 ++ .../api_op_DescribeEvaluations.go | 6 ++ .../api_op_DescribeMLModels.go | 6 ++ .../machinelearning/api_op_DescribeTags.go | 6 ++ .../api_op_GetBatchPrediction.go | 6 ++ .../machinelearning/api_op_GetDataSource.go | 6 ++ .../machinelearning/api_op_GetEvaluation.go | 6 ++ service/machinelearning/api_op_GetMLModel.go | 6 ++ service/machinelearning/api_op_Predict.go | 6 ++ .../api_op_UpdateBatchPrediction.go | 6 ++ .../api_op_UpdateDataSource.go | 6 ++ .../api_op_UpdateEvaluation.go | 6 ++ .../machinelearning/api_op_UpdateMLModel.go | 6 ++ service/machinelearning/go.mod | 4 +- service/machinelearning/go.sum | 2 - service/macie/api_client.go | 52 ++++++++-- .../macie/api_op_AssociateMemberAccount.go | 6 ++ service/macie/api_op_AssociateS3Resources.go | 6 ++ .../macie/api_op_DisassociateMemberAccount.go | 6 ++ .../macie/api_op_DisassociateS3Resources.go | 6 ++ service/macie/api_op_ListMemberAccounts.go | 6 ++ service/macie/api_op_ListS3Resources.go | 6 ++ service/macie/api_op_UpdateS3Resources.go | 6 ++ service/macie/go.mod | 4 +- service/macie/go.sum | 2 - service/macie2/api_client.go | 52 ++++++++-- service/macie2/api_op_AcceptInvitation.go | 6 ++ .../api_op_BatchGetCustomDataIdentifiers.go | 6 ++ .../macie2/api_op_CreateClassificationJob.go | 6 ++ .../api_op_CreateCustomDataIdentifier.go | 6 ++ service/macie2/api_op_CreateFindingsFilter.go | 6 ++ service/macie2/api_op_CreateInvitations.go | 6 ++ service/macie2/api_op_CreateMember.go | 6 ++ service/macie2/api_op_CreateSampleFindings.go | 6 ++ service/macie2/api_op_DeclineInvitations.go | 6 ++ .../api_op_DeleteCustomDataIdentifier.go | 6 ++ service/macie2/api_op_DeleteFindingsFilter.go | 6 ++ service/macie2/api_op_DeleteInvitations.go | 6 ++ service/macie2/api_op_DeleteMember.go | 6 ++ service/macie2/api_op_DescribeBuckets.go | 6 ++ .../api_op_DescribeClassificationJob.go | 6 ++ ...pi_op_DescribeOrganizationConfiguration.go | 6 ++ service/macie2/api_op_DisableMacie.go | 6 ++ .../api_op_DisableOrganizationAdminAccount.go | 6 ++ .../api_op_DisassociateFromMasterAccount.go | 6 ++ service/macie2/api_op_DisassociateMember.go | 6 ++ service/macie2/api_op_EnableMacie.go | 6 ++ .../api_op_EnableOrganizationAdminAccount.go | 6 ++ service/macie2/api_op_GetBucketStatistics.go | 6 ++ ...op_GetClassificationExportConfiguration.go | 6 ++ .../macie2/api_op_GetCustomDataIdentifier.go | 6 ++ service/macie2/api_op_GetFindingStatistics.go | 6 ++ service/macie2/api_op_GetFindings.go | 6 ++ service/macie2/api_op_GetFindingsFilter.go | 6 ++ service/macie2/api_op_GetInvitationsCount.go | 6 ++ service/macie2/api_op_GetMacieSession.go | 6 ++ service/macie2/api_op_GetMasterAccount.go | 6 ++ service/macie2/api_op_GetMember.go | 6 ++ service/macie2/api_op_GetUsageStatistics.go | 6 ++ service/macie2/api_op_GetUsageTotals.go | 6 ++ .../macie2/api_op_ListClassificationJobs.go | 6 ++ .../api_op_ListCustomDataIdentifiers.go | 6 ++ service/macie2/api_op_ListFindings.go | 6 ++ service/macie2/api_op_ListFindingsFilters.go | 6 ++ service/macie2/api_op_ListInvitations.go | 6 ++ service/macie2/api_op_ListMembers.go | 6 ++ .../api_op_ListOrganizationAdminAccounts.go | 6 ++ service/macie2/api_op_ListTagsForResource.go | 6 ++ ...op_PutClassificationExportConfiguration.go | 6 ++ service/macie2/api_op_TagResource.go | 6 ++ .../macie2/api_op_TestCustomDataIdentifier.go | 6 ++ service/macie2/api_op_UntagResource.go | 6 ++ .../macie2/api_op_UpdateClassificationJob.go | 6 ++ service/macie2/api_op_UpdateFindingsFilter.go | 6 ++ service/macie2/api_op_UpdateMacieSession.go | 6 ++ service/macie2/api_op_UpdateMemberSession.go | 6 ++ .../api_op_UpdateOrganizationConfiguration.go | 6 ++ service/macie2/go.mod | 4 +- service/macie2/go.sum | 2 - service/managedblockchain/api_client.go | 52 ++++++++-- .../managedblockchain/api_op_CreateMember.go | 6 ++ .../managedblockchain/api_op_CreateNetwork.go | 6 ++ .../managedblockchain/api_op_CreateNode.go | 6 ++ .../api_op_CreateProposal.go | 6 ++ .../managedblockchain/api_op_DeleteMember.go | 6 ++ .../managedblockchain/api_op_DeleteNode.go | 6 ++ service/managedblockchain/api_op_GetMember.go | 6 ++ .../managedblockchain/api_op_GetNetwork.go | 6 ++ service/managedblockchain/api_op_GetNode.go | 6 ++ .../managedblockchain/api_op_GetProposal.go | 6 ++ .../api_op_ListInvitations.go | 6 ++ .../managedblockchain/api_op_ListMembers.go | 6 ++ .../managedblockchain/api_op_ListNetworks.go | 6 ++ service/managedblockchain/api_op_ListNodes.go | 6 ++ .../api_op_ListProposalVotes.go | 6 ++ .../managedblockchain/api_op_ListProposals.go | 6 ++ .../api_op_RejectInvitation.go | 6 ++ .../managedblockchain/api_op_UpdateMember.go | 6 ++ .../managedblockchain/api_op_UpdateNode.go | 6 ++ .../api_op_VoteOnProposal.go | 6 ++ service/managedblockchain/go.mod | 4 +- service/managedblockchain/go.sum | 2 - service/marketplacecatalog/api_client.go | 52 ++++++++-- .../api_op_CancelChangeSet.go | 6 ++ .../api_op_DescribeChangeSet.go | 6 ++ .../api_op_DescribeEntity.go | 6 ++ .../api_op_ListChangeSets.go | 6 ++ .../marketplacecatalog/api_op_ListEntities.go | 6 ++ .../api_op_StartChangeSet.go | 6 ++ service/marketplacecatalog/go.mod | 4 +- service/marketplacecatalog/go.sum | 2 - .../api_client.go | 52 ++++++++-- .../api_op_GenerateDataSet.go | 6 ++ .../api_op_StartSupportDataExport.go | 6 ++ service/marketplacecommerceanalytics/go.mod | 4 +- service/marketplacecommerceanalytics/go.sum | 2 - .../api_client.go | 52 ++++++++-- .../api_op_GetEntitlements.go | 6 ++ service/marketplaceentitlementservice/go.mod | 4 +- service/marketplaceentitlementservice/go.sum | 2 - service/marketplacemetering/api_client.go | 52 ++++++++-- .../api_op_BatchMeterUsage.go | 6 ++ .../marketplacemetering/api_op_MeterUsage.go | 6 ++ .../api_op_RegisterUsage.go | 6 ++ .../api_op_ResolveCustomer.go | 6 ++ service/marketplacemetering/go.mod | 4 +- service/marketplacemetering/go.sum | 2 - service/mediaconnect/api_client.go | 52 ++++++++-- service/mediaconnect/api_op_AddFlowOutputs.go | 6 ++ service/mediaconnect/api_op_AddFlowSources.go | 6 ++ .../api_op_AddFlowVpcInterfaces.go | 6 ++ service/mediaconnect/api_op_CreateFlow.go | 6 ++ service/mediaconnect/api_op_DeleteFlow.go | 6 ++ service/mediaconnect/api_op_DescribeFlow.go | 6 ++ .../mediaconnect/api_op_DescribeOffering.go | 6 ++ .../api_op_DescribeReservation.go | 6 ++ .../api_op_GrantFlowEntitlements.go | 6 ++ .../mediaconnect/api_op_ListEntitlements.go | 6 ++ service/mediaconnect/api_op_ListFlows.go | 6 ++ service/mediaconnect/api_op_ListOfferings.go | 6 ++ .../mediaconnect/api_op_ListReservations.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../mediaconnect/api_op_PurchaseOffering.go | 6 ++ .../mediaconnect/api_op_RemoveFlowOutput.go | 6 ++ .../mediaconnect/api_op_RemoveFlowSource.go | 6 ++ .../api_op_RemoveFlowVpcInterface.go | 6 ++ .../api_op_RevokeFlowEntitlement.go | 6 ++ service/mediaconnect/api_op_StartFlow.go | 6 ++ service/mediaconnect/api_op_StopFlow.go | 6 ++ service/mediaconnect/api_op_TagResource.go | 6 ++ service/mediaconnect/api_op_UntagResource.go | 6 ++ service/mediaconnect/api_op_UpdateFlow.go | 6 ++ .../api_op_UpdateFlowEntitlement.go | 6 ++ .../mediaconnect/api_op_UpdateFlowOutput.go | 6 ++ .../mediaconnect/api_op_UpdateFlowSource.go | 6 ++ service/mediaconnect/go.mod | 4 +- service/mediaconnect/go.sum | 2 - service/mediaconvert/api_client.go | 52 ++++++++-- .../api_op_AssociateCertificate.go | 6 ++ service/mediaconvert/api_op_CancelJob.go | 6 ++ service/mediaconvert/api_op_CreateJob.go | 6 ++ .../mediaconvert/api_op_CreateJobTemplate.go | 6 ++ service/mediaconvert/api_op_CreatePreset.go | 6 ++ service/mediaconvert/api_op_CreateQueue.go | 6 ++ .../mediaconvert/api_op_DeleteJobTemplate.go | 6 ++ service/mediaconvert/api_op_DeletePreset.go | 6 ++ service/mediaconvert/api_op_DeleteQueue.go | 6 ++ .../mediaconvert/api_op_DescribeEndpoints.go | 6 ++ .../api_op_DisassociateCertificate.go | 6 ++ service/mediaconvert/api_op_GetJob.go | 6 ++ service/mediaconvert/api_op_GetJobTemplate.go | 6 ++ service/mediaconvert/api_op_GetPreset.go | 6 ++ service/mediaconvert/api_op_GetQueue.go | 6 ++ .../mediaconvert/api_op_ListJobTemplates.go | 6 ++ service/mediaconvert/api_op_ListJobs.go | 6 ++ service/mediaconvert/api_op_ListPresets.go | 6 ++ service/mediaconvert/api_op_ListQueues.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/mediaconvert/api_op_TagResource.go | 6 ++ service/mediaconvert/api_op_UntagResource.go | 6 ++ .../mediaconvert/api_op_UpdateJobTemplate.go | 6 ++ service/mediaconvert/api_op_UpdatePreset.go | 6 ++ service/mediaconvert/api_op_UpdateQueue.go | 6 ++ service/mediaconvert/go.mod | 4 +- service/mediaconvert/go.sum | 2 - service/medialive/api_client.go | 52 ++++++++-- .../api_op_AcceptInputDeviceTransfer.go | 6 ++ service/medialive/api_op_BatchDelete.go | 6 ++ service/medialive/api_op_BatchStart.go | 6 ++ service/medialive/api_op_BatchStop.go | 6 ++ .../medialive/api_op_BatchUpdateSchedule.go | 6 ++ .../api_op_CancelInputDeviceTransfer.go | 6 ++ service/medialive/api_op_CreateChannel.go | 6 ++ service/medialive/api_op_CreateInput.go | 6 ++ .../api_op_CreateInputSecurityGroup.go | 6 ++ service/medialive/api_op_CreateMultiplex.go | 6 ++ .../api_op_CreateMultiplexProgram.go | 6 ++ service/medialive/api_op_CreateTags.go | 6 ++ service/medialive/api_op_DeleteChannel.go | 6 ++ service/medialive/api_op_DeleteInput.go | 6 ++ .../api_op_DeleteInputSecurityGroup.go | 6 ++ service/medialive/api_op_DeleteMultiplex.go | 6 ++ .../api_op_DeleteMultiplexProgram.go | 6 ++ service/medialive/api_op_DeleteReservation.go | 6 ++ service/medialive/api_op_DeleteSchedule.go | 6 ++ service/medialive/api_op_DeleteTags.go | 6 ++ service/medialive/api_op_DescribeChannel.go | 6 ++ service/medialive/api_op_DescribeInput.go | 6 ++ .../medialive/api_op_DescribeInputDevice.go | 6 ++ .../api_op_DescribeInputDeviceThumbnail.go | 6 ++ .../api_op_DescribeInputSecurityGroup.go | 6 ++ service/medialive/api_op_DescribeMultiplex.go | 6 ++ .../api_op_DescribeMultiplexProgram.go | 6 ++ service/medialive/api_op_DescribeOffering.go | 6 ++ .../medialive/api_op_DescribeReservation.go | 6 ++ service/medialive/api_op_DescribeSchedule.go | 6 ++ service/medialive/api_op_ListChannels.go | 6 ++ .../api_op_ListInputDeviceTransfers.go | 6 ++ service/medialive/api_op_ListInputDevices.go | 6 ++ .../api_op_ListInputSecurityGroups.go | 6 ++ service/medialive/api_op_ListInputs.go | 6 ++ .../medialive/api_op_ListMultiplexPrograms.go | 6 ++ service/medialive/api_op_ListMultiplexes.go | 6 ++ service/medialive/api_op_ListOfferings.go | 6 ++ service/medialive/api_op_ListReservations.go | 6 ++ .../medialive/api_op_ListTagsForResource.go | 6 ++ service/medialive/api_op_PurchaseOffering.go | 6 ++ .../api_op_RejectInputDeviceTransfer.go | 6 ++ service/medialive/api_op_StartChannel.go | 6 ++ service/medialive/api_op_StartMultiplex.go | 6 ++ service/medialive/api_op_StopChannel.go | 6 ++ service/medialive/api_op_StopMultiplex.go | 6 ++ .../medialive/api_op_TransferInputDevice.go | 6 ++ service/medialive/api_op_UpdateChannel.go | 6 ++ .../medialive/api_op_UpdateChannelClass.go | 6 ++ service/medialive/api_op_UpdateInput.go | 6 ++ service/medialive/api_op_UpdateInputDevice.go | 6 ++ .../api_op_UpdateInputSecurityGroup.go | 6 ++ service/medialive/api_op_UpdateMultiplex.go | 6 ++ .../api_op_UpdateMultiplexProgram.go | 6 ++ service/medialive/api_op_UpdateReservation.go | 6 ++ service/medialive/go.mod | 4 +- service/medialive/go.sum | 2 - service/mediapackage/api_client.go | 52 ++++++++-- service/mediapackage/api_op_ConfigureLogs.go | 6 ++ service/mediapackage/api_op_CreateChannel.go | 6 ++ .../mediapackage/api_op_CreateHarvestJob.go | 6 ++ .../api_op_CreateOriginEndpoint.go | 6 ++ service/mediapackage/api_op_DeleteChannel.go | 6 ++ .../api_op_DeleteOriginEndpoint.go | 6 ++ .../mediapackage/api_op_DescribeChannel.go | 6 ++ .../mediapackage/api_op_DescribeHarvestJob.go | 6 ++ .../api_op_DescribeOriginEndpoint.go | 6 ++ service/mediapackage/api_op_ListChannels.go | 6 ++ .../mediapackage/api_op_ListHarvestJobs.go | 6 ++ .../api_op_ListOriginEndpoints.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_RotateChannelCredentials.go | 6 ++ .../api_op_RotateIngestEndpointCredentials.go | 6 ++ service/mediapackage/api_op_TagResource.go | 6 ++ service/mediapackage/api_op_UntagResource.go | 6 ++ service/mediapackage/api_op_UpdateChannel.go | 6 ++ .../api_op_UpdateOriginEndpoint.go | 6 ++ service/mediapackage/go.mod | 4 +- service/mediapackage/go.sum | 2 - service/mediapackagevod/api_client.go | 52 ++++++++-- service/mediapackagevod/api_op_CreateAsset.go | 6 ++ .../api_op_CreatePackagingConfiguration.go | 6 ++ .../api_op_CreatePackagingGroup.go | 6 ++ service/mediapackagevod/api_op_DeleteAsset.go | 6 ++ .../api_op_DeletePackagingConfiguration.go | 6 ++ .../api_op_DeletePackagingGroup.go | 6 ++ .../mediapackagevod/api_op_DescribeAsset.go | 6 ++ .../api_op_DescribePackagingConfiguration.go | 6 ++ .../api_op_DescribePackagingGroup.go | 6 ++ service/mediapackagevod/api_op_ListAssets.go | 6 ++ .../api_op_ListPackagingConfigurations.go | 6 ++ .../api_op_ListPackagingGroups.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/mediapackagevod/api_op_TagResource.go | 6 ++ .../mediapackagevod/api_op_UntagResource.go | 6 ++ .../api_op_UpdatePackagingGroup.go | 6 ++ service/mediapackagevod/go.mod | 4 +- service/mediapackagevod/go.sum | 2 - service/mediastore/api_client.go | 52 ++++++++-- service/mediastore/api_op_CreateContainer.go | 6 ++ service/mediastore/api_op_DeleteContainer.go | 6 ++ .../api_op_DeleteContainerPolicy.go | 6 ++ service/mediastore/api_op_DeleteCorsPolicy.go | 6 ++ .../api_op_DeleteLifecyclePolicy.go | 6 ++ .../mediastore/api_op_DeleteMetricPolicy.go | 6 ++ .../mediastore/api_op_DescribeContainer.go | 6 ++ .../mediastore/api_op_GetContainerPolicy.go | 6 ++ service/mediastore/api_op_GetCorsPolicy.go | 6 ++ .../mediastore/api_op_GetLifecyclePolicy.go | 6 ++ service/mediastore/api_op_GetMetricPolicy.go | 6 ++ service/mediastore/api_op_ListContainers.go | 6 ++ .../mediastore/api_op_ListTagsForResource.go | 6 ++ .../mediastore/api_op_PutContainerPolicy.go | 6 ++ service/mediastore/api_op_PutCorsPolicy.go | 6 ++ .../mediastore/api_op_PutLifecyclePolicy.go | 6 ++ service/mediastore/api_op_PutMetricPolicy.go | 6 ++ .../mediastore/api_op_StartAccessLogging.go | 6 ++ .../mediastore/api_op_StopAccessLogging.go | 6 ++ service/mediastore/api_op_TagResource.go | 6 ++ service/mediastore/api_op_UntagResource.go | 6 ++ service/mediastore/go.mod | 4 +- service/mediastore/go.sum | 2 - service/mediastoredata/api_client.go | 52 ++++++++-- service/mediastoredata/api_op_DeleteObject.go | 6 ++ .../mediastoredata/api_op_DescribeObject.go | 6 ++ service/mediastoredata/api_op_GetObject.go | 6 ++ service/mediastoredata/api_op_ListItems.go | 6 ++ service/mediastoredata/api_op_PutObject.go | 6 ++ service/mediastoredata/go.mod | 4 +- service/mediastoredata/go.sum | 2 - service/mediatailor/api_client.go | 52 ++++++++-- .../api_op_DeletePlaybackConfiguration.go | 6 ++ .../api_op_GetPlaybackConfiguration.go | 6 ++ .../api_op_ListPlaybackConfigurations.go | 6 ++ .../mediatailor/api_op_ListTagsForResource.go | 6 ++ .../api_op_PutPlaybackConfiguration.go | 6 ++ service/mediatailor/api_op_TagResource.go | 6 ++ service/mediatailor/api_op_UntagResource.go | 6 ++ service/mediatailor/go.mod | 4 +- service/mediatailor/go.sum | 2 - service/migrationhub/api_client.go | 52 ++++++++-- .../api_op_AssociateCreatedArtifact.go | 6 ++ .../api_op_AssociateDiscoveredResource.go | 6 ++ .../api_op_CreateProgressUpdateStream.go | 6 ++ .../api_op_DeleteProgressUpdateStream.go | 6 ++ .../api_op_DescribeApplicationState.go | 6 ++ .../api_op_DescribeMigrationTask.go | 6 ++ .../api_op_DisassociateCreatedArtifact.go | 6 ++ .../api_op_DisassociateDiscoveredResource.go | 6 ++ .../api_op_ImportMigrationTask.go | 6 ++ .../api_op_ListApplicationStates.go | 6 ++ .../api_op_ListCreatedArtifacts.go | 6 ++ .../api_op_ListDiscoveredResources.go | 6 ++ .../migrationhub/api_op_ListMigrationTasks.go | 6 ++ .../api_op_ListProgressUpdateStreams.go | 6 ++ .../api_op_NotifyApplicationState.go | 6 ++ .../api_op_NotifyMigrationTaskState.go | 6 ++ .../api_op_PutResourceAttributes.go | 6 ++ service/migrationhub/go.mod | 4 +- service/migrationhub/go.sum | 2 - service/migrationhubconfig/api_client.go | 52 ++++++++-- .../api_op_CreateHomeRegionControl.go | 6 ++ .../api_op_DescribeHomeRegionControls.go | 6 ++ .../api_op_GetHomeRegion.go | 6 ++ service/migrationhubconfig/go.mod | 4 +- service/migrationhubconfig/go.sum | 2 - service/mobile/api_client.go | 52 ++++++++-- service/mobile/api_op_CreateProject.go | 6 ++ service/mobile/api_op_DeleteProject.go | 6 ++ service/mobile/api_op_DescribeBundle.go | 6 ++ service/mobile/api_op_DescribeProject.go | 6 ++ service/mobile/api_op_ExportBundle.go | 6 ++ service/mobile/api_op_ExportProject.go | 6 ++ service/mobile/api_op_ListBundles.go | 6 ++ service/mobile/api_op_ListProjects.go | 6 ++ service/mobile/api_op_UpdateProject.go | 6 ++ service/mobile/go.mod | 4 +- service/mobile/go.sum | 2 - service/mq/api_client.go | 52 ++++++++-- service/mq/api_op_CreateBroker.go | 6 ++ service/mq/api_op_CreateConfiguration.go | 6 ++ service/mq/api_op_CreateTags.go | 6 ++ service/mq/api_op_CreateUser.go | 6 ++ service/mq/api_op_DeleteBroker.go | 6 ++ service/mq/api_op_DeleteTags.go | 6 ++ service/mq/api_op_DeleteUser.go | 6 ++ service/mq/api_op_DescribeBroker.go | 6 ++ .../mq/api_op_DescribeBrokerEngineTypes.go | 6 ++ .../api_op_DescribeBrokerInstanceOptions.go | 6 ++ service/mq/api_op_DescribeConfiguration.go | 6 ++ .../api_op_DescribeConfigurationRevision.go | 6 ++ service/mq/api_op_DescribeUser.go | 6 ++ service/mq/api_op_ListBrokers.go | 6 ++ .../mq/api_op_ListConfigurationRevisions.go | 6 ++ service/mq/api_op_ListConfigurations.go | 6 ++ service/mq/api_op_ListTags.go | 6 ++ service/mq/api_op_ListUsers.go | 6 ++ service/mq/api_op_RebootBroker.go | 6 ++ service/mq/api_op_UpdateBroker.go | 6 ++ service/mq/api_op_UpdateConfiguration.go | 6 ++ service/mq/api_op_UpdateUser.go | 6 ++ service/mq/go.mod | 4 +- service/mq/go.sum | 2 - service/mturk/api_client.go | 52 ++++++++-- .../api_op_AcceptQualificationRequest.go | 6 ++ service/mturk/api_op_ApproveAssignment.go | 6 ++ ...api_op_AssociateQualificationWithWorker.go | 6 ++ ...pi_op_CreateAdditionalAssignmentsForHIT.go | 6 ++ service/mturk/api_op_CreateHIT.go | 6 ++ service/mturk/api_op_CreateHITType.go | 6 ++ service/mturk/api_op_CreateHITWithHITType.go | 6 ++ .../mturk/api_op_CreateQualificationType.go | 6 ++ service/mturk/api_op_CreateWorkerBlock.go | 6 ++ service/mturk/api_op_DeleteHIT.go | 6 ++ .../mturk/api_op_DeleteQualificationType.go | 6 ++ service/mturk/api_op_DeleteWorkerBlock.go | 6 ++ ..._op_DisassociateQualificationFromWorker.go | 6 ++ service/mturk/api_op_GetAccountBalance.go | 6 ++ service/mturk/api_op_GetAssignment.go | 6 ++ service/mturk/api_op_GetFileUploadURL.go | 6 ++ service/mturk/api_op_GetHIT.go | 6 ++ service/mturk/api_op_GetQualificationScore.go | 6 ++ service/mturk/api_op_GetQualificationType.go | 6 ++ service/mturk/api_op_ListAssignmentsForHIT.go | 6 ++ service/mturk/api_op_ListBonusPayments.go | 6 ++ service/mturk/api_op_ListHITs.go | 6 ++ .../api_op_ListHITsForQualificationType.go | 6 ++ .../mturk/api_op_ListQualificationRequests.go | 6 ++ .../mturk/api_op_ListQualificationTypes.go | 6 ++ .../api_op_ListReviewPolicyResultsForHIT.go | 6 ++ service/mturk/api_op_ListReviewableHITs.go | 6 ++ service/mturk/api_op_ListWorkerBlocks.go | 6 ++ ...api_op_ListWorkersWithQualificationType.go | 6 ++ service/mturk/api_op_NotifyWorkers.go | 6 ++ service/mturk/api_op_RejectAssignment.go | 6 ++ .../api_op_RejectQualificationRequest.go | 6 ++ service/mturk/api_op_SendBonus.go | 6 ++ .../mturk/api_op_SendTestEventNotification.go | 6 ++ .../mturk/api_op_UpdateExpirationForHIT.go | 6 ++ service/mturk/api_op_UpdateHITReviewStatus.go | 6 ++ service/mturk/api_op_UpdateHITTypeOfHIT.go | 6 ++ .../api_op_UpdateNotificationSettings.go | 6 ++ .../mturk/api_op_UpdateQualificationType.go | 6 ++ service/mturk/go.mod | 4 +- service/mturk/go.sum | 2 - service/neptune/api_client.go | 52 ++++++++-- service/neptune/api_op_AddRoleToDBCluster.go | 6 ++ ...pi_op_AddSourceIdentifierToSubscription.go | 6 ++ service/neptune/api_op_AddTagsToResource.go | 6 ++ .../api_op_ApplyPendingMaintenanceAction.go | 6 ++ .../api_op_CopyDBClusterParameterGroup.go | 6 ++ .../neptune/api_op_CopyDBClusterSnapshot.go | 6 ++ .../neptune/api_op_CopyDBParameterGroup.go | 6 ++ service/neptune/api_op_CreateDBCluster.go | 6 ++ .../neptune/api_op_CreateDBClusterEndpoint.go | 6 ++ .../api_op_CreateDBClusterParameterGroup.go | 6 ++ .../neptune/api_op_CreateDBClusterSnapshot.go | 6 ++ service/neptune/api_op_CreateDBInstance.go | 6 ++ .../neptune/api_op_CreateDBParameterGroup.go | 6 ++ service/neptune/api_op_CreateDBSubnetGroup.go | 6 ++ .../neptune/api_op_CreateEventSubscription.go | 6 ++ service/neptune/api_op_DeleteDBCluster.go | 6 ++ .../neptune/api_op_DeleteDBClusterEndpoint.go | 6 ++ .../api_op_DeleteDBClusterParameterGroup.go | 6 ++ .../neptune/api_op_DeleteDBClusterSnapshot.go | 6 ++ service/neptune/api_op_DeleteDBInstance.go | 6 ++ .../neptune/api_op_DeleteDBParameterGroup.go | 6 ++ service/neptune/api_op_DeleteDBSubnetGroup.go | 6 ++ .../neptune/api_op_DeleteEventSubscription.go | 6 ++ .../api_op_DescribeDBClusterEndpoints.go | 6 ++ ...api_op_DescribeDBClusterParameterGroups.go | 6 ++ .../api_op_DescribeDBClusterParameters.go | 6 ++ ..._op_DescribeDBClusterSnapshotAttributes.go | 6 ++ .../api_op_DescribeDBClusterSnapshots.go | 6 ++ service/neptune/api_op_DescribeDBClusters.go | 6 ++ .../api_op_DescribeDBEngineVersions.go | 6 ++ service/neptune/api_op_DescribeDBInstances.go | 6 ++ .../api_op_DescribeDBParameterGroups.go | 6 ++ .../neptune/api_op_DescribeDBParameters.go | 6 ++ .../neptune/api_op_DescribeDBSubnetGroups.go | 6 ++ ..._DescribeEngineDefaultClusterParameters.go | 6 ++ .../api_op_DescribeEngineDefaultParameters.go | 6 ++ .../neptune/api_op_DescribeEventCategories.go | 6 ++ .../api_op_DescribeEventSubscriptions.go | 6 ++ service/neptune/api_op_DescribeEvents.go | 6 ++ ...i_op_DescribeOrderableDBInstanceOptions.go | 6 ++ ...pi_op_DescribePendingMaintenanceActions.go | 6 ++ ...op_DescribeValidDBInstanceModifications.go | 6 ++ service/neptune/api_op_FailoverDBCluster.go | 6 ++ service/neptune/api_op_ListTagsForResource.go | 6 ++ service/neptune/api_op_ModifyDBCluster.go | 6 ++ .../neptune/api_op_ModifyDBClusterEndpoint.go | 6 ++ .../api_op_ModifyDBClusterParameterGroup.go | 6 ++ ...api_op_ModifyDBClusterSnapshotAttribute.go | 6 ++ service/neptune/api_op_ModifyDBInstance.go | 6 ++ .../neptune/api_op_ModifyDBParameterGroup.go | 6 ++ service/neptune/api_op_ModifyDBSubnetGroup.go | 6 ++ .../neptune/api_op_ModifyEventSubscription.go | 6 ++ .../api_op_PromoteReadReplicaDBCluster.go | 6 ++ service/neptune/api_op_RebootDBInstance.go | 6 ++ .../neptune/api_op_RemoveRoleFromDBCluster.go | 6 ++ ..._RemoveSourceIdentifierFromSubscription.go | 6 ++ .../neptune/api_op_RemoveTagsFromResource.go | 6 ++ .../api_op_ResetDBClusterParameterGroup.go | 6 ++ .../neptune/api_op_ResetDBParameterGroup.go | 6 ++ .../api_op_RestoreDBClusterFromSnapshot.go | 6 ++ .../api_op_RestoreDBClusterToPointInTime.go | 6 ++ service/neptune/api_op_StartDBCluster.go | 6 ++ service/neptune/api_op_StopDBCluster.go | 6 ++ service/neptune/go.mod | 4 +- service/neptune/go.sum | 2 - service/networkmanager/api_client.go | 52 ++++++++-- .../api_op_AssociateCustomerGateway.go | 6 ++ .../networkmanager/api_op_AssociateLink.go | 6 ++ service/networkmanager/api_op_CreateDevice.go | 6 ++ .../api_op_CreateGlobalNetwork.go | 6 ++ service/networkmanager/api_op_CreateLink.go | 6 ++ service/networkmanager/api_op_CreateSite.go | 6 ++ service/networkmanager/api_op_DeleteDevice.go | 6 ++ .../api_op_DeleteGlobalNetwork.go | 6 ++ service/networkmanager/api_op_DeleteLink.go | 6 ++ service/networkmanager/api_op_DeleteSite.go | 6 ++ .../api_op_DeregisterTransitGateway.go | 6 ++ .../api_op_DescribeGlobalNetworks.go | 6 ++ .../api_op_DisassociateCustomerGateway.go | 6 ++ .../networkmanager/api_op_DisassociateLink.go | 6 ++ .../api_op_GetCustomerGatewayAssociations.go | 6 ++ service/networkmanager/api_op_GetDevices.go | 6 ++ .../api_op_GetLinkAssociations.go | 6 ++ service/networkmanager/api_op_GetLinks.go | 6 ++ service/networkmanager/api_op_GetSites.go | 6 ++ .../api_op_GetTransitGatewayRegistrations.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_RegisterTransitGateway.go | 6 ++ service/networkmanager/api_op_TagResource.go | 6 ++ .../networkmanager/api_op_UntagResource.go | 6 ++ service/networkmanager/api_op_UpdateDevice.go | 6 ++ .../api_op_UpdateGlobalNetwork.go | 6 ++ service/networkmanager/api_op_UpdateLink.go | 6 ++ service/networkmanager/api_op_UpdateSite.go | 6 ++ service/networkmanager/go.mod | 4 +- service/networkmanager/go.sum | 2 - service/opsworks/api_client.go | 52 ++++++++-- service/opsworks/api_op_AssignInstance.go | 6 ++ service/opsworks/api_op_AssignVolume.go | 6 ++ service/opsworks/api_op_AssociateElasticIp.go | 6 ++ .../api_op_AttachElasticLoadBalancer.go | 6 ++ service/opsworks/api_op_CloneStack.go | 6 ++ service/opsworks/api_op_CreateApp.go | 6 ++ service/opsworks/api_op_CreateDeployment.go | 6 ++ service/opsworks/api_op_CreateInstance.go | 6 ++ service/opsworks/api_op_CreateLayer.go | 6 ++ service/opsworks/api_op_CreateStack.go | 6 ++ service/opsworks/api_op_CreateUserProfile.go | 6 ++ service/opsworks/api_op_DeleteApp.go | 6 ++ service/opsworks/api_op_DeleteInstance.go | 6 ++ service/opsworks/api_op_DeleteLayer.go | 6 ++ service/opsworks/api_op_DeleteStack.go | 6 ++ service/opsworks/api_op_DeleteUserProfile.go | 6 ++ .../opsworks/api_op_DeregisterEcsCluster.go | 6 ++ .../opsworks/api_op_DeregisterElasticIp.go | 6 ++ service/opsworks/api_op_DeregisterInstance.go | 6 ++ .../api_op_DeregisterRdsDbInstance.go | 6 ++ service/opsworks/api_op_DeregisterVolume.go | 6 ++ .../opsworks/api_op_DescribeAgentVersions.go | 6 ++ service/opsworks/api_op_DescribeApps.go | 6 ++ service/opsworks/api_op_DescribeCommands.go | 6 ++ .../opsworks/api_op_DescribeDeployments.go | 6 ++ .../opsworks/api_op_DescribeEcsClusters.go | 6 ++ service/opsworks/api_op_DescribeElasticIps.go | 6 ++ .../api_op_DescribeElasticLoadBalancers.go | 6 ++ service/opsworks/api_op_DescribeInstances.go | 6 ++ service/opsworks/api_op_DescribeLayers.go | 6 ++ .../api_op_DescribeLoadBasedAutoScaling.go | 6 ++ .../opsworks/api_op_DescribeMyUserProfile.go | 6 ++ .../api_op_DescribeOperatingSystems.go | 6 ++ .../opsworks/api_op_DescribePermissions.go | 6 ++ service/opsworks/api_op_DescribeRaidArrays.go | 6 ++ .../opsworks/api_op_DescribeRdsDbInstances.go | 6 ++ .../opsworks/api_op_DescribeServiceErrors.go | 6 ++ ..._op_DescribeStackProvisioningParameters.go | 6 ++ .../opsworks/api_op_DescribeStackSummary.go | 6 ++ service/opsworks/api_op_DescribeStacks.go | 6 ++ .../api_op_DescribeTimeBasedAutoScaling.go | 6 ++ .../opsworks/api_op_DescribeUserProfiles.go | 6 ++ service/opsworks/api_op_DescribeVolumes.go | 6 ++ .../api_op_DetachElasticLoadBalancer.go | 6 ++ .../opsworks/api_op_DisassociateElasticIp.go | 6 ++ .../opsworks/api_op_GetHostnameSuggestion.go | 6 ++ service/opsworks/api_op_GrantAccess.go | 6 ++ service/opsworks/api_op_ListTags.go | 6 ++ service/opsworks/api_op_RebootInstance.go | 6 ++ service/opsworks/api_op_RegisterEcsCluster.go | 6 ++ service/opsworks/api_op_RegisterElasticIp.go | 6 ++ service/opsworks/api_op_RegisterInstance.go | 6 ++ .../opsworks/api_op_RegisterRdsDbInstance.go | 6 ++ service/opsworks/api_op_RegisterVolume.go | 6 ++ .../api_op_SetLoadBasedAutoScaling.go | 6 ++ service/opsworks/api_op_SetPermission.go | 6 ++ .../api_op_SetTimeBasedAutoScaling.go | 6 ++ service/opsworks/api_op_StartInstance.go | 6 ++ service/opsworks/api_op_StartStack.go | 6 ++ service/opsworks/api_op_StopInstance.go | 6 ++ service/opsworks/api_op_StopStack.go | 6 ++ service/opsworks/api_op_TagResource.go | 6 ++ service/opsworks/api_op_UnassignInstance.go | 6 ++ service/opsworks/api_op_UnassignVolume.go | 6 ++ service/opsworks/api_op_UntagResource.go | 6 ++ service/opsworks/api_op_UpdateApp.go | 6 ++ service/opsworks/api_op_UpdateElasticIp.go | 6 ++ service/opsworks/api_op_UpdateInstance.go | 6 ++ service/opsworks/api_op_UpdateLayer.go | 6 ++ .../opsworks/api_op_UpdateMyUserProfile.go | 6 ++ .../opsworks/api_op_UpdateRdsDbInstance.go | 6 ++ service/opsworks/api_op_UpdateStack.go | 6 ++ service/opsworks/api_op_UpdateUserProfile.go | 6 ++ service/opsworks/api_op_UpdateVolume.go | 6 ++ service/opsworks/go.mod | 4 +- service/opsworks/go.sum | 2 - service/opsworkscm/api_client.go | 52 ++++++++-- service/opsworkscm/api_op_AssociateNode.go | 6 ++ service/opsworkscm/api_op_CreateBackup.go | 6 ++ service/opsworkscm/api_op_CreateServer.go | 6 ++ service/opsworkscm/api_op_DeleteBackup.go | 6 ++ service/opsworkscm/api_op_DeleteServer.go | 6 ++ .../api_op_DescribeAccountAttributes.go | 6 ++ service/opsworkscm/api_op_DescribeBackups.go | 6 ++ service/opsworkscm/api_op_DescribeEvents.go | 6 ++ .../api_op_DescribeNodeAssociationStatus.go | 6 ++ service/opsworkscm/api_op_DescribeServers.go | 6 ++ service/opsworkscm/api_op_DisassociateNode.go | 6 ++ .../api_op_ExportServerEngineAttribute.go | 6 ++ .../opsworkscm/api_op_ListTagsForResource.go | 6 ++ service/opsworkscm/api_op_RestoreServer.go | 6 ++ service/opsworkscm/api_op_StartMaintenance.go | 6 ++ service/opsworkscm/api_op_TagResource.go | 6 ++ service/opsworkscm/api_op_UntagResource.go | 6 ++ service/opsworkscm/api_op_UpdateServer.go | 6 ++ .../api_op_UpdateServerEngineAttributes.go | 6 ++ service/opsworkscm/go.mod | 4 +- service/opsworkscm/go.sum | 2 - service/organizations/api_client.go | 52 ++++++++-- .../organizations/api_op_AcceptHandshake.go | 6 ++ service/organizations/api_op_AttachPolicy.go | 6 ++ .../organizations/api_op_CancelHandshake.go | 6 ++ service/organizations/api_op_CreateAccount.go | 6 ++ .../api_op_CreateGovCloudAccount.go | 6 ++ .../api_op_CreateOrganization.go | 6 ++ .../api_op_CreateOrganizationalUnit.go | 6 ++ service/organizations/api_op_CreatePolicy.go | 6 ++ .../organizations/api_op_DeclineHandshake.go | 6 ++ .../api_op_DeleteOrganization.go | 6 ++ .../api_op_DeleteOrganizationalUnit.go | 6 ++ service/organizations/api_op_DeletePolicy.go | 6 ++ ...api_op_DeregisterDelegatedAdministrator.go | 6 ++ .../organizations/api_op_DescribeAccount.go | 6 ++ .../api_op_DescribeCreateAccountStatus.go | 6 ++ .../api_op_DescribeEffectivePolicy.go | 6 ++ .../organizations/api_op_DescribeHandshake.go | 6 ++ .../api_op_DescribeOrganization.go | 6 ++ .../api_op_DescribeOrganizationalUnit.go | 6 ++ .../organizations/api_op_DescribePolicy.go | 6 ++ service/organizations/api_op_DetachPolicy.go | 6 ++ .../api_op_DisableAWSServiceAccess.go | 6 ++ .../organizations/api_op_DisablePolicyType.go | 6 ++ .../api_op_EnableAWSServiceAccess.go | 6 ++ .../organizations/api_op_EnableAllFeatures.go | 6 ++ .../organizations/api_op_EnablePolicyType.go | 6 ++ .../api_op_InviteAccountToOrganization.go | 6 ++ .../organizations/api_op_LeaveOrganization.go | 6 ++ ..._op_ListAWSServiceAccessForOrganization.go | 6 ++ service/organizations/api_op_ListAccounts.go | 6 ++ .../api_op_ListAccountsForParent.go | 6 ++ service/organizations/api_op_ListChildren.go | 6 ++ .../api_op_ListCreateAccountStatus.go | 6 ++ .../api_op_ListDelegatedAdministrators.go | 6 ++ .../api_op_ListDelegatedServicesForAccount.go | 6 ++ .../api_op_ListHandshakesForAccount.go | 6 ++ .../api_op_ListHandshakesForOrganization.go | 6 ++ ...api_op_ListOrganizationalUnitsForParent.go | 6 ++ service/organizations/api_op_ListParents.go | 6 ++ service/organizations/api_op_ListPolicies.go | 6 ++ .../api_op_ListPoliciesForTarget.go | 6 ++ service/organizations/api_op_ListRoots.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_ListTargetsForPolicy.go | 6 ++ service/organizations/api_op_MoveAccount.go | 6 ++ .../api_op_RegisterDelegatedAdministrator.go | 6 ++ .../api_op_RemoveAccountFromOrganization.go | 6 ++ service/organizations/api_op_TagResource.go | 6 ++ service/organizations/api_op_UntagResource.go | 6 ++ .../api_op_UpdateOrganizationalUnit.go | 6 ++ service/organizations/api_op_UpdatePolicy.go | 6 ++ service/organizations/go.mod | 4 +- service/organizations/go.sum | 2 - service/outposts/api_client.go | 52 ++++++++-- service/outposts/api_op_CreateOutpost.go | 6 ++ service/outposts/api_op_DeleteOutpost.go | 6 ++ service/outposts/api_op_DeleteSite.go | 6 ++ service/outposts/api_op_GetOutpost.go | 6 ++ .../api_op_GetOutpostInstanceTypes.go | 6 ++ service/outposts/api_op_ListOutposts.go | 6 ++ service/outposts/api_op_ListSites.go | 6 ++ service/outposts/go.mod | 4 +- service/outposts/go.sum | 2 - service/personalize/api_client.go | 52 ++++++++-- .../api_op_CreateBatchInferenceJob.go | 6 ++ service/personalize/api_op_CreateCampaign.go | 6 ++ service/personalize/api_op_CreateDataset.go | 6 ++ .../personalize/api_op_CreateDatasetGroup.go | 6 ++ .../api_op_CreateDatasetImportJob.go | 6 ++ .../personalize/api_op_CreateEventTracker.go | 6 ++ service/personalize/api_op_CreateFilter.go | 6 ++ service/personalize/api_op_CreateSchema.go | 6 ++ service/personalize/api_op_CreateSolution.go | 6 ++ .../api_op_CreateSolutionVersion.go | 6 ++ service/personalize/api_op_DeleteCampaign.go | 6 ++ service/personalize/api_op_DeleteDataset.go | 6 ++ .../personalize/api_op_DeleteDatasetGroup.go | 6 ++ .../personalize/api_op_DeleteEventTracker.go | 6 ++ service/personalize/api_op_DeleteFilter.go | 6 ++ service/personalize/api_op_DeleteSchema.go | 6 ++ service/personalize/api_op_DeleteSolution.go | 6 ++ .../personalize/api_op_DescribeAlgorithm.go | 6 ++ .../api_op_DescribeBatchInferenceJob.go | 6 ++ .../personalize/api_op_DescribeCampaign.go | 6 ++ service/personalize/api_op_DescribeDataset.go | 6 ++ .../api_op_DescribeDatasetGroup.go | 6 ++ .../api_op_DescribeDatasetImportJob.go | 6 ++ .../api_op_DescribeEventTracker.go | 6 ++ .../api_op_DescribeFeatureTransformation.go | 6 ++ service/personalize/api_op_DescribeFilter.go | 6 ++ service/personalize/api_op_DescribeRecipe.go | 6 ++ service/personalize/api_op_DescribeSchema.go | 6 ++ .../personalize/api_op_DescribeSolution.go | 6 ++ .../api_op_DescribeSolutionVersion.go | 6 ++ .../personalize/api_op_GetSolutionMetrics.go | 6 ++ .../api_op_ListBatchInferenceJobs.go | 6 ++ service/personalize/api_op_ListCampaigns.go | 6 ++ .../personalize/api_op_ListDatasetGroups.go | 6 ++ .../api_op_ListDatasetImportJobs.go | 6 ++ service/personalize/api_op_ListDatasets.go | 6 ++ .../personalize/api_op_ListEventTrackers.go | 6 ++ service/personalize/api_op_ListFilters.go | 6 ++ service/personalize/api_op_ListRecipes.go | 6 ++ service/personalize/api_op_ListSchemas.go | 6 ++ .../api_op_ListSolutionVersions.go | 6 ++ service/personalize/api_op_ListSolutions.go | 6 ++ service/personalize/api_op_UpdateCampaign.go | 6 ++ service/personalize/go.mod | 4 +- service/personalize/go.sum | 2 - service/personalizeevents/api_client.go | 52 ++++++++-- service/personalizeevents/api_op_PutEvents.go | 6 ++ service/personalizeevents/api_op_PutItems.go | 6 ++ service/personalizeevents/api_op_PutUsers.go | 6 ++ service/personalizeevents/go.mod | 4 +- service/personalizeevents/go.sum | 2 - service/personalizeruntime/api_client.go | 52 ++++++++-- .../api_op_GetPersonalizedRanking.go | 6 ++ .../api_op_GetRecommendations.go | 6 ++ service/personalizeruntime/go.mod | 4 +- service/personalizeruntime/go.sum | 2 - service/pi/api_client.go | 52 ++++++++-- service/pi/api_op_DescribeDimensionKeys.go | 6 ++ service/pi/api_op_GetResourceMetrics.go | 6 ++ service/pi/go.mod | 4 +- service/pi/go.sum | 2 - service/pinpoint/api_client.go | 52 ++++++++-- service/pinpoint/api_op_CreateApp.go | 6 ++ service/pinpoint/api_op_CreateCampaign.go | 6 ++ .../pinpoint/api_op_CreateEmailTemplate.go | 6 ++ service/pinpoint/api_op_CreateExportJob.go | 6 ++ service/pinpoint/api_op_CreateImportJob.go | 6 ++ service/pinpoint/api_op_CreateJourney.go | 6 ++ service/pinpoint/api_op_CreatePushTemplate.go | 6 ++ .../api_op_CreateRecommenderConfiguration.go | 6 ++ service/pinpoint/api_op_CreateSegment.go | 6 ++ service/pinpoint/api_op_CreateSmsTemplate.go | 6 ++ .../pinpoint/api_op_CreateVoiceTemplate.go | 6 ++ service/pinpoint/api_op_DeleteAdmChannel.go | 6 ++ service/pinpoint/api_op_DeleteApnsChannel.go | 6 ++ .../api_op_DeleteApnsSandboxChannel.go | 6 ++ .../pinpoint/api_op_DeleteApnsVoipChannel.go | 6 ++ .../api_op_DeleteApnsVoipSandboxChannel.go | 6 ++ service/pinpoint/api_op_DeleteApp.go | 6 ++ service/pinpoint/api_op_DeleteBaiduChannel.go | 6 ++ service/pinpoint/api_op_DeleteCampaign.go | 6 ++ service/pinpoint/api_op_DeleteEmailChannel.go | 6 ++ .../pinpoint/api_op_DeleteEmailTemplate.go | 6 ++ service/pinpoint/api_op_DeleteEndpoint.go | 6 ++ service/pinpoint/api_op_DeleteEventStream.go | 6 ++ service/pinpoint/api_op_DeleteGcmChannel.go | 6 ++ service/pinpoint/api_op_DeleteJourney.go | 6 ++ service/pinpoint/api_op_DeletePushTemplate.go | 6 ++ .../api_op_DeleteRecommenderConfiguration.go | 6 ++ service/pinpoint/api_op_DeleteSegment.go | 6 ++ service/pinpoint/api_op_DeleteSmsChannel.go | 6 ++ service/pinpoint/api_op_DeleteSmsTemplate.go | 6 ++ .../pinpoint/api_op_DeleteUserEndpoints.go | 6 ++ service/pinpoint/api_op_DeleteVoiceChannel.go | 6 ++ .../pinpoint/api_op_DeleteVoiceTemplate.go | 6 ++ service/pinpoint/api_op_GetAdmChannel.go | 6 ++ service/pinpoint/api_op_GetApnsChannel.go | 6 ++ .../pinpoint/api_op_GetApnsSandboxChannel.go | 6 ++ service/pinpoint/api_op_GetApnsVoipChannel.go | 6 ++ .../api_op_GetApnsVoipSandboxChannel.go | 6 ++ service/pinpoint/api_op_GetApp.go | 6 ++ .../api_op_GetApplicationDateRangeKpi.go | 6 ++ .../pinpoint/api_op_GetApplicationSettings.go | 6 ++ service/pinpoint/api_op_GetApps.go | 6 ++ service/pinpoint/api_op_GetBaiduChannel.go | 6 ++ service/pinpoint/api_op_GetCampaign.go | 6 ++ .../pinpoint/api_op_GetCampaignActivities.go | 6 ++ .../api_op_GetCampaignDateRangeKpi.go | 6 ++ service/pinpoint/api_op_GetCampaignVersion.go | 6 ++ .../pinpoint/api_op_GetCampaignVersions.go | 6 ++ service/pinpoint/api_op_GetCampaigns.go | 6 ++ service/pinpoint/api_op_GetChannels.go | 6 ++ service/pinpoint/api_op_GetEmailChannel.go | 6 ++ service/pinpoint/api_op_GetEmailTemplate.go | 6 ++ service/pinpoint/api_op_GetEndpoint.go | 6 ++ service/pinpoint/api_op_GetEventStream.go | 6 ++ service/pinpoint/api_op_GetExportJob.go | 6 ++ service/pinpoint/api_op_GetExportJobs.go | 6 ++ service/pinpoint/api_op_GetGcmChannel.go | 6 ++ service/pinpoint/api_op_GetImportJob.go | 6 ++ service/pinpoint/api_op_GetImportJobs.go | 6 ++ service/pinpoint/api_op_GetJourney.go | 6 ++ .../pinpoint/api_op_GetJourneyDateRangeKpi.go | 6 ++ ...i_op_GetJourneyExecutionActivityMetrics.go | 6 ++ .../api_op_GetJourneyExecutionMetrics.go | 6 ++ service/pinpoint/api_op_GetPushTemplate.go | 6 ++ .../api_op_GetRecommenderConfiguration.go | 6 ++ .../api_op_GetRecommenderConfigurations.go | 6 ++ service/pinpoint/api_op_GetSegment.go | 6 ++ .../pinpoint/api_op_GetSegmentExportJobs.go | 6 ++ .../pinpoint/api_op_GetSegmentImportJobs.go | 6 ++ service/pinpoint/api_op_GetSegmentVersion.go | 6 ++ service/pinpoint/api_op_GetSegmentVersions.go | 6 ++ service/pinpoint/api_op_GetSegments.go | 6 ++ service/pinpoint/api_op_GetSmsChannel.go | 6 ++ service/pinpoint/api_op_GetSmsTemplate.go | 6 ++ service/pinpoint/api_op_GetUserEndpoints.go | 6 ++ service/pinpoint/api_op_GetVoiceChannel.go | 6 ++ service/pinpoint/api_op_GetVoiceTemplate.go | 6 ++ service/pinpoint/api_op_ListJourneys.go | 6 ++ .../pinpoint/api_op_ListTagsForResource.go | 6 ++ .../pinpoint/api_op_ListTemplateVersions.go | 6 ++ service/pinpoint/api_op_ListTemplates.go | 6 ++ .../pinpoint/api_op_PhoneNumberValidate.go | 6 ++ service/pinpoint/api_op_PutEventStream.go | 6 ++ service/pinpoint/api_op_PutEvents.go | 6 ++ service/pinpoint/api_op_RemoveAttributes.go | 6 ++ service/pinpoint/api_op_SendMessages.go | 6 ++ service/pinpoint/api_op_SendUsersMessages.go | 6 ++ service/pinpoint/api_op_TagResource.go | 6 ++ service/pinpoint/api_op_UntagResource.go | 6 ++ service/pinpoint/api_op_UpdateAdmChannel.go | 6 ++ service/pinpoint/api_op_UpdateApnsChannel.go | 6 ++ .../api_op_UpdateApnsSandboxChannel.go | 6 ++ .../pinpoint/api_op_UpdateApnsVoipChannel.go | 6 ++ .../api_op_UpdateApnsVoipSandboxChannel.go | 6 ++ .../api_op_UpdateApplicationSettings.go | 6 ++ service/pinpoint/api_op_UpdateBaiduChannel.go | 6 ++ service/pinpoint/api_op_UpdateCampaign.go | 6 ++ service/pinpoint/api_op_UpdateEmailChannel.go | 6 ++ .../pinpoint/api_op_UpdateEmailTemplate.go | 6 ++ service/pinpoint/api_op_UpdateEndpoint.go | 6 ++ .../pinpoint/api_op_UpdateEndpointsBatch.go | 6 ++ service/pinpoint/api_op_UpdateGcmChannel.go | 6 ++ service/pinpoint/api_op_UpdateJourney.go | 6 ++ service/pinpoint/api_op_UpdateJourneyState.go | 6 ++ service/pinpoint/api_op_UpdatePushTemplate.go | 6 ++ .../api_op_UpdateRecommenderConfiguration.go | 6 ++ service/pinpoint/api_op_UpdateSegment.go | 6 ++ service/pinpoint/api_op_UpdateSmsChannel.go | 6 ++ service/pinpoint/api_op_UpdateSmsTemplate.go | 6 ++ .../api_op_UpdateTemplateActiveVersion.go | 6 ++ service/pinpoint/api_op_UpdateVoiceChannel.go | 6 ++ .../pinpoint/api_op_UpdateVoiceTemplate.go | 6 ++ service/pinpoint/go.mod | 4 +- service/pinpoint/go.sum | 2 - service/pinpointemail/api_client.go | 52 ++++++++-- .../api_op_CreateConfigurationSet.go | 6 ++ ..._CreateConfigurationSetEventDestination.go | 6 ++ .../api_op_CreateDedicatedIpPool.go | 6 ++ .../api_op_CreateDeliverabilityTestReport.go | 6 ++ .../api_op_CreateEmailIdentity.go | 6 ++ .../api_op_DeleteConfigurationSet.go | 6 ++ ..._DeleteConfigurationSetEventDestination.go | 6 ++ .../api_op_DeleteDedicatedIpPool.go | 6 ++ .../api_op_DeleteEmailIdentity.go | 6 ++ service/pinpointemail/api_op_GetAccount.go | 6 ++ .../api_op_GetBlacklistReports.go | 6 ++ .../api_op_GetConfigurationSet.go | 6 ++ ...op_GetConfigurationSetEventDestinations.go | 6 ++ .../pinpointemail/api_op_GetDedicatedIp.go | 6 ++ .../pinpointemail/api_op_GetDedicatedIps.go | 6 ++ ...pi_op_GetDeliverabilityDashboardOptions.go | 6 ++ .../api_op_GetDeliverabilityTestReport.go | 6 ++ .../api_op_GetDomainDeliverabilityCampaign.go | 6 ++ .../api_op_GetDomainStatisticsReport.go | 6 ++ .../pinpointemail/api_op_GetEmailIdentity.go | 6 ++ .../api_op_ListConfigurationSets.go | 6 ++ .../api_op_ListDedicatedIpPools.go | 6 ++ .../api_op_ListDeliverabilityTestReports.go | 6 ++ ...pi_op_ListDomainDeliverabilityCampaigns.go | 6 ++ .../api_op_ListEmailIdentities.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ ...p_PutAccountDedicatedIpWarmupAttributes.go | 6 ++ .../api_op_PutAccountSendingAttributes.go | 6 ++ ...i_op_PutConfigurationSetDeliveryOptions.go | 6 ++ ...op_PutConfigurationSetReputationOptions.go | 6 ++ ...pi_op_PutConfigurationSetSendingOptions.go | 6 ++ ...i_op_PutConfigurationSetTrackingOptions.go | 6 ++ .../api_op_PutDedicatedIpInPool.go | 6 ++ .../api_op_PutDedicatedIpWarmupAttributes.go | 6 ++ ...api_op_PutDeliverabilityDashboardOption.go | 6 ++ .../api_op_PutEmailIdentityDkimAttributes.go | 6 ++ ...i_op_PutEmailIdentityFeedbackAttributes.go | 6 ++ ...i_op_PutEmailIdentityMailFromAttributes.go | 6 ++ service/pinpointemail/api_op_SendEmail.go | 6 ++ service/pinpointemail/api_op_TagResource.go | 6 ++ service/pinpointemail/api_op_UntagResource.go | 6 ++ ..._UpdateConfigurationSetEventDestination.go | 6 ++ service/pinpointemail/go.mod | 4 +- service/pinpointemail/go.sum | 2 - service/pinpointsmsvoice/api_client.go | 52 ++++++++-- .../api_op_CreateConfigurationSet.go | 6 ++ ..._CreateConfigurationSetEventDestination.go | 6 ++ .../api_op_DeleteConfigurationSet.go | 6 ++ ..._DeleteConfigurationSetEventDestination.go | 6 ++ ...op_GetConfigurationSetEventDestinations.go | 6 ++ .../api_op_ListConfigurationSets.go | 6 ++ .../api_op_SendVoiceMessage.go | 6 ++ ..._UpdateConfigurationSetEventDestination.go | 6 ++ service/pinpointsmsvoice/go.mod | 4 +- service/pinpointsmsvoice/go.sum | 2 - service/polly/api_client.go | 52 ++++++++-- service/polly/api_op_DeleteLexicon.go | 6 ++ service/polly/api_op_DescribeVoices.go | 6 ++ service/polly/api_op_GetLexicon.go | 6 ++ .../polly/api_op_GetSpeechSynthesisTask.go | 6 ++ service/polly/api_op_ListLexicons.go | 6 ++ .../polly/api_op_ListSpeechSynthesisTasks.go | 6 ++ service/polly/api_op_PutLexicon.go | 6 ++ .../polly/api_op_StartSpeechSynthesisTask.go | 6 ++ service/polly/api_op_SynthesizeSpeech.go | 6 ++ service/polly/go.mod | 4 +- service/polly/go.sum | 2 - service/pricing/api_client.go | 52 ++++++++-- service/pricing/api_op_DescribeServices.go | 6 ++ service/pricing/api_op_GetAttributeValues.go | 6 ++ service/pricing/api_op_GetProducts.go | 6 ++ service/pricing/go.mod | 4 +- service/pricing/go.sum | 2 - service/qldb/api_client.go | 52 ++++++++-- .../qldb/api_op_CancelJournalKinesisStream.go | 6 ++ service/qldb/api_op_CreateLedger.go | 6 ++ service/qldb/api_op_DeleteLedger.go | 6 ++ .../api_op_DescribeJournalKinesisStream.go | 6 ++ .../qldb/api_op_DescribeJournalS3Export.go | 6 ++ service/qldb/api_op_DescribeLedger.go | 6 ++ service/qldb/api_op_ExportJournalToS3.go | 6 ++ service/qldb/api_op_GetBlock.go | 6 ++ service/qldb/api_op_GetDigest.go | 6 ++ service/qldb/api_op_GetRevision.go | 6 ++ ...i_op_ListJournalKinesisStreamsForLedger.go | 6 ++ service/qldb/api_op_ListJournalS3Exports.go | 6 ++ .../api_op_ListJournalS3ExportsForLedger.go | 6 ++ service/qldb/api_op_ListLedgers.go | 6 ++ service/qldb/api_op_ListTagsForResource.go | 6 ++ service/qldb/api_op_StreamJournalToKinesis.go | 6 ++ service/qldb/api_op_TagResource.go | 6 ++ service/qldb/api_op_UntagResource.go | 6 ++ service/qldb/api_op_UpdateLedger.go | 6 ++ service/qldb/go.mod | 4 +- service/qldb/go.sum | 2 - service/qldbsession/api_client.go | 52 ++++++++-- service/qldbsession/api_op_SendCommand.go | 6 ++ service/qldbsession/go.mod | 4 +- service/qldbsession/go.sum | 2 - service/quicksight/api_client.go | 52 ++++++++-- service/quicksight/api_op_CancelIngestion.go | 6 ++ .../api_op_CreateAccountCustomization.go | 6 ++ service/quicksight/api_op_CreateAnalysis.go | 6 ++ service/quicksight/api_op_CreateDashboard.go | 6 ++ service/quicksight/api_op_CreateDataSet.go | 6 ++ service/quicksight/api_op_CreateDataSource.go | 6 ++ service/quicksight/api_op_CreateGroup.go | 6 ++ .../api_op_CreateGroupMembership.go | 6 ++ .../api_op_CreateIAMPolicyAssignment.go | 6 ++ service/quicksight/api_op_CreateIngestion.go | 6 ++ service/quicksight/api_op_CreateNamespace.go | 6 ++ service/quicksight/api_op_CreateTemplate.go | 6 ++ .../quicksight/api_op_CreateTemplateAlias.go | 6 ++ service/quicksight/api_op_CreateTheme.go | 6 ++ service/quicksight/api_op_CreateThemeAlias.go | 6 ++ .../api_op_DeleteAccountCustomization.go | 6 ++ service/quicksight/api_op_DeleteAnalysis.go | 6 ++ service/quicksight/api_op_DeleteDashboard.go | 6 ++ service/quicksight/api_op_DeleteDataSet.go | 6 ++ service/quicksight/api_op_DeleteDataSource.go | 6 ++ service/quicksight/api_op_DeleteGroup.go | 6 ++ .../api_op_DeleteGroupMembership.go | 6 ++ .../api_op_DeleteIAMPolicyAssignment.go | 6 ++ service/quicksight/api_op_DeleteNamespace.go | 6 ++ service/quicksight/api_op_DeleteTemplate.go | 6 ++ .../quicksight/api_op_DeleteTemplateAlias.go | 6 ++ service/quicksight/api_op_DeleteTheme.go | 6 ++ service/quicksight/api_op_DeleteThemeAlias.go | 6 ++ service/quicksight/api_op_DeleteUser.go | 6 ++ .../api_op_DeleteUserByPrincipalId.go | 6 ++ .../api_op_DescribeAccountCustomization.go | 6 ++ .../api_op_DescribeAccountSettings.go | 6 ++ service/quicksight/api_op_DescribeAnalysis.go | 6 ++ .../api_op_DescribeAnalysisPermissions.go | 6 ++ .../quicksight/api_op_DescribeDashboard.go | 6 ++ .../api_op_DescribeDashboardPermissions.go | 6 ++ service/quicksight/api_op_DescribeDataSet.go | 6 ++ .../api_op_DescribeDataSetPermissions.go | 6 ++ .../quicksight/api_op_DescribeDataSource.go | 6 ++ .../api_op_DescribeDataSourcePermissions.go | 6 ++ service/quicksight/api_op_DescribeGroup.go | 6 ++ .../api_op_DescribeIAMPolicyAssignment.go | 6 ++ .../quicksight/api_op_DescribeIngestion.go | 6 ++ .../quicksight/api_op_DescribeNamespace.go | 6 ++ service/quicksight/api_op_DescribeTemplate.go | 6 ++ .../api_op_DescribeTemplateAlias.go | 6 ++ .../api_op_DescribeTemplatePermissions.go | 6 ++ service/quicksight/api_op_DescribeTheme.go | 6 ++ .../quicksight/api_op_DescribeThemeAlias.go | 6 ++ .../api_op_DescribeThemePermissions.go | 6 ++ service/quicksight/api_op_DescribeUser.go | 6 ++ .../quicksight/api_op_GetDashboardEmbedUrl.go | 6 ++ .../quicksight/api_op_GetSessionEmbedUrl.go | 6 ++ service/quicksight/api_op_ListAnalyses.go | 6 ++ .../api_op_ListDashboardVersions.go | 6 ++ service/quicksight/api_op_ListDashboards.go | 6 ++ service/quicksight/api_op_ListDataSets.go | 6 ++ service/quicksight/api_op_ListDataSources.go | 6 ++ .../quicksight/api_op_ListGroupMemberships.go | 6 ++ service/quicksight/api_op_ListGroups.go | 6 ++ .../api_op_ListIAMPolicyAssignments.go | 6 ++ .../api_op_ListIAMPolicyAssignmentsForUser.go | 6 ++ service/quicksight/api_op_ListIngestions.go | 6 ++ service/quicksight/api_op_ListNamespaces.go | 6 ++ .../quicksight/api_op_ListTagsForResource.go | 6 ++ .../quicksight/api_op_ListTemplateAliases.go | 6 ++ .../quicksight/api_op_ListTemplateVersions.go | 6 ++ service/quicksight/api_op_ListTemplates.go | 6 ++ service/quicksight/api_op_ListThemeAliases.go | 6 ++ .../quicksight/api_op_ListThemeVersions.go | 6 ++ service/quicksight/api_op_ListThemes.go | 6 ++ service/quicksight/api_op_ListUserGroups.go | 6 ++ service/quicksight/api_op_ListUsers.go | 6 ++ service/quicksight/api_op_RegisterUser.go | 6 ++ service/quicksight/api_op_RestoreAnalysis.go | 6 ++ service/quicksight/api_op_SearchAnalyses.go | 6 ++ service/quicksight/api_op_SearchDashboards.go | 6 ++ service/quicksight/api_op_TagResource.go | 6 ++ service/quicksight/api_op_UntagResource.go | 6 ++ .../api_op_UpdateAccountCustomization.go | 6 ++ .../api_op_UpdateAccountSettings.go | 6 ++ service/quicksight/api_op_UpdateAnalysis.go | 6 ++ .../api_op_UpdateAnalysisPermissions.go | 6 ++ service/quicksight/api_op_UpdateDashboard.go | 6 ++ .../api_op_UpdateDashboardPermissions.go | 6 ++ .../api_op_UpdateDashboardPublishedVersion.go | 6 ++ service/quicksight/api_op_UpdateDataSet.go | 6 ++ .../api_op_UpdateDataSetPermissions.go | 6 ++ service/quicksight/api_op_UpdateDataSource.go | 6 ++ .../api_op_UpdateDataSourcePermissions.go | 6 ++ service/quicksight/api_op_UpdateGroup.go | 6 ++ .../api_op_UpdateIAMPolicyAssignment.go | 6 ++ service/quicksight/api_op_UpdateTemplate.go | 6 ++ .../quicksight/api_op_UpdateTemplateAlias.go | 6 ++ .../api_op_UpdateTemplatePermissions.go | 6 ++ service/quicksight/api_op_UpdateTheme.go | 6 ++ service/quicksight/api_op_UpdateThemeAlias.go | 6 ++ .../api_op_UpdateThemePermissions.go | 6 ++ service/quicksight/api_op_UpdateUser.go | 6 ++ service/quicksight/go.mod | 4 +- service/quicksight/go.sum | 2 - service/ram/api_client.go | 52 ++++++++-- .../api_op_AcceptResourceShareInvitation.go | 6 ++ service/ram/api_op_AssociateResourceShare.go | 6 ++ ...api_op_AssociateResourceSharePermission.go | 6 ++ service/ram/api_op_CreateResourceShare.go | 6 ++ service/ram/api_op_DeleteResourceShare.go | 6 ++ .../ram/api_op_DisassociateResourceShare.go | 6 ++ ..._op_DisassociateResourceSharePermission.go | 6 ++ ...api_op_EnableSharingWithAwsOrganization.go | 6 ++ service/ram/api_op_GetPermission.go | 6 ++ service/ram/api_op_GetResourcePolicies.go | 6 ++ .../api_op_GetResourceShareAssociations.go | 6 ++ .../ram/api_op_GetResourceShareInvitations.go | 6 ++ service/ram/api_op_GetResourceShares.go | 6 ++ .../api_op_ListPendingInvitationResources.go | 6 ++ service/ram/api_op_ListPermissions.go | 6 ++ service/ram/api_op_ListPrincipals.go | 6 ++ .../api_op_ListResourceSharePermissions.go | 6 ++ service/ram/api_op_ListResourceTypes.go | 6 ++ service/ram/api_op_ListResources.go | 6 ++ ...p_PromoteResourceShareCreatedFromPolicy.go | 6 ++ .../api_op_RejectResourceShareInvitation.go | 6 ++ service/ram/api_op_TagResource.go | 6 ++ service/ram/api_op_UntagResource.go | 6 ++ service/ram/api_op_UpdateResourceShare.go | 6 ++ service/ram/go.mod | 4 +- service/ram/go.sum | 2 - service/rds/api_client.go | 52 ++++++++-- service/rds/api_op_AddRoleToDBCluster.go | 6 ++ service/rds/api_op_AddRoleToDBInstance.go | 6 ++ ...pi_op_AddSourceIdentifierToSubscription.go | 6 ++ service/rds/api_op_AddTagsToResource.go | 6 ++ .../api_op_ApplyPendingMaintenanceAction.go | 6 ++ .../api_op_AuthorizeDBSecurityGroupIngress.go | 6 ++ service/rds/api_op_BacktrackDBCluster.go | 6 ++ service/rds/api_op_CancelExportTask.go | 6 ++ .../rds/api_op_CopyDBClusterParameterGroup.go | 6 ++ service/rds/api_op_CopyDBClusterSnapshot.go | 6 ++ service/rds/api_op_CopyDBParameterGroup.go | 6 ++ service/rds/api_op_CopyDBSnapshot.go | 6 ++ service/rds/api_op_CopyOptionGroup.go | 6 ++ .../api_op_CreateCustomAvailabilityZone.go | 6 ++ service/rds/api_op_CreateDBCluster.go | 6 ++ service/rds/api_op_CreateDBClusterEndpoint.go | 6 ++ .../api_op_CreateDBClusterParameterGroup.go | 6 ++ service/rds/api_op_CreateDBClusterSnapshot.go | 6 ++ service/rds/api_op_CreateDBInstance.go | 6 ++ .../rds/api_op_CreateDBInstanceReadReplica.go | 6 ++ service/rds/api_op_CreateDBParameterGroup.go | 6 ++ service/rds/api_op_CreateDBProxy.go | 6 ++ service/rds/api_op_CreateDBSecurityGroup.go | 6 ++ service/rds/api_op_CreateDBSnapshot.go | 6 ++ service/rds/api_op_CreateDBSubnetGroup.go | 6 ++ service/rds/api_op_CreateEventSubscription.go | 6 ++ service/rds/api_op_CreateGlobalCluster.go | 6 ++ service/rds/api_op_CreateOptionGroup.go | 6 ++ .../api_op_DeleteCustomAvailabilityZone.go | 6 ++ service/rds/api_op_DeleteDBCluster.go | 6 ++ service/rds/api_op_DeleteDBClusterEndpoint.go | 6 ++ .../api_op_DeleteDBClusterParameterGroup.go | 6 ++ service/rds/api_op_DeleteDBClusterSnapshot.go | 6 ++ service/rds/api_op_DeleteDBInstance.go | 6 ++ .../api_op_DeleteDBInstanceAutomatedBackup.go | 6 ++ service/rds/api_op_DeleteDBParameterGroup.go | 6 ++ service/rds/api_op_DeleteDBProxy.go | 6 ++ service/rds/api_op_DeleteDBSecurityGroup.go | 6 ++ service/rds/api_op_DeleteDBSnapshot.go | 6 ++ service/rds/api_op_DeleteDBSubnetGroup.go | 6 ++ service/rds/api_op_DeleteEventSubscription.go | 6 ++ service/rds/api_op_DeleteGlobalCluster.go | 6 ++ service/rds/api_op_DeleteInstallationMedia.go | 6 ++ service/rds/api_op_DeleteOptionGroup.go | 6 ++ .../rds/api_op_DeregisterDBProxyTargets.go | 6 ++ .../rds/api_op_DescribeAccountAttributes.go | 6 ++ service/rds/api_op_DescribeCertificates.go | 6 ++ .../api_op_DescribeCustomAvailabilityZones.go | 6 ++ .../rds/api_op_DescribeDBClusterBacktracks.go | 6 ++ .../rds/api_op_DescribeDBClusterEndpoints.go | 6 ++ ...api_op_DescribeDBClusterParameterGroups.go | 6 ++ .../rds/api_op_DescribeDBClusterParameters.go | 6 ++ ..._op_DescribeDBClusterSnapshotAttributes.go | 6 ++ .../rds/api_op_DescribeDBClusterSnapshots.go | 6 ++ service/rds/api_op_DescribeDBClusters.go | 6 ++ .../rds/api_op_DescribeDBEngineVersions.go | 6 ++ ...i_op_DescribeDBInstanceAutomatedBackups.go | 6 ++ service/rds/api_op_DescribeDBInstances.go | 6 ++ service/rds/api_op_DescribeDBLogFiles.go | 6 ++ .../rds/api_op_DescribeDBParameterGroups.go | 6 ++ service/rds/api_op_DescribeDBParameters.go | 6 ++ service/rds/api_op_DescribeDBProxies.go | 6 ++ .../rds/api_op_DescribeDBProxyTargetGroups.go | 6 ++ service/rds/api_op_DescribeDBProxyTargets.go | 6 ++ .../rds/api_op_DescribeDBSecurityGroups.go | 6 ++ .../api_op_DescribeDBSnapshotAttributes.go | 6 ++ service/rds/api_op_DescribeDBSnapshots.go | 6 ++ service/rds/api_op_DescribeDBSubnetGroups.go | 6 ++ ..._DescribeEngineDefaultClusterParameters.go | 6 ++ .../api_op_DescribeEngineDefaultParameters.go | 6 ++ service/rds/api_op_DescribeEventCategories.go | 6 ++ .../rds/api_op_DescribeEventSubscriptions.go | 6 ++ service/rds/api_op_DescribeEvents.go | 6 ++ service/rds/api_op_DescribeExportTasks.go | 6 ++ service/rds/api_op_DescribeGlobalClusters.go | 6 ++ .../rds/api_op_DescribeInstallationMedia.go | 6 ++ .../rds/api_op_DescribeOptionGroupOptions.go | 6 ++ service/rds/api_op_DescribeOptionGroups.go | 6 ++ ...i_op_DescribeOrderableDBInstanceOptions.go | 6 ++ ...pi_op_DescribePendingMaintenanceActions.go | 6 ++ .../rds/api_op_DescribeReservedDBInstances.go | 6 ++ ...op_DescribeReservedDBInstancesOfferings.go | 6 ++ service/rds/api_op_DescribeSourceRegions.go | 6 ++ ...op_DescribeValidDBInstanceModifications.go | 6 ++ .../rds/api_op_DownloadDBLogFilePortion.go | 6 ++ service/rds/api_op_FailoverDBCluster.go | 6 ++ service/rds/api_op_ImportInstallationMedia.go | 6 ++ service/rds/api_op_ListTagsForResource.go | 6 ++ service/rds/api_op_ModifyCertificates.go | 6 ++ .../api_op_ModifyCurrentDBClusterCapacity.go | 6 ++ service/rds/api_op_ModifyDBCluster.go | 6 ++ service/rds/api_op_ModifyDBClusterEndpoint.go | 6 ++ .../api_op_ModifyDBClusterParameterGroup.go | 6 ++ ...api_op_ModifyDBClusterSnapshotAttribute.go | 6 ++ service/rds/api_op_ModifyDBInstance.go | 6 ++ service/rds/api_op_ModifyDBParameterGroup.go | 6 ++ service/rds/api_op_ModifyDBProxy.go | 6 ++ .../rds/api_op_ModifyDBProxyTargetGroup.go | 6 ++ service/rds/api_op_ModifyDBSnapshot.go | 6 ++ .../rds/api_op_ModifyDBSnapshotAttribute.go | 6 ++ service/rds/api_op_ModifyDBSubnetGroup.go | 6 ++ service/rds/api_op_ModifyEventSubscription.go | 6 ++ service/rds/api_op_ModifyGlobalCluster.go | 6 ++ service/rds/api_op_ModifyOptionGroup.go | 6 ++ service/rds/api_op_PromoteReadReplica.go | 6 ++ .../rds/api_op_PromoteReadReplicaDBCluster.go | 6 ++ ..._op_PurchaseReservedDBInstancesOffering.go | 6 ++ service/rds/api_op_RebootDBInstance.go | 6 ++ service/rds/api_op_RegisterDBProxyTargets.go | 6 ++ service/rds/api_op_RemoveFromGlobalCluster.go | 6 ++ service/rds/api_op_RemoveRoleFromDBCluster.go | 6 ++ .../rds/api_op_RemoveRoleFromDBInstance.go | 6 ++ ..._RemoveSourceIdentifierFromSubscription.go | 6 ++ service/rds/api_op_RemoveTagsFromResource.go | 6 ++ .../api_op_ResetDBClusterParameterGroup.go | 6 ++ service/rds/api_op_ResetDBParameterGroup.go | 6 ++ service/rds/api_op_RestoreDBClusterFromS3.go | 6 ++ .../api_op_RestoreDBClusterFromSnapshot.go | 6 ++ .../api_op_RestoreDBClusterToPointInTime.go | 6 ++ .../api_op_RestoreDBInstanceFromDBSnapshot.go | 6 ++ service/rds/api_op_RestoreDBInstanceFromS3.go | 6 ++ .../api_op_RestoreDBInstanceToPointInTime.go | 6 ++ .../api_op_RevokeDBSecurityGroupIngress.go | 6 ++ service/rds/api_op_StartActivityStream.go | 6 ++ service/rds/api_op_StartDBCluster.go | 6 ++ service/rds/api_op_StartDBInstance.go | 6 ++ service/rds/api_op_StartExportTask.go | 6 ++ service/rds/api_op_StopActivityStream.go | 6 ++ service/rds/api_op_StopDBCluster.go | 6 ++ service/rds/api_op_StopDBInstance.go | 6 ++ service/rds/go.mod | 2 +- service/rds/go.sum | 2 - service/rdsdata/api_client.go | 52 ++++++++-- .../rdsdata/api_op_BatchExecuteStatement.go | 6 ++ service/rdsdata/api_op_BeginTransaction.go | 6 ++ service/rdsdata/api_op_CommitTransaction.go | 6 ++ service/rdsdata/api_op_ExecuteSql.go | 6 ++ service/rdsdata/api_op_ExecuteStatement.go | 6 ++ service/rdsdata/api_op_RollbackTransaction.go | 6 ++ service/rdsdata/go.mod | 4 +- service/rdsdata/go.sum | 2 - service/redshift/api_client.go | 52 ++++++++-- .../api_op_AcceptReservedNodeExchange.go | 6 ++ ...op_AuthorizeClusterSecurityGroupIngress.go | 6 ++ .../api_op_AuthorizeSnapshotAccess.go | 6 ++ .../api_op_BatchDeleteClusterSnapshots.go | 6 ++ .../api_op_BatchModifyClusterSnapshots.go | 6 ++ service/redshift/api_op_CancelResize.go | 6 ++ .../redshift/api_op_CopyClusterSnapshot.go | 6 ++ service/redshift/api_op_CreateCluster.go | 6 ++ .../api_op_CreateClusterParameterGroup.go | 6 ++ .../api_op_CreateClusterSecurityGroup.go | 6 ++ .../redshift/api_op_CreateClusterSnapshot.go | 6 ++ .../api_op_CreateClusterSubnetGroup.go | 6 ++ .../api_op_CreateEventSubscription.go | 6 ++ .../api_op_CreateHsmClientCertificate.go | 6 ++ .../redshift/api_op_CreateHsmConfiguration.go | 6 ++ .../redshift/api_op_CreateScheduledAction.go | 6 ++ .../api_op_CreateSnapshotCopyGrant.go | 6 ++ .../redshift/api_op_CreateSnapshotSchedule.go | 6 ++ service/redshift/api_op_CreateTags.go | 6 ++ service/redshift/api_op_CreateUsageLimit.go | 6 ++ service/redshift/api_op_DeleteCluster.go | 6 ++ .../api_op_DeleteClusterParameterGroup.go | 6 ++ .../api_op_DeleteClusterSecurityGroup.go | 6 ++ .../redshift/api_op_DeleteClusterSnapshot.go | 6 ++ .../api_op_DeleteClusterSubnetGroup.go | 6 ++ .../api_op_DeleteEventSubscription.go | 6 ++ .../api_op_DeleteHsmClientCertificate.go | 6 ++ .../redshift/api_op_DeleteHsmConfiguration.go | 6 ++ .../redshift/api_op_DeleteScheduledAction.go | 6 ++ .../api_op_DeleteSnapshotCopyGrant.go | 6 ++ .../redshift/api_op_DeleteSnapshotSchedule.go | 6 ++ service/redshift/api_op_DeleteTags.go | 6 ++ service/redshift/api_op_DeleteUsageLimit.go | 6 ++ .../api_op_DescribeAccountAttributes.go | 6 ++ .../api_op_DescribeClusterDbRevisions.go | 6 ++ .../api_op_DescribeClusterParameterGroups.go | 6 ++ .../api_op_DescribeClusterParameters.go | 6 ++ .../api_op_DescribeClusterSecurityGroups.go | 6 ++ .../api_op_DescribeClusterSnapshots.go | 6 ++ .../api_op_DescribeClusterSubnetGroups.go | 6 ++ .../redshift/api_op_DescribeClusterTracks.go | 6 ++ .../api_op_DescribeClusterVersions.go | 6 ++ service/redshift/api_op_DescribeClusters.go | 6 ++ ...api_op_DescribeDefaultClusterParameters.go | 6 ++ .../api_op_DescribeEventCategories.go | 6 ++ .../api_op_DescribeEventSubscriptions.go | 6 ++ service/redshift/api_op_DescribeEvents.go | 6 ++ .../api_op_DescribeHsmClientCertificates.go | 6 ++ .../api_op_DescribeHsmConfigurations.go | 6 ++ .../redshift/api_op_DescribeLoggingStatus.go | 6 ++ ...api_op_DescribeNodeConfigurationOptions.go | 6 ++ .../api_op_DescribeOrderableClusterOptions.go | 6 ++ .../api_op_DescribeReservedNodeOfferings.go | 6 ++ .../redshift/api_op_DescribeReservedNodes.go | 6 ++ service/redshift/api_op_DescribeResize.go | 6 ++ .../api_op_DescribeScheduledActions.go | 6 ++ .../api_op_DescribeSnapshotCopyGrants.go | 6 ++ .../api_op_DescribeSnapshotSchedules.go | 6 ++ service/redshift/api_op_DescribeStorage.go | 6 ++ .../api_op_DescribeTableRestoreStatus.go | 6 ++ service/redshift/api_op_DescribeTags.go | 6 ++ .../redshift/api_op_DescribeUsageLimits.go | 6 ++ service/redshift/api_op_DisableLogging.go | 6 ++ .../redshift/api_op_DisableSnapshotCopy.go | 6 ++ service/redshift/api_op_EnableLogging.go | 6 ++ service/redshift/api_op_EnableSnapshotCopy.go | 6 ++ .../redshift/api_op_GetClusterCredentials.go | 6 ++ ...api_op_GetReservedNodeExchangeOfferings.go | 6 ++ service/redshift/api_op_ModifyCluster.go | 6 ++ .../api_op_ModifyClusterDbRevision.go | 6 ++ .../redshift/api_op_ModifyClusterIamRoles.go | 6 ++ .../api_op_ModifyClusterMaintenance.go | 6 ++ .../api_op_ModifyClusterParameterGroup.go | 6 ++ .../redshift/api_op_ModifyClusterSnapshot.go | 6 ++ .../api_op_ModifyClusterSnapshotSchedule.go | 6 ++ .../api_op_ModifyClusterSubnetGroup.go | 6 ++ .../api_op_ModifyEventSubscription.go | 6 ++ .../redshift/api_op_ModifyScheduledAction.go | 6 ++ ...pi_op_ModifySnapshotCopyRetentionPeriod.go | 6 ++ .../redshift/api_op_ModifySnapshotSchedule.go | 6 ++ service/redshift/api_op_ModifyUsageLimit.go | 6 ++ service/redshift/api_op_PauseCluster.go | 6 ++ .../api_op_PurchaseReservedNodeOffering.go | 6 ++ service/redshift/api_op_RebootCluster.go | 6 ++ .../api_op_ResetClusterParameterGroup.go | 6 ++ service/redshift/api_op_ResizeCluster.go | 6 ++ .../api_op_RestoreFromClusterSnapshot.go | 6 ++ .../api_op_RestoreTableFromClusterSnapshot.go | 6 ++ service/redshift/api_op_ResumeCluster.go | 6 ++ ...pi_op_RevokeClusterSecurityGroupIngress.go | 6 ++ .../redshift/api_op_RevokeSnapshotAccess.go | 6 ++ .../redshift/api_op_RotateEncryptionKey.go | 6 ++ service/redshift/go.mod | 4 +- service/redshift/go.sum | 2 - service/redshiftdata/api_client.go | 52 ++++++++-- .../redshiftdata/api_op_CancelStatement.go | 6 ++ .../redshiftdata/api_op_DescribeStatement.go | 6 ++ service/redshiftdata/api_op_DescribeTable.go | 6 ++ .../redshiftdata/api_op_ExecuteStatement.go | 6 ++ .../redshiftdata/api_op_GetStatementResult.go | 6 ++ service/redshiftdata/api_op_ListDatabases.go | 6 ++ service/redshiftdata/api_op_ListSchemas.go | 6 ++ service/redshiftdata/api_op_ListStatements.go | 6 ++ service/redshiftdata/api_op_ListTables.go | 6 ++ service/redshiftdata/go.mod | 4 +- service/redshiftdata/go.sum | 2 - service/rekognition/api_client.go | 52 ++++++++-- service/rekognition/api_op_CompareFaces.go | 6 ++ .../rekognition/api_op_CreateCollection.go | 6 ++ service/rekognition/api_op_CreateProject.go | 6 ++ .../api_op_CreateProjectVersion.go | 6 ++ .../api_op_CreateStreamProcessor.go | 6 ++ .../rekognition/api_op_DeleteCollection.go | 6 ++ service/rekognition/api_op_DeleteFaces.go | 6 ++ service/rekognition/api_op_DeleteProject.go | 6 ++ .../api_op_DeleteProjectVersion.go | 6 ++ .../api_op_DeleteStreamProcessor.go | 6 ++ .../rekognition/api_op_DescribeCollection.go | 6 ++ .../api_op_DescribeProjectVersions.go | 6 ++ .../rekognition/api_op_DescribeProjects.go | 6 ++ .../api_op_DescribeStreamProcessor.go | 6 ++ .../rekognition/api_op_DetectCustomLabels.go | 6 ++ service/rekognition/api_op_DetectFaces.go | 6 ++ service/rekognition/api_op_DetectLabels.go | 6 ++ .../api_op_DetectModerationLabels.go | 6 ++ .../api_op_DetectProtectiveEquipment.go | 6 ++ service/rekognition/api_op_DetectText.go | 6 ++ .../rekognition/api_op_GetCelebrityInfo.go | 6 ++ .../api_op_GetCelebrityRecognition.go | 6 ++ .../api_op_GetContentModeration.go | 6 ++ .../rekognition/api_op_GetFaceDetection.go | 6 ++ service/rekognition/api_op_GetFaceSearch.go | 6 ++ .../rekognition/api_op_GetLabelDetection.go | 6 ++ .../rekognition/api_op_GetPersonTracking.go | 6 ++ .../rekognition/api_op_GetSegmentDetection.go | 6 ++ .../rekognition/api_op_GetTextDetection.go | 6 ++ service/rekognition/api_op_IndexFaces.go | 6 ++ service/rekognition/api_op_ListCollections.go | 6 ++ service/rekognition/api_op_ListFaces.go | 6 ++ .../api_op_ListStreamProcessors.go | 6 ++ .../api_op_RecognizeCelebrities.go | 6 ++ service/rekognition/api_op_SearchFaces.go | 6 ++ .../rekognition/api_op_SearchFacesByImage.go | 6 ++ .../api_op_StartCelebrityRecognition.go | 6 ++ .../api_op_StartContentModeration.go | 6 ++ .../rekognition/api_op_StartFaceDetection.go | 6 ++ service/rekognition/api_op_StartFaceSearch.go | 6 ++ .../rekognition/api_op_StartLabelDetection.go | 6 ++ .../rekognition/api_op_StartPersonTracking.go | 6 ++ .../rekognition/api_op_StartProjectVersion.go | 6 ++ .../api_op_StartSegmentDetection.go | 6 ++ .../api_op_StartStreamProcessor.go | 6 ++ .../rekognition/api_op_StartTextDetection.go | 6 ++ .../rekognition/api_op_StopProjectVersion.go | 6 ++ .../rekognition/api_op_StopStreamProcessor.go | 6 ++ service/rekognition/go.mod | 4 +- service/rekognition/go.sum | 2 - service/resourcegroups/api_client.go | 52 ++++++++-- service/resourcegroups/api_op_CreateGroup.go | 6 ++ service/resourcegroups/api_op_DeleteGroup.go | 6 ++ service/resourcegroups/api_op_GetGroup.go | 6 ++ .../api_op_GetGroupConfiguration.go | 6 ++ .../resourcegroups/api_op_GetGroupQuery.go | 6 ++ service/resourcegroups/api_op_GetTags.go | 6 ++ .../resourcegroups/api_op_GroupResources.go | 6 ++ .../api_op_ListGroupResources.go | 6 ++ service/resourcegroups/api_op_ListGroups.go | 6 ++ .../resourcegroups/api_op_SearchResources.go | 6 ++ service/resourcegroups/api_op_Tag.go | 6 ++ .../resourcegroups/api_op_UngroupResources.go | 6 ++ service/resourcegroups/api_op_Untag.go | 6 ++ service/resourcegroups/api_op_UpdateGroup.go | 6 ++ .../resourcegroups/api_op_UpdateGroupQuery.go | 6 ++ service/resourcegroups/go.mod | 4 +- service/resourcegroups/go.sum | 2 - .../resourcegroupstaggingapi/api_client.go | 52 ++++++++-- .../api_op_DescribeReportCreation.go | 6 ++ .../api_op_GetComplianceSummary.go | 6 ++ .../api_op_GetResources.go | 6 ++ .../api_op_GetTagKeys.go | 6 ++ .../api_op_GetTagValues.go | 6 ++ .../api_op_StartReportCreation.go | 6 ++ .../api_op_TagResources.go | 6 ++ .../api_op_UntagResources.go | 6 ++ service/resourcegroupstaggingapi/go.mod | 4 +- service/resourcegroupstaggingapi/go.sum | 2 - service/robomaker/api_client.go | 52 ++++++++-- service/robomaker/api_op_BatchDeleteWorlds.go | 6 ++ .../api_op_BatchDescribeSimulationJob.go | 6 ++ .../robomaker/api_op_CancelDeploymentJob.go | 6 ++ .../robomaker/api_op_CancelSimulationJob.go | 6 ++ .../api_op_CancelSimulationJobBatch.go | 6 ++ .../robomaker/api_op_CancelWorldExportJob.go | 6 ++ .../api_op_CancelWorldGenerationJob.go | 6 ++ .../robomaker/api_op_CreateDeploymentJob.go | 6 ++ service/robomaker/api_op_CreateFleet.go | 6 ++ service/robomaker/api_op_CreateRobot.go | 6 ++ .../api_op_CreateRobotApplication.go | 6 ++ .../api_op_CreateRobotApplicationVersion.go | 6 ++ .../api_op_CreateSimulationApplication.go | 6 ++ ...i_op_CreateSimulationApplicationVersion.go | 6 ++ .../robomaker/api_op_CreateSimulationJob.go | 6 ++ .../robomaker/api_op_CreateWorldExportJob.go | 6 ++ .../api_op_CreateWorldGenerationJob.go | 6 ++ .../robomaker/api_op_CreateWorldTemplate.go | 6 ++ service/robomaker/api_op_DeleteFleet.go | 6 ++ service/robomaker/api_op_DeleteRobot.go | 6 ++ .../api_op_DeleteRobotApplication.go | 6 ++ .../api_op_DeleteSimulationApplication.go | 6 ++ .../robomaker/api_op_DeleteWorldTemplate.go | 6 ++ service/robomaker/api_op_DeregisterRobot.go | 6 ++ .../robomaker/api_op_DescribeDeploymentJob.go | 6 ++ service/robomaker/api_op_DescribeFleet.go | 6 ++ service/robomaker/api_op_DescribeRobot.go | 6 ++ .../api_op_DescribeRobotApplication.go | 6 ++ .../api_op_DescribeSimulationApplication.go | 6 ++ .../robomaker/api_op_DescribeSimulationJob.go | 6 ++ .../api_op_DescribeSimulationJobBatch.go | 6 ++ service/robomaker/api_op_DescribeWorld.go | 6 ++ .../api_op_DescribeWorldExportJob.go | 6 ++ .../api_op_DescribeWorldGenerationJob.go | 6 ++ .../robomaker/api_op_DescribeWorldTemplate.go | 6 ++ .../robomaker/api_op_GetWorldTemplateBody.go | 6 ++ .../robomaker/api_op_ListDeploymentJobs.go | 6 ++ service/robomaker/api_op_ListFleets.go | 6 ++ .../robomaker/api_op_ListRobotApplications.go | 6 ++ service/robomaker/api_op_ListRobots.go | 6 ++ .../api_op_ListSimulationApplications.go | 6 ++ .../api_op_ListSimulationJobBatches.go | 6 ++ .../robomaker/api_op_ListSimulationJobs.go | 6 ++ .../robomaker/api_op_ListTagsForResource.go | 6 ++ .../robomaker/api_op_ListWorldExportJobs.go | 6 ++ .../api_op_ListWorldGenerationJobs.go | 6 ++ .../robomaker/api_op_ListWorldTemplates.go | 6 ++ service/robomaker/api_op_ListWorlds.go | 6 ++ service/robomaker/api_op_RegisterRobot.go | 6 ++ .../robomaker/api_op_RestartSimulationJob.go | 6 ++ .../api_op_StartSimulationJobBatch.go | 6 ++ service/robomaker/api_op_SyncDeploymentJob.go | 6 ++ service/robomaker/api_op_TagResource.go | 6 ++ service/robomaker/api_op_UntagResource.go | 6 ++ .../api_op_UpdateRobotApplication.go | 6 ++ .../api_op_UpdateSimulationApplication.go | 6 ++ .../robomaker/api_op_UpdateWorldTemplate.go | 6 ++ service/robomaker/go.mod | 4 +- service/robomaker/go.sum | 2 - service/route53/api_client.go | 52 ++++++++-- .../api_op_AssociateVPCWithHostedZone.go | 6 ++ .../api_op_ChangeResourceRecordSets.go | 6 ++ .../route53/api_op_ChangeTagsForResource.go | 6 ++ service/route53/api_op_CreateHealthCheck.go | 6 ++ service/route53/api_op_CreateHostedZone.go | 6 ++ .../api_op_CreateQueryLoggingConfig.go | 6 ++ .../api_op_CreateReusableDelegationSet.go | 6 ++ service/route53/api_op_CreateTrafficPolicy.go | 6 ++ .../api_op_CreateTrafficPolicyInstance.go | 6 ++ .../api_op_CreateTrafficPolicyVersion.go | 6 ++ ...pi_op_CreateVPCAssociationAuthorization.go | 6 ++ service/route53/api_op_DeleteHealthCheck.go | 6 ++ service/route53/api_op_DeleteHostedZone.go | 6 ++ .../api_op_DeleteQueryLoggingConfig.go | 6 ++ .../api_op_DeleteReusableDelegationSet.go | 6 ++ service/route53/api_op_DeleteTrafficPolicy.go | 6 ++ .../api_op_DeleteTrafficPolicyInstance.go | 6 ++ ...pi_op_DeleteVPCAssociationAuthorization.go | 6 ++ .../api_op_DisassociateVPCFromHostedZone.go | 6 ++ service/route53/api_op_GetAccountLimit.go | 6 ++ service/route53/api_op_GetChange.go | 6 ++ service/route53/api_op_GetCheckerIpRanges.go | 6 ++ service/route53/api_op_GetGeoLocation.go | 6 ++ service/route53/api_op_GetHealthCheck.go | 6 ++ service/route53/api_op_GetHealthCheckCount.go | 6 ++ .../api_op_GetHealthCheckLastFailureReason.go | 6 ++ .../route53/api_op_GetHealthCheckStatus.go | 6 ++ service/route53/api_op_GetHostedZone.go | 6 ++ service/route53/api_op_GetHostedZoneCount.go | 6 ++ service/route53/api_op_GetHostedZoneLimit.go | 6 ++ .../route53/api_op_GetQueryLoggingConfig.go | 6 ++ .../api_op_GetReusableDelegationSet.go | 6 ++ .../api_op_GetReusableDelegationSetLimit.go | 6 ++ service/route53/api_op_GetTrafficPolicy.go | 6 ++ .../api_op_GetTrafficPolicyInstance.go | 6 ++ .../api_op_GetTrafficPolicyInstanceCount.go | 6 ++ service/route53/api_op_ListGeoLocations.go | 6 ++ service/route53/api_op_ListHealthChecks.go | 6 ++ service/route53/api_op_ListHostedZones.go | 6 ++ .../route53/api_op_ListHostedZonesByName.go | 6 ++ .../route53/api_op_ListHostedZonesByVPC.go | 6 ++ .../route53/api_op_ListQueryLoggingConfigs.go | 6 ++ .../route53/api_op_ListResourceRecordSets.go | 6 ++ .../api_op_ListReusableDelegationSets.go | 6 ++ service/route53/api_op_ListTagsForResource.go | 6 ++ .../route53/api_op_ListTagsForResources.go | 6 ++ service/route53/api_op_ListTrafficPolicies.go | 6 ++ .../api_op_ListTrafficPolicyInstances.go | 6 ++ ..._ListTrafficPolicyInstancesByHostedZone.go | 6 ++ ...i_op_ListTrafficPolicyInstancesByPolicy.go | 6 ++ .../api_op_ListTrafficPolicyVersions.go | 6 ++ ...api_op_ListVPCAssociationAuthorizations.go | 6 ++ service/route53/api_op_TestDNSAnswer.go | 6 ++ service/route53/api_op_UpdateHealthCheck.go | 6 ++ .../route53/api_op_UpdateHostedZoneComment.go | 6 ++ .../api_op_UpdateTrafficPolicyComment.go | 6 ++ .../api_op_UpdateTrafficPolicyInstance.go | 6 ++ service/route53/go.mod | 4 +- service/route53/go.sum | 2 - service/route53domains/api_client.go | 52 ++++++++-- ...ceptDomainTransferFromAnotherAwsAccount.go | 6 ++ ...CancelDomainTransferToAnotherAwsAccount.go | 6 ++ .../api_op_CheckDomainAvailability.go | 6 ++ .../api_op_CheckDomainTransferability.go | 6 ++ .../api_op_DeleteTagsForDomain.go | 6 ++ .../api_op_DisableDomainAutoRenew.go | 6 ++ .../api_op_DisableDomainTransferLock.go | 6 ++ .../api_op_EnableDomainAutoRenew.go | 6 ++ .../api_op_EnableDomainTransferLock.go | 6 ++ .../api_op_GetContactReachabilityStatus.go | 6 ++ .../route53domains/api_op_GetDomainDetail.go | 6 ++ .../api_op_GetDomainSuggestions.go | 6 ++ .../api_op_GetOperationDetail.go | 6 ++ service/route53domains/api_op_ListDomains.go | 6 ++ .../route53domains/api_op_ListOperations.go | 6 ++ .../api_op_ListTagsForDomain.go | 6 ++ .../route53domains/api_op_RegisterDomain.go | 6 ++ ...jectDomainTransferFromAnotherAwsAccount.go | 6 ++ service/route53domains/api_op_RenewDomain.go | 6 ++ .../api_op_ResendContactReachabilityEmail.go | 6 ++ .../api_op_RetrieveDomainAuthCode.go | 6 ++ .../route53domains/api_op_TransferDomain.go | 6 ++ ...pi_op_TransferDomainToAnotherAwsAccount.go | 6 ++ .../api_op_UpdateDomainContact.go | 6 ++ .../api_op_UpdateDomainContactPrivacy.go | 6 ++ .../api_op_UpdateDomainNameservers.go | 6 ++ .../api_op_UpdateTagsForDomain.go | 6 ++ service/route53domains/api_op_ViewBilling.go | 6 ++ service/route53domains/go.mod | 4 +- service/route53domains/go.sum | 2 - service/route53resolver/api_client.go | 52 ++++++++-- ...i_op_AssociateResolverEndpointIpAddress.go | 6 ++ .../api_op_AssociateResolverQueryLogConfig.go | 6 ++ .../api_op_AssociateResolverRule.go | 6 ++ .../api_op_CreateResolverEndpoint.go | 6 ++ .../api_op_CreateResolverQueryLogConfig.go | 6 ++ .../api_op_CreateResolverRule.go | 6 ++ .../api_op_DeleteResolverEndpoint.go | 6 ++ .../api_op_DeleteResolverQueryLogConfig.go | 6 ++ .../api_op_DeleteResolverRule.go | 6 ++ ...p_DisassociateResolverEndpointIpAddress.go | 6 ++ ...i_op_DisassociateResolverQueryLogConfig.go | 6 ++ .../api_op_DisassociateResolverRule.go | 6 ++ .../api_op_GetResolverEndpoint.go | 6 ++ .../api_op_GetResolverQueryLogConfig.go | 6 ++ ...op_GetResolverQueryLogConfigAssociation.go | 6 ++ .../api_op_GetResolverQueryLogConfigPolicy.go | 6 ++ .../route53resolver/api_op_GetResolverRule.go | 6 ++ .../api_op_GetResolverRuleAssociation.go | 6 ++ .../api_op_GetResolverRulePolicy.go | 6 ++ .../api_op_ListResolverEndpointIpAddresses.go | 6 ++ .../api_op_ListResolverEndpoints.go | 6 ++ ..._ListResolverQueryLogConfigAssociations.go | 6 ++ .../api_op_ListResolverQueryLogConfigs.go | 6 ++ .../api_op_ListResolverRuleAssociations.go | 6 ++ .../api_op_ListResolverRules.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_PutResolverQueryLogConfigPolicy.go | 6 ++ .../api_op_PutResolverRulePolicy.go | 6 ++ service/route53resolver/api_op_TagResource.go | 6 ++ .../route53resolver/api_op_UntagResource.go | 6 ++ .../api_op_UpdateResolverEndpoint.go | 6 ++ .../api_op_UpdateResolverRule.go | 6 ++ service/route53resolver/go.mod | 4 +- service/route53resolver/go.sum | 2 - service/s3/api_client.go | 54 ++++++++--- service/s3/api_op_AbortMultipartUpload.go | 6 ++ service/s3/api_op_CompleteMultipartUpload.go | 6 ++ service/s3/api_op_CopyObject.go | 6 ++ service/s3/api_op_CreateBucket.go | 6 ++ service/s3/api_op_CreateMultipartUpload.go | 6 ++ service/s3/api_op_DeleteBucket.go | 6 ++ ...i_op_DeleteBucketAnalyticsConfiguration.go | 6 ++ service/s3/api_op_DeleteBucketCors.go | 6 ++ service/s3/api_op_DeleteBucketEncryption.go | 6 ++ ...i_op_DeleteBucketInventoryConfiguration.go | 6 ++ service/s3/api_op_DeleteBucketLifecycle.go | 6 ++ ...api_op_DeleteBucketMetricsConfiguration.go | 6 ++ .../api_op_DeleteBucketOwnershipControls.go | 6 ++ service/s3/api_op_DeleteBucketPolicy.go | 6 ++ service/s3/api_op_DeleteBucketReplication.go | 6 ++ service/s3/api_op_DeleteBucketTagging.go | 6 ++ service/s3/api_op_DeleteBucketWebsite.go | 6 ++ service/s3/api_op_DeleteObject.go | 6 ++ service/s3/api_op_DeleteObjectTagging.go | 6 ++ service/s3/api_op_DeleteObjects.go | 6 ++ service/s3/api_op_DeletePublicAccessBlock.go | 6 ++ ...api_op_GetBucketAccelerateConfiguration.go | 6 ++ service/s3/api_op_GetBucketAcl.go | 6 ++ .../api_op_GetBucketAnalyticsConfiguration.go | 6 ++ service/s3/api_op_GetBucketCors.go | 6 ++ service/s3/api_op_GetBucketEncryption.go | 6 ++ .../api_op_GetBucketInventoryConfiguration.go | 6 ++ .../api_op_GetBucketLifecycleConfiguration.go | 6 ++ service/s3/api_op_GetBucketLocation.go | 6 ++ service/s3/api_op_GetBucketLogging.go | 6 ++ .../api_op_GetBucketMetricsConfiguration.go | 6 ++ ...i_op_GetBucketNotificationConfiguration.go | 6 ++ .../s3/api_op_GetBucketOwnershipControls.go | 6 ++ service/s3/api_op_GetBucketPolicy.go | 6 ++ service/s3/api_op_GetBucketPolicyStatus.go | 6 ++ service/s3/api_op_GetBucketReplication.go | 6 ++ service/s3/api_op_GetBucketRequestPayment.go | 6 ++ service/s3/api_op_GetBucketTagging.go | 6 ++ service/s3/api_op_GetBucketVersioning.go | 6 ++ service/s3/api_op_GetBucketWebsite.go | 6 ++ service/s3/api_op_GetObject.go | 6 ++ service/s3/api_op_GetObjectAcl.go | 6 ++ service/s3/api_op_GetObjectLegalHold.go | 6 ++ .../s3/api_op_GetObjectLockConfiguration.go | 6 ++ service/s3/api_op_GetObjectRetention.go | 6 ++ service/s3/api_op_GetObjectTagging.go | 6 ++ service/s3/api_op_GetObjectTorrent.go | 6 ++ service/s3/api_op_GetPublicAccessBlock.go | 6 ++ service/s3/api_op_HeadBucket.go | 6 ++ service/s3/api_op_HeadObject.go | 6 ++ ...pi_op_ListBucketAnalyticsConfigurations.go | 6 ++ ...pi_op_ListBucketInventoryConfigurations.go | 6 ++ .../api_op_ListBucketMetricsConfigurations.go | 6 ++ service/s3/api_op_ListBuckets.go | 6 ++ service/s3/api_op_ListMultipartUploads.go | 6 ++ service/s3/api_op_ListObjectVersions.go | 6 ++ service/s3/api_op_ListObjects.go | 6 ++ service/s3/api_op_ListObjectsV2.go | 6 ++ service/s3/api_op_ListParts.go | 6 ++ ...api_op_PutBucketAccelerateConfiguration.go | 6 ++ service/s3/api_op_PutBucketAcl.go | 6 ++ .../api_op_PutBucketAnalyticsConfiguration.go | 6 ++ service/s3/api_op_PutBucketCors.go | 6 ++ service/s3/api_op_PutBucketEncryption.go | 6 ++ .../api_op_PutBucketInventoryConfiguration.go | 6 ++ .../api_op_PutBucketLifecycleConfiguration.go | 6 ++ service/s3/api_op_PutBucketLogging.go | 6 ++ .../api_op_PutBucketMetricsConfiguration.go | 6 ++ ...i_op_PutBucketNotificationConfiguration.go | 6 ++ .../s3/api_op_PutBucketOwnershipControls.go | 6 ++ service/s3/api_op_PutBucketPolicy.go | 6 ++ service/s3/api_op_PutBucketReplication.go | 6 ++ service/s3/api_op_PutBucketRequestPayment.go | 6 ++ service/s3/api_op_PutBucketTagging.go | 6 ++ service/s3/api_op_PutBucketVersioning.go | 6 ++ service/s3/api_op_PutBucketWebsite.go | 6 ++ service/s3/api_op_PutObject.go | 6 ++ service/s3/api_op_PutObjectAcl.go | 6 ++ service/s3/api_op_PutObjectLegalHold.go | 6 ++ .../s3/api_op_PutObjectLockConfiguration.go | 6 ++ service/s3/api_op_PutObjectRetention.go | 6 ++ service/s3/api_op_PutObjectTagging.go | 6 ++ service/s3/api_op_PutPublicAccessBlock.go | 6 ++ service/s3/api_op_RestoreObject.go | 6 ++ service/s3/api_op_UploadPart.go | 6 ++ service/s3/api_op_UploadPartCopy.go | 6 ++ service/s3/go.mod | 2 +- service/s3/go.sum | 4 - service/s3/internal/configtesting/go.sum | 4 - service/s3control/api_client.go | 52 ++++++++-- service/s3control/api_op_CreateAccessPoint.go | 6 ++ service/s3control/api_op_CreateBucket.go | 6 ++ service/s3control/api_op_CreateJob.go | 6 ++ service/s3control/api_op_DeleteAccessPoint.go | 6 ++ .../api_op_DeleteAccessPointPolicy.go | 6 ++ service/s3control/api_op_DeleteBucket.go | 6 ++ ...i_op_DeleteBucketLifecycleConfiguration.go | 6 ++ .../s3control/api_op_DeleteBucketPolicy.go | 6 ++ .../s3control/api_op_DeleteBucketTagging.go | 6 ++ service/s3control/api_op_DeleteJobTagging.go | 6 ++ .../api_op_DeletePublicAccessBlock.go | 6 ++ service/s3control/api_op_DescribeJob.go | 6 ++ service/s3control/api_op_GetAccessPoint.go | 6 ++ .../s3control/api_op_GetAccessPointPolicy.go | 6 ++ .../api_op_GetAccessPointPolicyStatus.go | 6 ++ service/s3control/api_op_GetBucket.go | 6 ++ .../api_op_GetBucketLifecycleConfiguration.go | 6 ++ service/s3control/api_op_GetBucketPolicy.go | 6 ++ service/s3control/api_op_GetBucketTagging.go | 6 ++ service/s3control/api_op_GetJobTagging.go | 6 ++ .../s3control/api_op_GetPublicAccessBlock.go | 6 ++ service/s3control/api_op_ListAccessPoints.go | 6 ++ service/s3control/api_op_ListJobs.go | 6 ++ .../s3control/api_op_ListRegionalBuckets.go | 6 ++ .../s3control/api_op_PutAccessPointPolicy.go | 6 ++ .../api_op_PutBucketLifecycleConfiguration.go | 6 ++ service/s3control/api_op_PutBucketPolicy.go | 6 ++ service/s3control/api_op_PutBucketTagging.go | 6 ++ service/s3control/api_op_PutJobTagging.go | 6 ++ .../s3control/api_op_PutPublicAccessBlock.go | 6 ++ service/s3control/api_op_UpdateJobPriority.go | 6 ++ service/s3control/api_op_UpdateJobStatus.go | 6 ++ service/s3control/go.mod | 2 +- service/s3control/go.sum | 2 - service/s3outposts/api_client.go | 52 ++++++++-- service/s3outposts/api_op_CreateEndpoint.go | 6 ++ service/s3outposts/api_op_DeleteEndpoint.go | 6 ++ service/s3outposts/api_op_ListEndpoints.go | 6 ++ service/s3outposts/go.mod | 4 +- service/s3outposts/go.sum | 2 - service/sagemaker/api_client.go | 52 ++++++++-- service/sagemaker/api_op_AddTags.go | 6 ++ .../api_op_AssociateTrialComponent.go | 6 ++ service/sagemaker/api_op_CreateAlgorithm.go | 6 ++ service/sagemaker/api_op_CreateApp.go | 6 ++ .../sagemaker/api_op_CreateAppImageConfig.go | 6 ++ service/sagemaker/api_op_CreateAutoMLJob.go | 6 ++ .../sagemaker/api_op_CreateCodeRepository.go | 6 ++ .../sagemaker/api_op_CreateCompilationJob.go | 6 ++ service/sagemaker/api_op_CreateDomain.go | 6 ++ service/sagemaker/api_op_CreateEndpoint.go | 6 ++ .../sagemaker/api_op_CreateEndpointConfig.go | 6 ++ service/sagemaker/api_op_CreateExperiment.go | 6 ++ .../sagemaker/api_op_CreateFlowDefinition.go | 6 ++ service/sagemaker/api_op_CreateHumanTaskUi.go | 6 ++ .../api_op_CreateHyperParameterTuningJob.go | 6 ++ service/sagemaker/api_op_CreateImage.go | 6 ++ .../sagemaker/api_op_CreateImageVersion.go | 6 ++ service/sagemaker/api_op_CreateLabelingJob.go | 6 ++ service/sagemaker/api_op_CreateModel.go | 6 ++ .../sagemaker/api_op_CreateModelPackage.go | 6 ++ .../api_op_CreateMonitoringSchedule.go | 6 ++ .../api_op_CreateNotebookInstance.go | 6 ++ ...p_CreateNotebookInstanceLifecycleConfig.go | 6 ++ .../api_op_CreatePresignedDomainUrl.go | 6 ++ ...i_op_CreatePresignedNotebookInstanceUrl.go | 6 ++ .../sagemaker/api_op_CreateProcessingJob.go | 6 ++ service/sagemaker/api_op_CreateTrainingJob.go | 6 ++ .../sagemaker/api_op_CreateTransformJob.go | 6 ++ service/sagemaker/api_op_CreateTrial.go | 6 ++ .../sagemaker/api_op_CreateTrialComponent.go | 6 ++ service/sagemaker/api_op_CreateUserProfile.go | 6 ++ service/sagemaker/api_op_CreateWorkforce.go | 6 ++ service/sagemaker/api_op_CreateWorkteam.go | 6 ++ service/sagemaker/api_op_DeleteAlgorithm.go | 6 ++ service/sagemaker/api_op_DeleteApp.go | 6 ++ .../sagemaker/api_op_DeleteAppImageConfig.go | 6 ++ .../sagemaker/api_op_DeleteCodeRepository.go | 6 ++ service/sagemaker/api_op_DeleteDomain.go | 6 ++ service/sagemaker/api_op_DeleteEndpoint.go | 6 ++ .../sagemaker/api_op_DeleteEndpointConfig.go | 6 ++ service/sagemaker/api_op_DeleteExperiment.go | 6 ++ .../sagemaker/api_op_DeleteFlowDefinition.go | 6 ++ service/sagemaker/api_op_DeleteHumanTaskUi.go | 6 ++ service/sagemaker/api_op_DeleteImage.go | 6 ++ .../sagemaker/api_op_DeleteImageVersion.go | 6 ++ service/sagemaker/api_op_DeleteModel.go | 6 ++ .../sagemaker/api_op_DeleteModelPackage.go | 6 ++ .../api_op_DeleteMonitoringSchedule.go | 6 ++ .../api_op_DeleteNotebookInstance.go | 6 ++ ...p_DeleteNotebookInstanceLifecycleConfig.go | 6 ++ service/sagemaker/api_op_DeleteTags.go | 6 ++ service/sagemaker/api_op_DeleteTrial.go | 6 ++ .../sagemaker/api_op_DeleteTrialComponent.go | 6 ++ service/sagemaker/api_op_DeleteUserProfile.go | 6 ++ service/sagemaker/api_op_DeleteWorkforce.go | 6 ++ service/sagemaker/api_op_DeleteWorkteam.go | 6 ++ service/sagemaker/api_op_DescribeAlgorithm.go | 6 ++ service/sagemaker/api_op_DescribeApp.go | 6 ++ .../api_op_DescribeAppImageConfig.go | 6 ++ service/sagemaker/api_op_DescribeAutoMLJob.go | 6 ++ .../api_op_DescribeCodeRepository.go | 6 ++ .../api_op_DescribeCompilationJob.go | 6 ++ service/sagemaker/api_op_DescribeDomain.go | 6 ++ service/sagemaker/api_op_DescribeEndpoint.go | 6 ++ .../api_op_DescribeEndpointConfig.go | 6 ++ .../sagemaker/api_op_DescribeExperiment.go | 6 ++ .../api_op_DescribeFlowDefinition.go | 6 ++ .../sagemaker/api_op_DescribeHumanTaskUi.go | 6 ++ .../api_op_DescribeHyperParameterTuningJob.go | 6 ++ service/sagemaker/api_op_DescribeImage.go | 6 ++ .../sagemaker/api_op_DescribeImageVersion.go | 6 ++ .../sagemaker/api_op_DescribeLabelingJob.go | 6 ++ service/sagemaker/api_op_DescribeModel.go | 6 ++ .../sagemaker/api_op_DescribeModelPackage.go | 6 ++ .../api_op_DescribeMonitoringSchedule.go | 6 ++ .../api_op_DescribeNotebookInstance.go | 6 ++ ...DescribeNotebookInstanceLifecycleConfig.go | 6 ++ .../sagemaker/api_op_DescribeProcessingJob.go | 6 ++ .../api_op_DescribeSubscribedWorkteam.go | 6 ++ .../sagemaker/api_op_DescribeTrainingJob.go | 6 ++ .../sagemaker/api_op_DescribeTransformJob.go | 6 ++ service/sagemaker/api_op_DescribeTrial.go | 6 ++ .../api_op_DescribeTrialComponent.go | 6 ++ .../sagemaker/api_op_DescribeUserProfile.go | 6 ++ service/sagemaker/api_op_DescribeWorkforce.go | 6 ++ service/sagemaker/api_op_DescribeWorkteam.go | 6 ++ .../api_op_DisassociateTrialComponent.go | 6 ++ .../sagemaker/api_op_GetSearchSuggestions.go | 6 ++ service/sagemaker/api_op_ListAlgorithms.go | 6 ++ .../sagemaker/api_op_ListAppImageConfigs.go | 6 ++ service/sagemaker/api_op_ListApps.go | 6 ++ service/sagemaker/api_op_ListAutoMLJobs.go | 6 ++ .../api_op_ListCandidatesForAutoMLJob.go | 6 ++ .../sagemaker/api_op_ListCodeRepositories.go | 6 ++ .../sagemaker/api_op_ListCompilationJobs.go | 6 ++ service/sagemaker/api_op_ListDomains.go | 6 ++ .../sagemaker/api_op_ListEndpointConfigs.go | 6 ++ service/sagemaker/api_op_ListEndpoints.go | 6 ++ service/sagemaker/api_op_ListExperiments.go | 6 ++ .../sagemaker/api_op_ListFlowDefinitions.go | 6 ++ service/sagemaker/api_op_ListHumanTaskUis.go | 6 ++ .../api_op_ListHyperParameterTuningJobs.go | 6 ++ service/sagemaker/api_op_ListImageVersions.go | 6 ++ service/sagemaker/api_op_ListImages.go | 6 ++ service/sagemaker/api_op_ListLabelingJobs.go | 6 ++ .../api_op_ListLabelingJobsForWorkteam.go | 6 ++ service/sagemaker/api_op_ListModelPackages.go | 6 ++ service/sagemaker/api_op_ListModels.go | 6 ++ .../api_op_ListMonitoringExecutions.go | 6 ++ .../api_op_ListMonitoringSchedules.go | 6 ++ ...op_ListNotebookInstanceLifecycleConfigs.go | 6 ++ .../sagemaker/api_op_ListNotebookInstances.go | 6 ++ .../sagemaker/api_op_ListProcessingJobs.go | 6 ++ .../api_op_ListSubscribedWorkteams.go | 6 ++ service/sagemaker/api_op_ListTags.go | 6 ++ service/sagemaker/api_op_ListTrainingJobs.go | 6 ++ ...tTrainingJobsForHyperParameterTuningJob.go | 6 ++ service/sagemaker/api_op_ListTransformJobs.go | 6 ++ .../sagemaker/api_op_ListTrialComponents.go | 6 ++ service/sagemaker/api_op_ListTrials.go | 6 ++ service/sagemaker/api_op_ListUserProfiles.go | 6 ++ service/sagemaker/api_op_ListWorkforces.go | 6 ++ service/sagemaker/api_op_ListWorkteams.go | 6 ++ service/sagemaker/api_op_RenderUiTemplate.go | 6 ++ service/sagemaker/api_op_Search.go | 6 ++ .../api_op_StartMonitoringSchedule.go | 6 ++ .../sagemaker/api_op_StartNotebookInstance.go | 6 ++ service/sagemaker/api_op_StopAutoMLJob.go | 6 ++ .../sagemaker/api_op_StopCompilationJob.go | 6 ++ .../api_op_StopHyperParameterTuningJob.go | 6 ++ service/sagemaker/api_op_StopLabelingJob.go | 6 ++ .../api_op_StopMonitoringSchedule.go | 6 ++ .../sagemaker/api_op_StopNotebookInstance.go | 6 ++ service/sagemaker/api_op_StopProcessingJob.go | 6 ++ service/sagemaker/api_op_StopTrainingJob.go | 6 ++ service/sagemaker/api_op_StopTransformJob.go | 6 ++ .../sagemaker/api_op_UpdateAppImageConfig.go | 6 ++ .../sagemaker/api_op_UpdateCodeRepository.go | 6 ++ service/sagemaker/api_op_UpdateDomain.go | 6 ++ service/sagemaker/api_op_UpdateEndpoint.go | 6 ++ ...i_op_UpdateEndpointWeightsAndCapacities.go | 6 ++ service/sagemaker/api_op_UpdateExperiment.go | 6 ++ service/sagemaker/api_op_UpdateImage.go | 6 ++ .../api_op_UpdateMonitoringSchedule.go | 6 ++ .../api_op_UpdateNotebookInstance.go | 6 ++ ...p_UpdateNotebookInstanceLifecycleConfig.go | 6 ++ service/sagemaker/api_op_UpdateTrial.go | 6 ++ .../sagemaker/api_op_UpdateTrialComponent.go | 6 ++ service/sagemaker/api_op_UpdateUserProfile.go | 6 ++ service/sagemaker/api_op_UpdateWorkforce.go | 6 ++ service/sagemaker/api_op_UpdateWorkteam.go | 6 ++ service/sagemaker/go.mod | 4 +- service/sagemaker/go.sum | 2 - service/sagemakera2iruntime/api_client.go | 52 ++++++++-- .../api_op_DeleteHumanLoop.go | 6 ++ .../api_op_DescribeHumanLoop.go | 6 ++ .../api_op_ListHumanLoops.go | 6 ++ .../api_op_StartHumanLoop.go | 6 ++ .../api_op_StopHumanLoop.go | 6 ++ service/sagemakera2iruntime/go.mod | 4 +- service/sagemakera2iruntime/go.sum | 2 - service/sagemakerruntime/api_client.go | 52 ++++++++-- .../sagemakerruntime/api_op_InvokeEndpoint.go | 6 ++ service/sagemakerruntime/go.mod | 4 +- service/sagemakerruntime/go.sum | 2 - service/savingsplans/api_client.go | 52 ++++++++-- .../savingsplans/api_op_CreateSavingsPlan.go | 6 ++ .../api_op_DeleteQueuedSavingsPlan.go | 6 ++ .../api_op_DescribeSavingsPlanRates.go | 6 ++ .../api_op_DescribeSavingsPlans.go | 6 ++ ...pi_op_DescribeSavingsPlansOfferingRates.go | 6 ++ .../api_op_DescribeSavingsPlansOfferings.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/savingsplans/api_op_TagResource.go | 6 ++ service/savingsplans/api_op_UntagResource.go | 6 ++ service/savingsplans/go.mod | 4 +- service/savingsplans/go.sum | 2 - service/schemas/api_client.go | 52 ++++++++-- service/schemas/api_op_CreateDiscoverer.go | 6 ++ service/schemas/api_op_CreateRegistry.go | 6 ++ service/schemas/api_op_CreateSchema.go | 6 ++ service/schemas/api_op_DeleteDiscoverer.go | 6 ++ service/schemas/api_op_DeleteRegistry.go | 6 ++ .../schemas/api_op_DeleteResourcePolicy.go | 6 ++ service/schemas/api_op_DeleteSchema.go | 6 ++ service/schemas/api_op_DeleteSchemaVersion.go | 6 ++ service/schemas/api_op_DescribeCodeBinding.go | 6 ++ service/schemas/api_op_DescribeDiscoverer.go | 6 ++ service/schemas/api_op_DescribeRegistry.go | 6 ++ service/schemas/api_op_DescribeSchema.go | 6 ++ service/schemas/api_op_ExportSchema.go | 6 ++ .../schemas/api_op_GetCodeBindingSource.go | 6 ++ service/schemas/api_op_GetDiscoveredSchema.go | 6 ++ service/schemas/api_op_GetResourcePolicy.go | 6 ++ service/schemas/api_op_ListDiscoverers.go | 6 ++ service/schemas/api_op_ListRegistries.go | 6 ++ service/schemas/api_op_ListSchemaVersions.go | 6 ++ service/schemas/api_op_ListSchemas.go | 6 ++ service/schemas/api_op_ListTagsForResource.go | 6 ++ service/schemas/api_op_PutCodeBinding.go | 6 ++ service/schemas/api_op_PutResourcePolicy.go | 6 ++ service/schemas/api_op_SearchSchemas.go | 6 ++ service/schemas/api_op_StartDiscoverer.go | 6 ++ service/schemas/api_op_StopDiscoverer.go | 6 ++ service/schemas/api_op_TagResource.go | 6 ++ service/schemas/api_op_UntagResource.go | 6 ++ service/schemas/api_op_UpdateDiscoverer.go | 6 ++ service/schemas/api_op_UpdateRegistry.go | 6 ++ service/schemas/api_op_UpdateSchema.go | 6 ++ service/schemas/go.mod | 4 +- service/schemas/go.sum | 2 - service/secretsmanager/api_client.go | 52 ++++++++-- .../api_op_CancelRotateSecret.go | 6 ++ service/secretsmanager/api_op_CreateSecret.go | 6 ++ .../api_op_DeleteResourcePolicy.go | 6 ++ service/secretsmanager/api_op_DeleteSecret.go | 6 ++ .../secretsmanager/api_op_DescribeSecret.go | 6 ++ .../api_op_GetRandomPassword.go | 6 ++ .../api_op_GetResourcePolicy.go | 6 ++ .../secretsmanager/api_op_GetSecretValue.go | 6 ++ .../api_op_ListSecretVersionIds.go | 6 ++ service/secretsmanager/api_op_ListSecrets.go | 6 ++ .../api_op_PutResourcePolicy.go | 6 ++ .../secretsmanager/api_op_PutSecretValue.go | 6 ++ .../secretsmanager/api_op_RestoreSecret.go | 6 ++ service/secretsmanager/api_op_RotateSecret.go | 6 ++ service/secretsmanager/api_op_TagResource.go | 6 ++ .../secretsmanager/api_op_UntagResource.go | 6 ++ service/secretsmanager/api_op_UpdateSecret.go | 6 ++ .../api_op_UpdateSecretVersionStage.go | 6 ++ .../api_op_ValidateResourcePolicy.go | 6 ++ service/secretsmanager/go.mod | 4 +- service/secretsmanager/go.sum | 2 - service/securityhub/api_client.go | 52 ++++++++-- .../securityhub/api_op_AcceptInvitation.go | 6 ++ .../api_op_BatchDisableStandards.go | 6 ++ .../api_op_BatchEnableStandards.go | 6 ++ .../securityhub/api_op_BatchImportFindings.go | 6 ++ .../securityhub/api_op_BatchUpdateFindings.go | 6 ++ .../securityhub/api_op_CreateActionTarget.go | 6 ++ service/securityhub/api_op_CreateInsight.go | 6 ++ service/securityhub/api_op_CreateMembers.go | 6 ++ .../securityhub/api_op_DeclineInvitations.go | 6 ++ .../securityhub/api_op_DeleteActionTarget.go | 6 ++ service/securityhub/api_op_DeleteInsight.go | 6 ++ .../securityhub/api_op_DeleteInvitations.go | 6 ++ service/securityhub/api_op_DeleteMembers.go | 6 ++ .../api_op_DescribeActionTargets.go | 6 ++ service/securityhub/api_op_DescribeHub.go | 6 ++ .../securityhub/api_op_DescribeProducts.go | 6 ++ .../securityhub/api_op_DescribeStandards.go | 6 ++ .../api_op_DescribeStandardsControls.go | 6 ++ .../api_op_DisableImportFindingsForProduct.go | 6 ++ .../securityhub/api_op_DisableSecurityHub.go | 6 ++ .../api_op_DisassociateFromMasterAccount.go | 6 ++ .../securityhub/api_op_DisassociateMembers.go | 6 ++ .../api_op_EnableImportFindingsForProduct.go | 6 ++ .../securityhub/api_op_EnableSecurityHub.go | 6 ++ .../securityhub/api_op_GetEnabledStandards.go | 6 ++ service/securityhub/api_op_GetFindings.go | 6 ++ .../securityhub/api_op_GetInsightResults.go | 6 ++ service/securityhub/api_op_GetInsights.go | 6 ++ .../securityhub/api_op_GetInvitationsCount.go | 6 ++ .../securityhub/api_op_GetMasterAccount.go | 6 ++ service/securityhub/api_op_GetMembers.go | 6 ++ service/securityhub/api_op_InviteMembers.go | 6 ++ .../api_op_ListEnabledProductsForImport.go | 6 ++ service/securityhub/api_op_ListInvitations.go | 6 ++ service/securityhub/api_op_ListMembers.go | 6 ++ .../securityhub/api_op_ListTagsForResource.go | 6 ++ service/securityhub/api_op_TagResource.go | 6 ++ service/securityhub/api_op_UntagResource.go | 6 ++ .../securityhub/api_op_UpdateActionTarget.go | 6 ++ service/securityhub/api_op_UpdateFindings.go | 6 ++ service/securityhub/api_op_UpdateInsight.go | 6 ++ .../api_op_UpdateSecurityHubConfiguration.go | 6 ++ .../api_op_UpdateStandardsControl.go | 6 ++ service/securityhub/go.mod | 4 +- service/securityhub/go.sum | 2 - .../api_client.go | 52 ++++++++-- .../api_op_CreateApplication.go | 6 ++ .../api_op_CreateApplicationVersion.go | 6 ++ .../api_op_CreateCloudFormationChangeSet.go | 6 ++ .../api_op_CreateCloudFormationTemplate.go | 6 ++ .../api_op_DeleteApplication.go | 6 ++ .../api_op_GetApplication.go | 6 ++ .../api_op_GetApplicationPolicy.go | 6 ++ .../api_op_GetCloudFormationTemplate.go | 6 ++ .../api_op_ListApplicationDependencies.go | 6 ++ .../api_op_ListApplicationVersions.go | 6 ++ .../api_op_ListApplications.go | 6 ++ .../api_op_PutApplicationPolicy.go | 6 ++ .../api_op_UnshareApplication.go | 6 ++ .../api_op_UpdateApplication.go | 6 ++ .../serverlessapplicationrepository/go.mod | 4 +- .../serverlessapplicationrepository/go.sum | 2 - service/servicecatalog/api_client.go | 52 ++++++++-- .../api_op_AcceptPortfolioShare.go | 6 ++ .../api_op_AssociateBudgetWithResource.go | 6 ++ .../api_op_AssociatePrincipalWithPortfolio.go | 6 ++ .../api_op_AssociateProductWithPortfolio.go | 6 ++ ...teServiceActionWithProvisioningArtifact.go | 6 ++ .../api_op_AssociateTagOptionWithResource.go | 6 ++ ...teServiceActionWithProvisioningArtifact.go | 6 ++ ...teServiceActionFromProvisioningArtifact.go | 6 ++ service/servicecatalog/api_op_CopyProduct.go | 6 ++ .../servicecatalog/api_op_CreateConstraint.go | 6 ++ .../servicecatalog/api_op_CreatePortfolio.go | 6 ++ .../api_op_CreatePortfolioShare.go | 6 ++ .../servicecatalog/api_op_CreateProduct.go | 6 ++ .../api_op_CreateProvisionedProductPlan.go | 6 ++ .../api_op_CreateProvisioningArtifact.go | 6 ++ .../api_op_CreateServiceAction.go | 6 ++ .../servicecatalog/api_op_CreateTagOption.go | 6 ++ .../servicecatalog/api_op_DeleteConstraint.go | 6 ++ .../servicecatalog/api_op_DeletePortfolio.go | 6 ++ .../api_op_DeletePortfolioShare.go | 6 ++ .../servicecatalog/api_op_DeleteProduct.go | 6 ++ .../api_op_DeleteProvisionedProductPlan.go | 6 ++ .../api_op_DeleteProvisioningArtifact.go | 6 ++ .../api_op_DeleteServiceAction.go | 6 ++ .../servicecatalog/api_op_DeleteTagOption.go | 6 ++ .../api_op_DescribeConstraint.go | 6 ++ .../api_op_DescribeCopyProductStatus.go | 6 ++ .../api_op_DescribePortfolio.go | 6 ++ .../api_op_DescribePortfolioShareStatus.go | 6 ++ .../servicecatalog/api_op_DescribeProduct.go | 6 ++ .../api_op_DescribeProductAsAdmin.go | 6 ++ .../api_op_DescribeProductView.go | 6 ++ .../api_op_DescribeProvisionedProduct.go | 6 ++ .../api_op_DescribeProvisionedProductPlan.go | 6 ++ .../api_op_DescribeProvisioningArtifact.go | 6 ++ .../api_op_DescribeProvisioningParameters.go | 6 ++ .../servicecatalog/api_op_DescribeRecord.go | 6 ++ .../api_op_DescribeServiceAction.go | 6 ++ ...escribeServiceActionExecutionParameters.go | 6 ++ .../api_op_DescribeTagOption.go | 6 ++ .../api_op_DisableAWSOrganizationsAccess.go | 6 ++ .../api_op_DisassociateBudgetFromResource.go | 6 ++ ...i_op_DisassociatePrincipalFromPortfolio.go | 6 ++ ...api_op_DisassociateProductFromPortfolio.go | 6 ++ ...teServiceActionFromProvisioningArtifact.go | 6 ++ ...pi_op_DisassociateTagOptionFromResource.go | 6 ++ .../api_op_EnableAWSOrganizationsAccess.go | 6 ++ .../api_op_ExecuteProvisionedProductPlan.go | 6 ++ ..._ExecuteProvisionedProductServiceAction.go | 6 ++ .../api_op_GetAWSOrganizationsAccessStatus.go | 6 ++ .../api_op_GetProvisionedProductOutputs.go | 6 ++ .../api_op_ListAcceptedPortfolioShares.go | 6 ++ .../api_op_ListBudgetsForResource.go | 6 ++ .../api_op_ListConstraintsForPortfolio.go | 6 ++ .../servicecatalog/api_op_ListLaunchPaths.go | 6 ++ .../api_op_ListOrganizationPortfolioAccess.go | 6 ++ .../api_op_ListPortfolioAccess.go | 6 ++ .../servicecatalog/api_op_ListPortfolios.go | 6 ++ .../api_op_ListPortfoliosForProduct.go | 6 ++ .../api_op_ListPrincipalsForPortfolio.go | 6 ++ .../api_op_ListProvisionedProductPlans.go | 6 ++ .../api_op_ListProvisioningArtifacts.go | 6 ++ ...stProvisioningArtifactsForServiceAction.go | 6 ++ .../api_op_ListRecordHistory.go | 6 ++ .../api_op_ListResourcesForTagOption.go | 6 ++ .../api_op_ListServiceActions.go | 6 ++ ...stServiceActionsForProvisioningArtifact.go | 6 ++ ...ListStackInstancesForProvisionedProduct.go | 6 ++ .../servicecatalog/api_op_ListTagOptions.go | 6 ++ .../servicecatalog/api_op_ProvisionProduct.go | 6 ++ .../api_op_RejectPortfolioShare.go | 6 ++ .../api_op_ScanProvisionedProducts.go | 6 ++ .../servicecatalog/api_op_SearchProducts.go | 6 ++ .../api_op_SearchProductsAsAdmin.go | 6 ++ .../api_op_SearchProvisionedProducts.go | 6 ++ .../api_op_TerminateProvisionedProduct.go | 6 ++ .../servicecatalog/api_op_UpdateConstraint.go | 6 ++ .../servicecatalog/api_op_UpdatePortfolio.go | 6 ++ .../servicecatalog/api_op_UpdateProduct.go | 6 ++ .../api_op_UpdateProvisionedProduct.go | 6 ++ ...i_op_UpdateProvisionedProductProperties.go | 6 ++ .../api_op_UpdateProvisioningArtifact.go | 6 ++ .../api_op_UpdateServiceAction.go | 6 ++ .../servicecatalog/api_op_UpdateTagOption.go | 6 ++ service/servicecatalog/go.mod | 4 +- service/servicecatalog/go.sum | 2 - service/servicediscovery/api_client.go | 52 ++++++++-- .../api_op_CreateHttpNamespace.go | 6 ++ .../api_op_CreatePrivateDnsNamespace.go | 6 ++ .../api_op_CreatePublicDnsNamespace.go | 6 ++ .../servicediscovery/api_op_CreateService.go | 6 ++ .../api_op_DeleteNamespace.go | 6 ++ .../servicediscovery/api_op_DeleteService.go | 6 ++ .../api_op_DeregisterInstance.go | 6 ++ .../api_op_DiscoverInstances.go | 6 ++ .../servicediscovery/api_op_GetInstance.go | 6 ++ .../api_op_GetInstancesHealthStatus.go | 6 ++ .../servicediscovery/api_op_GetNamespace.go | 6 ++ .../servicediscovery/api_op_GetOperation.go | 6 ++ service/servicediscovery/api_op_GetService.go | 6 ++ .../servicediscovery/api_op_ListInstances.go | 6 ++ .../servicediscovery/api_op_ListNamespaces.go | 6 ++ .../servicediscovery/api_op_ListOperations.go | 6 ++ .../servicediscovery/api_op_ListServices.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../api_op_RegisterInstance.go | 6 ++ .../servicediscovery/api_op_TagResource.go | 6 ++ .../servicediscovery/api_op_UntagResource.go | 6 ++ ...api_op_UpdateInstanceCustomHealthStatus.go | 6 ++ .../servicediscovery/api_op_UpdateService.go | 6 ++ service/servicediscovery/go.mod | 4 +- service/servicediscovery/go.sum | 2 - service/servicequotas/api_client.go | 52 ++++++++-- .../api_op_AssociateServiceQuotaTemplate.go | 6 ++ ...ServiceQuotaIncreaseRequestFromTemplate.go | 6 ++ ...api_op_DisassociateServiceQuotaTemplate.go | 6 ++ .../api_op_GetAWSDefaultServiceQuota.go | 6 ++ ...p_GetAssociationForServiceQuotaTemplate.go | 6 ++ .../api_op_GetRequestedServiceQuotaChange.go | 6 ++ .../servicequotas/api_op_GetServiceQuota.go | 6 ++ ...ServiceQuotaIncreaseRequestFromTemplate.go | 6 ++ .../api_op_ListAWSDefaultServiceQuotas.go | 6 ++ ..._ListRequestedServiceQuotaChangeHistory.go | 6 ++ ...questedServiceQuotaChangeHistoryByQuota.go | 6 ++ ...tServiceQuotaIncreaseRequestsInTemplate.go | 6 ++ .../servicequotas/api_op_ListServiceQuotas.go | 6 ++ service/servicequotas/api_op_ListServices.go | 6 ++ ...ServiceQuotaIncreaseRequestIntoTemplate.go | 6 ++ .../api_op_RequestServiceQuotaIncrease.go | 6 ++ service/servicequotas/go.mod | 4 +- service/servicequotas/go.sum | 2 - service/ses/api_client.go | 52 ++++++++-- service/ses/api_op_CloneReceiptRuleSet.go | 6 ++ service/ses/api_op_CreateConfigurationSet.go | 6 ++ ..._CreateConfigurationSetEventDestination.go | 6 ++ ...p_CreateConfigurationSetTrackingOptions.go | 6 ++ ...p_CreateCustomVerificationEmailTemplate.go | 6 ++ service/ses/api_op_CreateReceiptFilter.go | 6 ++ service/ses/api_op_CreateReceiptRule.go | 6 ++ service/ses/api_op_CreateReceiptRuleSet.go | 6 ++ service/ses/api_op_CreateTemplate.go | 6 ++ service/ses/api_op_DeleteConfigurationSet.go | 6 ++ ..._DeleteConfigurationSetEventDestination.go | 6 ++ ...p_DeleteConfigurationSetTrackingOptions.go | 6 ++ ...p_DeleteCustomVerificationEmailTemplate.go | 6 ++ service/ses/api_op_DeleteIdentity.go | 6 ++ service/ses/api_op_DeleteIdentityPolicy.go | 6 ++ service/ses/api_op_DeleteReceiptFilter.go | 6 ++ service/ses/api_op_DeleteReceiptRule.go | 6 ++ service/ses/api_op_DeleteReceiptRuleSet.go | 6 ++ service/ses/api_op_DeleteTemplate.go | 6 ++ .../ses/api_op_DeleteVerifiedEmailAddress.go | 6 ++ .../api_op_DescribeActiveReceiptRuleSet.go | 6 ++ .../ses/api_op_DescribeConfigurationSet.go | 6 ++ service/ses/api_op_DescribeReceiptRule.go | 6 ++ service/ses/api_op_DescribeReceiptRuleSet.go | 6 ++ .../ses/api_op_GetAccountSendingEnabled.go | 6 ++ ...i_op_GetCustomVerificationEmailTemplate.go | 6 ++ .../ses/api_op_GetIdentityDkimAttributes.go | 6 ++ ..._op_GetIdentityMailFromDomainAttributes.go | 6 ++ ...pi_op_GetIdentityNotificationAttributes.go | 6 ++ service/ses/api_op_GetIdentityPolicies.go | 6 ++ ...pi_op_GetIdentityVerificationAttributes.go | 6 ++ service/ses/api_op_GetSendQuota.go | 6 ++ service/ses/api_op_GetSendStatistics.go | 6 ++ service/ses/api_op_GetTemplate.go | 6 ++ service/ses/api_op_ListConfigurationSets.go | 6 ++ ...op_ListCustomVerificationEmailTemplates.go | 6 ++ service/ses/api_op_ListIdentities.go | 6 ++ service/ses/api_op_ListIdentityPolicies.go | 6 ++ service/ses/api_op_ListReceiptFilters.go | 6 ++ service/ses/api_op_ListReceiptRuleSets.go | 6 ++ service/ses/api_op_ListTemplates.go | 6 ++ .../ses/api_op_ListVerifiedEmailAddresses.go | 6 ++ ...i_op_PutConfigurationSetDeliveryOptions.go | 6 ++ service/ses/api_op_PutIdentityPolicy.go | 6 ++ service/ses/api_op_ReorderReceiptRuleSet.go | 6 ++ service/ses/api_op_SendBounce.go | 6 ++ service/ses/api_op_SendBulkTemplatedEmail.go | 6 ++ .../ses/api_op_SendCustomVerificationEmail.go | 6 ++ service/ses/api_op_SendEmail.go | 6 ++ service/ses/api_op_SendRawEmail.go | 6 ++ service/ses/api_op_SendTemplatedEmail.go | 6 ++ service/ses/api_op_SetActiveReceiptRuleSet.go | 6 ++ service/ses/api_op_SetIdentityDkimEnabled.go | 6 ++ ...op_SetIdentityFeedbackForwardingEnabled.go | 6 ++ ...etIdentityHeadersInNotificationsEnabled.go | 6 ++ .../ses/api_op_SetIdentityMailFromDomain.go | 6 ++ .../api_op_SetIdentityNotificationTopic.go | 6 ++ service/ses/api_op_SetReceiptRulePosition.go | 6 ++ service/ses/api_op_TestRenderTemplate.go | 6 ++ .../ses/api_op_UpdateAccountSendingEnabled.go | 6 ++ ..._UpdateConfigurationSetEventDestination.go | 6 ++ ...onfigurationSetReputationMetricsEnabled.go | 6 ++ ...op_UpdateConfigurationSetSendingEnabled.go | 6 ++ ...p_UpdateConfigurationSetTrackingOptions.go | 6 ++ ...p_UpdateCustomVerificationEmailTemplate.go | 6 ++ service/ses/api_op_UpdateReceiptRule.go | 6 ++ service/ses/api_op_UpdateTemplate.go | 6 ++ service/ses/api_op_VerifyDomainDkim.go | 6 ++ service/ses/api_op_VerifyDomainIdentity.go | 6 ++ service/ses/api_op_VerifyEmailAddress.go | 6 ++ service/ses/api_op_VerifyEmailIdentity.go | 6 ++ service/ses/go.mod | 4 +- service/ses/go.sum | 2 - service/sesv2/api_client.go | 52 ++++++++-- .../sesv2/api_op_CreateConfigurationSet.go | 6 ++ ..._CreateConfigurationSetEventDestination.go | 6 ++ service/sesv2/api_op_CreateContact.go | 6 ++ service/sesv2/api_op_CreateContactList.go | 6 ++ ...p_CreateCustomVerificationEmailTemplate.go | 6 ++ service/sesv2/api_op_CreateDedicatedIpPool.go | 6 ++ .../api_op_CreateDeliverabilityTestReport.go | 6 ++ service/sesv2/api_op_CreateEmailIdentity.go | 6 ++ .../sesv2/api_op_CreateEmailIdentityPolicy.go | 6 ++ service/sesv2/api_op_CreateEmailTemplate.go | 6 ++ service/sesv2/api_op_CreateImportJob.go | 6 ++ .../sesv2/api_op_DeleteConfigurationSet.go | 6 ++ ..._DeleteConfigurationSetEventDestination.go | 6 ++ service/sesv2/api_op_DeleteContact.go | 6 ++ service/sesv2/api_op_DeleteContactList.go | 6 ++ ...p_DeleteCustomVerificationEmailTemplate.go | 6 ++ service/sesv2/api_op_DeleteDedicatedIpPool.go | 6 ++ service/sesv2/api_op_DeleteEmailIdentity.go | 6 ++ .../sesv2/api_op_DeleteEmailIdentityPolicy.go | 6 ++ service/sesv2/api_op_DeleteEmailTemplate.go | 6 ++ .../api_op_DeleteSuppressedDestination.go | 6 ++ service/sesv2/api_op_GetAccount.go | 6 ++ service/sesv2/api_op_GetBlacklistReports.go | 6 ++ service/sesv2/api_op_GetConfigurationSet.go | 6 ++ ...op_GetConfigurationSetEventDestinations.go | 6 ++ service/sesv2/api_op_GetContact.go | 6 ++ service/sesv2/api_op_GetContactList.go | 6 ++ ...i_op_GetCustomVerificationEmailTemplate.go | 6 ++ service/sesv2/api_op_GetDedicatedIp.go | 6 ++ service/sesv2/api_op_GetDedicatedIps.go | 6 ++ ...pi_op_GetDeliverabilityDashboardOptions.go | 6 ++ .../api_op_GetDeliverabilityTestReport.go | 6 ++ .../api_op_GetDomainDeliverabilityCampaign.go | 6 ++ .../sesv2/api_op_GetDomainStatisticsReport.go | 6 ++ service/sesv2/api_op_GetEmailIdentity.go | 6 ++ .../sesv2/api_op_GetEmailIdentityPolicies.go | 6 ++ service/sesv2/api_op_GetEmailTemplate.go | 6 ++ service/sesv2/api_op_GetImportJob.go | 6 ++ .../sesv2/api_op_GetSuppressedDestination.go | 6 ++ service/sesv2/api_op_ListConfigurationSets.go | 6 ++ service/sesv2/api_op_ListContactLists.go | 6 ++ service/sesv2/api_op_ListContacts.go | 6 ++ ...op_ListCustomVerificationEmailTemplates.go | 6 ++ service/sesv2/api_op_ListDedicatedIpPools.go | 6 ++ .../api_op_ListDeliverabilityTestReports.go | 6 ++ ...pi_op_ListDomainDeliverabilityCampaigns.go | 6 ++ service/sesv2/api_op_ListEmailIdentities.go | 6 ++ service/sesv2/api_op_ListEmailTemplates.go | 6 ++ service/sesv2/api_op_ListImportJobs.go | 6 ++ .../api_op_ListSuppressedDestinations.go | 6 ++ service/sesv2/api_op_ListTagsForResource.go | 6 ++ ...p_PutAccountDedicatedIpWarmupAttributes.go | 6 ++ service/sesv2/api_op_PutAccountDetails.go | 6 ++ .../api_op_PutAccountSendingAttributes.go | 6 ++ .../api_op_PutAccountSuppressionAttributes.go | 6 ++ ...i_op_PutConfigurationSetDeliveryOptions.go | 6 ++ ...op_PutConfigurationSetReputationOptions.go | 6 ++ ...pi_op_PutConfigurationSetSendingOptions.go | 6 ++ ...p_PutConfigurationSetSuppressionOptions.go | 6 ++ ...i_op_PutConfigurationSetTrackingOptions.go | 6 ++ service/sesv2/api_op_PutDedicatedIpInPool.go | 6 ++ .../api_op_PutDedicatedIpWarmupAttributes.go | 6 ++ ...api_op_PutDeliverabilityDashboardOption.go | 6 ++ .../api_op_PutEmailIdentityDkimAttributes.go | 6 ++ ...p_PutEmailIdentityDkimSigningAttributes.go | 6 ++ ...i_op_PutEmailIdentityFeedbackAttributes.go | 6 ++ ...i_op_PutEmailIdentityMailFromAttributes.go | 6 ++ .../sesv2/api_op_PutSuppressedDestination.go | 6 ++ service/sesv2/api_op_SendBulkEmail.go | 6 ++ .../api_op_SendCustomVerificationEmail.go | 6 ++ service/sesv2/api_op_SendEmail.go | 6 ++ service/sesv2/api_op_TagResource.go | 6 ++ .../sesv2/api_op_TestRenderEmailTemplate.go | 6 ++ service/sesv2/api_op_UntagResource.go | 6 ++ ..._UpdateConfigurationSetEventDestination.go | 6 ++ service/sesv2/api_op_UpdateContact.go | 6 ++ service/sesv2/api_op_UpdateContactList.go | 6 ++ ...p_UpdateCustomVerificationEmailTemplate.go | 6 ++ .../sesv2/api_op_UpdateEmailIdentityPolicy.go | 6 ++ service/sesv2/api_op_UpdateEmailTemplate.go | 6 ++ service/sesv2/go.mod | 4 +- service/sesv2/go.sum | 2 - service/sfn/api_client.go | 52 ++++++++-- service/sfn/api_op_CreateActivity.go | 6 ++ service/sfn/api_op_CreateStateMachine.go | 6 ++ service/sfn/api_op_DeleteActivity.go | 6 ++ service/sfn/api_op_DeleteStateMachine.go | 6 ++ service/sfn/api_op_DescribeActivity.go | 6 ++ service/sfn/api_op_DescribeExecution.go | 6 ++ service/sfn/api_op_DescribeStateMachine.go | 6 ++ ...api_op_DescribeStateMachineForExecution.go | 6 ++ service/sfn/api_op_GetActivityTask.go | 6 ++ service/sfn/api_op_GetExecutionHistory.go | 6 ++ service/sfn/api_op_ListActivities.go | 6 ++ service/sfn/api_op_ListExecutions.go | 6 ++ service/sfn/api_op_ListStateMachines.go | 6 ++ service/sfn/api_op_ListTagsForResource.go | 6 ++ service/sfn/api_op_SendTaskFailure.go | 6 ++ service/sfn/api_op_SendTaskHeartbeat.go | 6 ++ service/sfn/api_op_SendTaskSuccess.go | 6 ++ service/sfn/api_op_StartExecution.go | 6 ++ service/sfn/api_op_StopExecution.go | 6 ++ service/sfn/api_op_TagResource.go | 6 ++ service/sfn/api_op_UntagResource.go | 6 ++ service/sfn/api_op_UpdateStateMachine.go | 6 ++ service/sfn/go.mod | 4 +- service/sfn/go.sum | 2 - service/shield/api_client.go | 52 ++++++++-- .../shield/api_op_AssociateDRTLogBucket.go | 6 ++ service/shield/api_op_AssociateDRTRole.go | 6 ++ service/shield/api_op_AssociateHealthCheck.go | 6 ++ ..._op_AssociateProactiveEngagementDetails.go | 6 ++ service/shield/api_op_CreateProtection.go | 6 ++ service/shield/api_op_CreateSubscription.go | 6 ++ service/shield/api_op_DeleteProtection.go | 6 ++ service/shield/api_op_DeleteSubscription.go | 6 ++ service/shield/api_op_DescribeAttack.go | 6 ++ service/shield/api_op_DescribeDRTAccess.go | 6 ++ ...api_op_DescribeEmergencyContactSettings.go | 6 ++ service/shield/api_op_DescribeProtection.go | 6 ++ service/shield/api_op_DescribeSubscription.go | 6 ++ .../api_op_DisableProactiveEngagement.go | 6 ++ .../shield/api_op_DisassociateDRTLogBucket.go | 6 ++ service/shield/api_op_DisassociateDRTRole.go | 6 ++ .../shield/api_op_DisassociateHealthCheck.go | 6 ++ .../api_op_EnableProactiveEngagement.go | 6 ++ service/shield/api_op_GetSubscriptionState.go | 6 ++ service/shield/api_op_ListAttacks.go | 6 ++ service/shield/api_op_ListProtections.go | 6 ++ .../api_op_UpdateEmergencyContactSettings.go | 6 ++ service/shield/api_op_UpdateSubscription.go | 6 ++ service/shield/go.mod | 4 +- service/shield/go.sum | 2 - service/signer/api_client.go | 52 ++++++++-- service/signer/api_op_CancelSigningProfile.go | 6 ++ service/signer/api_op_DescribeSigningJob.go | 6 ++ service/signer/api_op_GetSigningPlatform.go | 6 ++ service/signer/api_op_GetSigningProfile.go | 6 ++ service/signer/api_op_ListSigningJobs.go | 6 ++ service/signer/api_op_ListSigningPlatforms.go | 6 ++ service/signer/api_op_ListSigningProfiles.go | 6 ++ service/signer/api_op_ListTagsForResource.go | 6 ++ service/signer/api_op_PutSigningProfile.go | 6 ++ service/signer/api_op_StartSigningJob.go | 6 ++ service/signer/api_op_TagResource.go | 6 ++ service/signer/api_op_UntagResource.go | 6 ++ service/signer/go.mod | 4 +- service/signer/go.sum | 2 - service/sms/api_client.go | 52 ++++++++-- service/sms/api_op_CreateApp.go | 6 ++ service/sms/api_op_CreateReplicationJob.go | 6 ++ service/sms/api_op_DeleteApp.go | 6 ++ .../api_op_DeleteAppLaunchConfiguration.go | 6 ++ ...pi_op_DeleteAppReplicationConfiguration.go | 6 ++ ...api_op_DeleteAppValidationConfiguration.go | 6 ++ service/sms/api_op_DeleteReplicationJob.go | 6 ++ service/sms/api_op_DeleteServerCatalog.go | 6 ++ service/sms/api_op_DisassociateConnector.go | 6 ++ service/sms/api_op_GenerateChangeSet.go | 6 ++ service/sms/api_op_GenerateTemplate.go | 6 ++ service/sms/api_op_GetApp.go | 6 ++ .../sms/api_op_GetAppLaunchConfiguration.go | 6 ++ .../api_op_GetAppReplicationConfiguration.go | 6 ++ .../api_op_GetAppValidationConfiguration.go | 6 ++ service/sms/api_op_GetAppValidationOutput.go | 6 ++ service/sms/api_op_GetConnectors.go | 6 ++ service/sms/api_op_GetReplicationJobs.go | 6 ++ service/sms/api_op_GetReplicationRuns.go | 6 ++ service/sms/api_op_GetServers.go | 6 ++ service/sms/api_op_ImportAppCatalog.go | 6 ++ service/sms/api_op_ImportServerCatalog.go | 6 ++ service/sms/api_op_LaunchApp.go | 6 ++ service/sms/api_op_ListApps.go | 6 ++ .../sms/api_op_NotifyAppValidationOutput.go | 6 ++ .../sms/api_op_PutAppLaunchConfiguration.go | 6 ++ .../api_op_PutAppReplicationConfiguration.go | 6 ++ .../api_op_PutAppValidationConfiguration.go | 6 ++ service/sms/api_op_StartAppReplication.go | 6 ++ .../sms/api_op_StartOnDemandAppReplication.go | 6 ++ .../sms/api_op_StartOnDemandReplicationRun.go | 6 ++ service/sms/api_op_StopAppReplication.go | 6 ++ service/sms/api_op_TerminateApp.go | 6 ++ service/sms/api_op_UpdateApp.go | 6 ++ service/sms/api_op_UpdateReplicationJob.go | 6 ++ service/sms/go.mod | 4 +- service/sms/go.sum | 2 - service/snowball/api_client.go | 52 ++++++++-- service/snowball/api_op_CancelCluster.go | 6 ++ service/snowball/api_op_CancelJob.go | 6 ++ service/snowball/api_op_CreateAddress.go | 6 ++ service/snowball/api_op_CreateCluster.go | 6 ++ service/snowball/api_op_CreateJob.go | 6 ++ .../api_op_CreateReturnShippingLabel.go | 6 ++ service/snowball/api_op_DescribeAddress.go | 6 ++ service/snowball/api_op_DescribeAddresses.go | 6 ++ service/snowball/api_op_DescribeCluster.go | 6 ++ service/snowball/api_op_DescribeJob.go | 6 ++ .../api_op_DescribeReturnShippingLabel.go | 6 ++ service/snowball/api_op_GetJobManifest.go | 6 ++ service/snowball/api_op_GetJobUnlockCode.go | 6 ++ service/snowball/api_op_GetSnowballUsage.go | 6 ++ service/snowball/api_op_GetSoftwareUpdates.go | 6 ++ service/snowball/api_op_ListClusterJobs.go | 6 ++ service/snowball/api_op_ListClusters.go | 6 ++ .../snowball/api_op_ListCompatibleImages.go | 6 ++ service/snowball/api_op_ListJobs.go | 6 ++ service/snowball/api_op_UpdateCluster.go | 6 ++ service/snowball/api_op_UpdateJob.go | 6 ++ .../snowball/api_op_UpdateJobShipmentState.go | 6 ++ service/snowball/go.mod | 4 +- service/snowball/go.sum | 2 - service/sns/api_client.go | 52 ++++++++-- service/sns/api_op_AddPermission.go | 6 ++ .../api_op_CheckIfPhoneNumberIsOptedOut.go | 6 ++ service/sns/api_op_ConfirmSubscription.go | 6 ++ .../sns/api_op_CreatePlatformApplication.go | 6 ++ service/sns/api_op_CreatePlatformEndpoint.go | 6 ++ service/sns/api_op_CreateTopic.go | 6 ++ service/sns/api_op_DeleteEndpoint.go | 6 ++ .../sns/api_op_DeletePlatformApplication.go | 6 ++ service/sns/api_op_DeleteTopic.go | 6 ++ service/sns/api_op_GetEndpointAttributes.go | 6 ++ ...api_op_GetPlatformApplicationAttributes.go | 6 ++ service/sns/api_op_GetSMSAttributes.go | 6 ++ .../sns/api_op_GetSubscriptionAttributes.go | 6 ++ service/sns/api_op_GetTopicAttributes.go | 6 ++ ...i_op_ListEndpointsByPlatformApplication.go | 6 ++ .../sns/api_op_ListPhoneNumbersOptedOut.go | 6 ++ .../sns/api_op_ListPlatformApplications.go | 6 ++ service/sns/api_op_ListSubscriptions.go | 6 ++ .../sns/api_op_ListSubscriptionsByTopic.go | 6 ++ service/sns/api_op_ListTagsForResource.go | 6 ++ service/sns/api_op_ListTopics.go | 6 ++ service/sns/api_op_OptInPhoneNumber.go | 6 ++ service/sns/api_op_Publish.go | 6 ++ service/sns/api_op_RemovePermission.go | 6 ++ service/sns/api_op_SetEndpointAttributes.go | 6 ++ ...api_op_SetPlatformApplicationAttributes.go | 6 ++ service/sns/api_op_SetSMSAttributes.go | 6 ++ .../sns/api_op_SetSubscriptionAttributes.go | 6 ++ service/sns/api_op_SetTopicAttributes.go | 6 ++ service/sns/api_op_Subscribe.go | 6 ++ service/sns/api_op_TagResource.go | 6 ++ service/sns/api_op_Unsubscribe.go | 6 ++ service/sns/api_op_UntagResource.go | 6 ++ service/sns/go.mod | 4 +- service/sns/go.sum | 2 - service/sqs/api_client.go | 52 ++++++++-- service/sqs/api_op_AddPermission.go | 6 ++ service/sqs/api_op_ChangeMessageVisibility.go | 6 ++ .../api_op_ChangeMessageVisibilityBatch.go | 6 ++ service/sqs/api_op_CreateQueue.go | 6 ++ service/sqs/api_op_DeleteMessage.go | 6 ++ service/sqs/api_op_DeleteMessageBatch.go | 6 ++ service/sqs/api_op_DeleteQueue.go | 6 ++ service/sqs/api_op_GetQueueAttributes.go | 6 ++ service/sqs/api_op_GetQueueUrl.go | 6 ++ .../sqs/api_op_ListDeadLetterSourceQueues.go | 6 ++ service/sqs/api_op_ListQueueTags.go | 6 ++ service/sqs/api_op_ListQueues.go | 6 ++ service/sqs/api_op_PurgeQueue.go | 6 ++ service/sqs/api_op_ReceiveMessage.go | 6 ++ service/sqs/api_op_RemovePermission.go | 6 ++ service/sqs/api_op_SendMessage.go | 6 ++ service/sqs/api_op_SendMessageBatch.go | 6 ++ service/sqs/api_op_SetQueueAttributes.go | 6 ++ service/sqs/api_op_TagQueue.go | 6 ++ service/sqs/api_op_UntagQueue.go | 6 ++ service/sqs/go.mod | 4 +- service/sqs/go.sum | 2 - service/ssm/api_client.go | 52 ++++++++-- service/ssm/api_op_AddTagsToResource.go | 6 ++ service/ssm/api_op_CancelCommand.go | 6 ++ ...api_op_CancelMaintenanceWindowExecution.go | 6 ++ service/ssm/api_op_CreateActivation.go | 6 ++ service/ssm/api_op_CreateAssociation.go | 6 ++ service/ssm/api_op_CreateAssociationBatch.go | 6 ++ service/ssm/api_op_CreateDocument.go | 6 ++ service/ssm/api_op_CreateMaintenanceWindow.go | 6 ++ service/ssm/api_op_CreateOpsItem.go | 6 ++ service/ssm/api_op_CreatePatchBaseline.go | 6 ++ service/ssm/api_op_CreateResourceDataSync.go | 6 ++ service/ssm/api_op_DeleteActivation.go | 6 ++ service/ssm/api_op_DeleteAssociation.go | 6 ++ service/ssm/api_op_DeleteDocument.go | 6 ++ service/ssm/api_op_DeleteInventory.go | 6 ++ service/ssm/api_op_DeleteMaintenanceWindow.go | 6 ++ service/ssm/api_op_DeleteParameter.go | 6 ++ service/ssm/api_op_DeleteParameters.go | 6 ++ service/ssm/api_op_DeletePatchBaseline.go | 6 ++ service/ssm/api_op_DeleteResourceDataSync.go | 6 ++ .../ssm/api_op_DeregisterManagedInstance.go | 6 ++ ...op_DeregisterPatchBaselineForPatchGroup.go | 6 ++ ...p_DeregisterTargetFromMaintenanceWindow.go | 6 ++ ..._op_DeregisterTaskFromMaintenanceWindow.go | 6 ++ service/ssm/api_op_DescribeActivations.go | 6 ++ service/ssm/api_op_DescribeAssociation.go | 6 ++ ..._op_DescribeAssociationExecutionTargets.go | 6 ++ .../api_op_DescribeAssociationExecutions.go | 6 ++ .../api_op_DescribeAutomationExecutions.go | 6 ++ ...api_op_DescribeAutomationStepExecutions.go | 6 ++ .../ssm/api_op_DescribeAvailablePatches.go | 6 ++ service/ssm/api_op_DescribeDocument.go | 6 ++ .../ssm/api_op_DescribeDocumentPermission.go | 6 ++ ...p_DescribeEffectiveInstanceAssociations.go | 6 ++ ...escribeEffectivePatchesForPatchBaseline.go | 6 ++ ...i_op_DescribeInstanceAssociationsStatus.go | 6 ++ .../ssm/api_op_DescribeInstanceInformation.go | 6 ++ .../ssm/api_op_DescribeInstancePatchStates.go | 6 ++ ...escribeInstancePatchStatesForPatchGroup.go | 6 ++ service/ssm/api_op_DescribeInstancePatches.go | 6 ++ .../ssm/api_op_DescribeInventoryDeletions.go | 6 ++ ...intenanceWindowExecutionTaskInvocations.go | 6 ++ ...DescribeMaintenanceWindowExecutionTasks.go | 6 ++ ..._op_DescribeMaintenanceWindowExecutions.go | 6 ++ ...pi_op_DescribeMaintenanceWindowSchedule.go | 6 ++ ...api_op_DescribeMaintenanceWindowTargets.go | 6 ++ .../api_op_DescribeMaintenanceWindowTasks.go | 6 ++ .../ssm/api_op_DescribeMaintenanceWindows.go | 6 ++ ..._op_DescribeMaintenanceWindowsForTarget.go | 6 ++ service/ssm/api_op_DescribeOpsItems.go | 6 ++ service/ssm/api_op_DescribeParameters.go | 6 ++ service/ssm/api_op_DescribePatchBaselines.go | 6 ++ service/ssm/api_op_DescribePatchGroupState.go | 6 ++ service/ssm/api_op_DescribePatchGroups.go | 6 ++ service/ssm/api_op_DescribePatchProperties.go | 6 ++ service/ssm/api_op_DescribeSessions.go | 6 ++ service/ssm/api_op_GetAutomationExecution.go | 6 ++ service/ssm/api_op_GetCalendarState.go | 6 ++ service/ssm/api_op_GetCommandInvocation.go | 6 ++ service/ssm/api_op_GetConnectionStatus.go | 6 ++ service/ssm/api_op_GetDefaultPatchBaseline.go | 6 ++ ...p_GetDeployablePatchSnapshotForInstance.go | 6 ++ service/ssm/api_op_GetDocument.go | 6 ++ service/ssm/api_op_GetInventory.go | 6 ++ service/ssm/api_op_GetInventorySchema.go | 6 ++ service/ssm/api_op_GetMaintenanceWindow.go | 6 ++ .../api_op_GetMaintenanceWindowExecution.go | 6 ++ ...pi_op_GetMaintenanceWindowExecutionTask.go | 6 ++ ...aintenanceWindowExecutionTaskInvocation.go | 6 ++ .../ssm/api_op_GetMaintenanceWindowTask.go | 6 ++ service/ssm/api_op_GetOpsItem.go | 6 ++ service/ssm/api_op_GetOpsSummary.go | 6 ++ service/ssm/api_op_GetParameter.go | 6 ++ service/ssm/api_op_GetParameterHistory.go | 6 ++ service/ssm/api_op_GetParameters.go | 6 ++ service/ssm/api_op_GetParametersByPath.go | 6 ++ service/ssm/api_op_GetPatchBaseline.go | 6 ++ .../api_op_GetPatchBaselineForPatchGroup.go | 6 ++ service/ssm/api_op_GetServiceSetting.go | 6 ++ service/ssm/api_op_LabelParameterVersion.go | 6 ++ service/ssm/api_op_ListAssociationVersions.go | 6 ++ service/ssm/api_op_ListAssociations.go | 6 ++ service/ssm/api_op_ListCommandInvocations.go | 6 ++ service/ssm/api_op_ListCommands.go | 6 ++ service/ssm/api_op_ListComplianceItems.go | 6 ++ service/ssm/api_op_ListComplianceSummaries.go | 6 ++ service/ssm/api_op_ListDocumentVersions.go | 6 ++ service/ssm/api_op_ListDocuments.go | 6 ++ service/ssm/api_op_ListInventoryEntries.go | 6 ++ .../api_op_ListResourceComplianceSummaries.go | 6 ++ service/ssm/api_op_ListResourceDataSync.go | 6 ++ service/ssm/api_op_ListTagsForResource.go | 6 ++ .../ssm/api_op_ModifyDocumentPermission.go | 6 ++ service/ssm/api_op_PutComplianceItems.go | 6 ++ service/ssm/api_op_PutInventory.go | 6 ++ service/ssm/api_op_PutParameter.go | 6 ++ .../api_op_RegisterDefaultPatchBaseline.go | 6 ++ ...i_op_RegisterPatchBaselineForPatchGroup.go | 6 ++ ..._op_RegisterTargetWithMaintenanceWindow.go | 6 ++ ...pi_op_RegisterTaskWithMaintenanceWindow.go | 6 ++ service/ssm/api_op_RemoveTagsFromResource.go | 6 ++ service/ssm/api_op_ResetServiceSetting.go | 6 ++ service/ssm/api_op_ResumeSession.go | 6 ++ service/ssm/api_op_SendAutomationSignal.go | 6 ++ service/ssm/api_op_SendCommand.go | 6 ++ service/ssm/api_op_StartAssociationsOnce.go | 6 ++ .../ssm/api_op_StartAutomationExecution.go | 6 ++ service/ssm/api_op_StartSession.go | 6 ++ service/ssm/api_op_StopAutomationExecution.go | 6 ++ service/ssm/api_op_TerminateSession.go | 6 ++ service/ssm/api_op_UpdateAssociation.go | 6 ++ service/ssm/api_op_UpdateAssociationStatus.go | 6 ++ service/ssm/api_op_UpdateDocument.go | 6 ++ .../api_op_UpdateDocumentDefaultVersion.go | 6 ++ service/ssm/api_op_UpdateMaintenanceWindow.go | 6 ++ .../api_op_UpdateMaintenanceWindowTarget.go | 6 ++ .../ssm/api_op_UpdateMaintenanceWindowTask.go | 6 ++ .../ssm/api_op_UpdateManagedInstanceRole.go | 6 ++ service/ssm/api_op_UpdateOpsItem.go | 6 ++ service/ssm/api_op_UpdatePatchBaseline.go | 6 ++ service/ssm/api_op_UpdateResourceDataSync.go | 6 ++ service/ssm/api_op_UpdateServiceSetting.go | 6 ++ service/ssm/go.mod | 4 +- service/ssm/go.sum | 2 - service/sso/api_client.go | 52 ++++++++-- service/sso/api_op_GetRoleCredentials.go | 6 ++ service/sso/api_op_ListAccountRoles.go | 6 ++ service/sso/api_op_ListAccounts.go | 6 ++ service/sso/api_op_Logout.go | 6 ++ service/sso/go.mod | 4 +- service/sso/go.sum | 2 - service/ssoadmin/api_client.go | 52 ++++++++-- ...i_op_AttachManagedPolicyToPermissionSet.go | 6 ++ .../api_op_CreateAccountAssignment.go | 6 ++ .../ssoadmin/api_op_CreatePermissionSet.go | 6 ++ .../api_op_DeleteAccountAssignment.go | 6 ++ ..._op_DeleteInlinePolicyFromPermissionSet.go | 6 ++ .../ssoadmin/api_op_DeletePermissionSet.go | 6 ++ ...DescribeAccountAssignmentCreationStatus.go | 6 ++ ...DescribeAccountAssignmentDeletionStatus.go | 6 ++ .../ssoadmin/api_op_DescribePermissionSet.go | 6 ++ ...DescribePermissionSetProvisioningStatus.go | 6 ++ ...op_DetachManagedPolicyFromPermissionSet.go | 6 ++ .../api_op_GetInlinePolicyForPermissionSet.go | 6 ++ ..._op_ListAccountAssignmentCreationStatus.go | 6 ++ ..._op_ListAccountAssignmentDeletionStatus.go | 6 ++ .../ssoadmin/api_op_ListAccountAssignments.go | 6 ++ ...ListAccountsForProvisionedPermissionSet.go | 6 ++ service/ssoadmin/api_op_ListInstances.go | 6 ++ ...i_op_ListManagedPoliciesInPermissionSet.go | 6 ++ ..._op_ListPermissionSetProvisioningStatus.go | 6 ++ service/ssoadmin/api_op_ListPermissionSets.go | 6 ++ ..._ListPermissionSetsProvisionedToAccount.go | 6 ++ .../ssoadmin/api_op_ListTagsForResource.go | 6 ++ .../ssoadmin/api_op_ProvisionPermissionSet.go | 6 ++ .../api_op_PutInlinePolicyToPermissionSet.go | 6 ++ service/ssoadmin/api_op_TagResource.go | 6 ++ service/ssoadmin/api_op_UntagResource.go | 6 ++ .../ssoadmin/api_op_UpdatePermissionSet.go | 6 ++ service/ssoadmin/go.mod | 4 +- service/ssoadmin/go.sum | 2 - service/ssooidc/api_client.go | 52 ++++++++-- service/ssooidc/api_op_CreateToken.go | 6 ++ service/ssooidc/api_op_RegisterClient.go | 6 ++ .../api_op_StartDeviceAuthorization.go | 6 ++ service/ssooidc/go.mod | 4 +- service/ssooidc/go.sum | 2 - service/storagegateway/api_client.go | 52 ++++++++-- .../storagegateway/api_op_ActivateGateway.go | 6 ++ service/storagegateway/api_op_AddCache.go | 6 ++ .../api_op_AddTagsToResource.go | 6 ++ .../storagegateway/api_op_AddUploadBuffer.go | 6 ++ .../api_op_AddWorkingStorage.go | 6 ++ .../storagegateway/api_op_AssignTapePool.go | 6 ++ service/storagegateway/api_op_AttachVolume.go | 6 ++ .../storagegateway/api_op_CancelArchival.go | 6 ++ .../storagegateway/api_op_CancelRetrieval.go | 6 ++ .../api_op_CreateCachediSCSIVolume.go | 6 ++ .../api_op_CreateNFSFileShare.go | 6 ++ .../api_op_CreateSMBFileShare.go | 6 ++ .../storagegateway/api_op_CreateSnapshot.go | 6 ++ ...p_CreateSnapshotFromVolumeRecoveryPoint.go | 6 ++ .../api_op_CreateStorediSCSIVolume.go | 6 ++ .../storagegateway/api_op_CreateTapePool.go | 6 ++ .../api_op_CreateTapeWithBarcode.go | 6 ++ service/storagegateway/api_op_CreateTapes.go | 6 ++ ...pi_op_DeleteAutomaticTapeCreationPolicy.go | 6 ++ .../api_op_DeleteBandwidthRateLimit.go | 6 ++ .../api_op_DeleteChapCredentials.go | 6 ++ .../storagegateway/api_op_DeleteFileShare.go | 6 ++ .../storagegateway/api_op_DeleteGateway.go | 6 ++ .../api_op_DeleteSnapshotSchedule.go | 6 ++ service/storagegateway/api_op_DeleteTape.go | 6 ++ .../api_op_DeleteTapeArchive.go | 6 ++ .../storagegateway/api_op_DeleteTapePool.go | 6 ++ service/storagegateway/api_op_DeleteVolume.go | 6 ++ .../api_op_DescribeAvailabilityMonitorTest.go | 6 ++ .../api_op_DescribeBandwidthRateLimit.go | 6 ++ .../storagegateway/api_op_DescribeCache.go | 6 ++ .../api_op_DescribeCachediSCSIVolumes.go | 6 ++ .../api_op_DescribeChapCredentials.go | 6 ++ .../api_op_DescribeGatewayInformation.go | 6 ++ .../api_op_DescribeMaintenanceStartTime.go | 6 ++ .../api_op_DescribeNFSFileShares.go | 6 ++ .../api_op_DescribeSMBFileShares.go | 6 ++ .../api_op_DescribeSMBSettings.go | 6 ++ .../api_op_DescribeSnapshotSchedule.go | 6 ++ .../api_op_DescribeStorediSCSIVolumes.go | 6 ++ .../api_op_DescribeTapeArchives.go | 6 ++ .../api_op_DescribeTapeRecoveryPoints.go | 6 ++ .../storagegateway/api_op_DescribeTapes.go | 6 ++ .../api_op_DescribeUploadBuffer.go | 6 ++ .../api_op_DescribeVTLDevices.go | 6 ++ .../api_op_DescribeWorkingStorage.go | 6 ++ service/storagegateway/api_op_DetachVolume.go | 6 ++ .../storagegateway/api_op_DisableGateway.go | 6 ++ service/storagegateway/api_op_JoinDomain.go | 6 ++ ...pi_op_ListAutomaticTapeCreationPolicies.go | 6 ++ .../storagegateway/api_op_ListFileShares.go | 6 ++ service/storagegateway/api_op_ListGateways.go | 6 ++ .../storagegateway/api_op_ListLocalDisks.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ .../storagegateway/api_op_ListTapePools.go | 6 ++ service/storagegateway/api_op_ListTapes.go | 6 ++ .../api_op_ListVolumeInitiators.go | 6 ++ .../api_op_ListVolumeRecoveryPoints.go | 6 ++ service/storagegateway/api_op_ListVolumes.go | 6 ++ .../api_op_NotifyWhenUploaded.go | 6 ++ service/storagegateway/api_op_RefreshCache.go | 6 ++ .../api_op_RemoveTagsFromResource.go | 6 ++ service/storagegateway/api_op_ResetCache.go | 6 ++ .../api_op_RetrieveTapeArchive.go | 6 ++ .../api_op_RetrieveTapeRecoveryPoint.go | 6 ++ .../api_op_SetLocalConsolePassword.go | 6 ++ .../api_op_SetSMBGuestPassword.go | 6 ++ .../storagegateway/api_op_ShutdownGateway.go | 6 ++ .../api_op_StartAvailabilityMonitorTest.go | 6 ++ service/storagegateway/api_op_StartGateway.go | 6 ++ ...pi_op_UpdateAutomaticTapeCreationPolicy.go | 6 ++ .../api_op_UpdateBandwidthRateLimit.go | 6 ++ .../api_op_UpdateChapCredentials.go | 6 ++ .../api_op_UpdateGatewayInformation.go | 6 ++ .../api_op_UpdateGatewaySoftwareNow.go | 6 ++ .../api_op_UpdateMaintenanceStartTime.go | 6 ++ .../api_op_UpdateNFSFileShare.go | 6 ++ .../api_op_UpdateSMBFileShare.go | 6 ++ .../api_op_UpdateSMBFileShareVisibility.go | 6 ++ .../api_op_UpdateSMBSecurityStrategy.go | 6 ++ .../api_op_UpdateSnapshotSchedule.go | 6 ++ .../api_op_UpdateVTLDeviceType.go | 6 ++ service/storagegateway/go.mod | 4 +- service/storagegateway/go.sum | 2 - service/sts/api_client.go | 52 ++++++++-- service/sts/api_op_AssumeRole.go | 6 ++ service/sts/api_op_AssumeRoleWithSAML.go | 6 ++ .../sts/api_op_AssumeRoleWithWebIdentity.go | 6 ++ .../sts/api_op_DecodeAuthorizationMessage.go | 6 ++ service/sts/api_op_GetAccessKeyInfo.go | 6 ++ service/sts/api_op_GetCallerIdentity.go | 6 ++ service/sts/api_op_GetFederationToken.go | 6 ++ service/sts/api_op_GetSessionToken.go | 6 ++ service/sts/go.mod | 4 +- service/sts/go.sum | 2 - service/support/api_client.go | 52 ++++++++-- service/support/api_op_AddAttachmentsToSet.go | 6 ++ .../support/api_op_AddCommunicationToCase.go | 6 ++ service/support/api_op_CreateCase.go | 6 ++ service/support/api_op_DescribeAttachment.go | 6 ++ service/support/api_op_DescribeCases.go | 6 ++ .../support/api_op_DescribeCommunications.go | 6 ++ service/support/api_op_DescribeServices.go | 6 ++ .../support/api_op_DescribeSeverityLevels.go | 6 ++ ...cribeTrustedAdvisorCheckRefreshStatuses.go | 6 ++ ...pi_op_DescribeTrustedAdvisorCheckResult.go | 6 ++ ...op_DescribeTrustedAdvisorCheckSummaries.go | 6 ++ .../api_op_DescribeTrustedAdvisorChecks.go | 6 ++ .../api_op_RefreshTrustedAdvisorCheck.go | 6 ++ service/support/api_op_ResolveCase.go | 6 ++ service/support/go.mod | 4 +- service/support/go.sum | 2 - service/swf/api_client.go | 52 ++++++++-- .../api_op_CountClosedWorkflowExecutions.go | 6 ++ .../swf/api_op_CountOpenWorkflowExecutions.go | 6 ++ .../swf/api_op_CountPendingActivityTasks.go | 6 ++ .../swf/api_op_CountPendingDecisionTasks.go | 6 ++ service/swf/api_op_DeprecateActivityType.go | 6 ++ service/swf/api_op_DeprecateDomain.go | 6 ++ service/swf/api_op_DeprecateWorkflowType.go | 6 ++ service/swf/api_op_DescribeActivityType.go | 6 ++ service/swf/api_op_DescribeDomain.go | 6 ++ .../swf/api_op_DescribeWorkflowExecution.go | 6 ++ service/swf/api_op_DescribeWorkflowType.go | 6 ++ .../swf/api_op_GetWorkflowExecutionHistory.go | 6 ++ service/swf/api_op_ListActivityTypes.go | 6 ++ .../api_op_ListClosedWorkflowExecutions.go | 6 ++ service/swf/api_op_ListDomains.go | 6 ++ .../swf/api_op_ListOpenWorkflowExecutions.go | 6 ++ service/swf/api_op_ListTagsForResource.go | 6 ++ service/swf/api_op_ListWorkflowTypes.go | 6 ++ service/swf/api_op_PollForActivityTask.go | 6 ++ service/swf/api_op_PollForDecisionTask.go | 6 ++ .../swf/api_op_RecordActivityTaskHeartbeat.go | 6 ++ service/swf/api_op_RegisterActivityType.go | 6 ++ service/swf/api_op_RegisterDomain.go | 6 ++ service/swf/api_op_RegisterWorkflowType.go | 6 ++ .../api_op_RequestCancelWorkflowExecution.go | 6 ++ .../swf/api_op_RespondActivityTaskCanceled.go | 6 ++ .../api_op_RespondActivityTaskCompleted.go | 6 ++ .../swf/api_op_RespondActivityTaskFailed.go | 6 ++ .../api_op_RespondDecisionTaskCompleted.go | 6 ++ service/swf/api_op_SignalWorkflowExecution.go | 6 ++ service/swf/api_op_StartWorkflowExecution.go | 6 ++ service/swf/api_op_TagResource.go | 6 ++ .../swf/api_op_TerminateWorkflowExecution.go | 6 ++ service/swf/api_op_UndeprecateActivityType.go | 6 ++ service/swf/api_op_UndeprecateDomain.go | 6 ++ service/swf/api_op_UndeprecateWorkflowType.go | 6 ++ service/swf/api_op_UntagResource.go | 6 ++ service/swf/go.mod | 4 +- service/swf/go.sum | 2 - service/synthetics/api_client.go | 52 ++++++++-- service/synthetics/api_op_CreateCanary.go | 6 ++ service/synthetics/api_op_DeleteCanary.go | 6 ++ service/synthetics/api_op_DescribeCanaries.go | 6 ++ .../api_op_DescribeCanariesLastRun.go | 6 ++ .../api_op_DescribeRuntimeVersions.go | 6 ++ service/synthetics/api_op_GetCanary.go | 6 ++ service/synthetics/api_op_GetCanaryRuns.go | 6 ++ .../synthetics/api_op_ListTagsForResource.go | 6 ++ service/synthetics/api_op_StartCanary.go | 6 ++ service/synthetics/api_op_StopCanary.go | 6 ++ service/synthetics/api_op_TagResource.go | 6 ++ service/synthetics/api_op_UntagResource.go | 6 ++ service/synthetics/api_op_UpdateCanary.go | 6 ++ service/synthetics/go.mod | 4 +- service/synthetics/go.sum | 2 - service/textract/api_client.go | 52 ++++++++-- service/textract/api_op_AnalyzeDocument.go | 6 ++ service/textract/api_op_DetectDocumentText.go | 6 ++ .../textract/api_op_GetDocumentAnalysis.go | 6 ++ .../api_op_GetDocumentTextDetection.go | 6 ++ .../textract/api_op_StartDocumentAnalysis.go | 6 ++ .../api_op_StartDocumentTextDetection.go | 6 ++ service/textract/go.mod | 4 +- service/textract/go.sum | 2 - service/timestreamquery/api_client.go | 52 ++++++++-- service/timestreamquery/api_op_CancelQuery.go | 6 ++ .../api_op_DescribeEndpoints.go | 6 ++ service/timestreamquery/api_op_Query.go | 6 ++ service/timestreamquery/go.mod | 4 +- service/timestreamquery/go.sum | 2 - service/timestreamwrite/api_client.go | 52 ++++++++-- .../timestreamwrite/api_op_CreateDatabase.go | 6 ++ service/timestreamwrite/api_op_CreateTable.go | 6 ++ .../timestreamwrite/api_op_DeleteDatabase.go | 6 ++ service/timestreamwrite/api_op_DeleteTable.go | 6 ++ .../api_op_DescribeDatabase.go | 6 ++ .../api_op_DescribeEndpoints.go | 6 ++ .../timestreamwrite/api_op_DescribeTable.go | 6 ++ .../timestreamwrite/api_op_ListDatabases.go | 6 ++ service/timestreamwrite/api_op_ListTables.go | 6 ++ .../api_op_ListTagsForResource.go | 6 ++ service/timestreamwrite/api_op_TagResource.go | 6 ++ .../timestreamwrite/api_op_UntagResource.go | 6 ++ .../timestreamwrite/api_op_UpdateDatabase.go | 6 ++ service/timestreamwrite/api_op_UpdateTable.go | 6 ++ .../timestreamwrite/api_op_WriteRecords.go | 6 ++ service/timestreamwrite/go.mod | 4 +- service/timestreamwrite/go.sum | 2 - service/transcribe/api_client.go | 52 ++++++++-- .../transcribe/api_op_CreateLanguageModel.go | 6 ++ .../api_op_CreateMedicalVocabulary.go | 6 ++ service/transcribe/api_op_CreateVocabulary.go | 6 ++ .../api_op_CreateVocabularyFilter.go | 6 ++ .../transcribe/api_op_DeleteLanguageModel.go | 6 ++ .../api_op_DeleteMedicalTranscriptionJob.go | 6 ++ .../api_op_DeleteMedicalVocabulary.go | 6 ++ .../api_op_DeleteTranscriptionJob.go | 6 ++ service/transcribe/api_op_DeleteVocabulary.go | 6 ++ .../api_op_DeleteVocabularyFilter.go | 6 ++ .../api_op_DescribeLanguageModel.go | 6 ++ .../api_op_GetMedicalTranscriptionJob.go | 6 ++ .../transcribe/api_op_GetMedicalVocabulary.go | 6 ++ .../transcribe/api_op_GetTranscriptionJob.go | 6 ++ service/transcribe/api_op_GetVocabulary.go | 6 ++ .../transcribe/api_op_GetVocabularyFilter.go | 6 ++ .../transcribe/api_op_ListLanguageModels.go | 6 ++ .../api_op_ListMedicalTranscriptionJobs.go | 6 ++ .../api_op_ListMedicalVocabularies.go | 6 ++ .../api_op_ListTranscriptionJobs.go | 6 ++ service/transcribe/api_op_ListVocabularies.go | 6 ++ .../api_op_ListVocabularyFilters.go | 6 ++ .../api_op_StartMedicalTranscriptionJob.go | 6 ++ .../api_op_StartTranscriptionJob.go | 6 ++ .../api_op_UpdateMedicalVocabulary.go | 6 ++ service/transcribe/api_op_UpdateVocabulary.go | 6 ++ .../api_op_UpdateVocabularyFilter.go | 6 ++ service/transcribe/go.mod | 4 +- service/transcribe/go.sum | 2 - service/transfer/api_client.go | 52 ++++++++-- service/transfer/api_op_CreateServer.go | 6 ++ service/transfer/api_op_CreateUser.go | 6 ++ service/transfer/api_op_DeleteServer.go | 6 ++ service/transfer/api_op_DeleteSshPublicKey.go | 6 ++ service/transfer/api_op_DeleteUser.go | 6 ++ .../transfer/api_op_DescribeSecurityPolicy.go | 6 ++ service/transfer/api_op_DescribeServer.go | 6 ++ service/transfer/api_op_DescribeUser.go | 6 ++ service/transfer/api_op_ImportSshPublicKey.go | 6 ++ .../transfer/api_op_ListSecurityPolicies.go | 6 ++ service/transfer/api_op_ListServers.go | 6 ++ .../transfer/api_op_ListTagsForResource.go | 6 ++ service/transfer/api_op_ListUsers.go | 6 ++ service/transfer/api_op_StartServer.go | 6 ++ service/transfer/api_op_StopServer.go | 6 ++ service/transfer/api_op_TagResource.go | 6 ++ .../transfer/api_op_TestIdentityProvider.go | 6 ++ service/transfer/api_op_UntagResource.go | 6 ++ service/transfer/api_op_UpdateServer.go | 6 ++ service/transfer/api_op_UpdateUser.go | 6 ++ service/transfer/go.mod | 4 +- service/transfer/go.sum | 2 - service/translate/api_client.go | 52 ++++++++-- service/translate/api_op_DeleteTerminology.go | 6 ++ .../api_op_DescribeTextTranslationJob.go | 6 ++ service/translate/api_op_GetTerminology.go | 6 ++ service/translate/api_op_ImportTerminology.go | 6 ++ service/translate/api_op_ListTerminologies.go | 6 ++ .../api_op_ListTextTranslationJobs.go | 6 ++ .../api_op_StartTextTranslationJob.go | 6 ++ .../api_op_StopTextTranslationJob.go | 6 ++ service/translate/api_op_TranslateText.go | 6 ++ service/translate/go.mod | 4 +- service/translate/go.sum | 2 - service/waf/api_client.go | 52 ++++++++-- service/waf/api_op_CreateByteMatchSet.go | 6 ++ service/waf/api_op_CreateGeoMatchSet.go | 6 ++ service/waf/api_op_CreateIPSet.go | 6 ++ service/waf/api_op_CreateRateBasedRule.go | 6 ++ service/waf/api_op_CreateRegexMatchSet.go | 6 ++ service/waf/api_op_CreateRegexPatternSet.go | 6 ++ service/waf/api_op_CreateRule.go | 6 ++ service/waf/api_op_CreateRuleGroup.go | 6 ++ service/waf/api_op_CreateSizeConstraintSet.go | 6 ++ .../waf/api_op_CreateSqlInjectionMatchSet.go | 6 ++ service/waf/api_op_CreateWebACL.go | 6 ++ .../waf/api_op_CreateWebACLMigrationStack.go | 6 ++ service/waf/api_op_CreateXssMatchSet.go | 6 ++ service/waf/api_op_DeleteByteMatchSet.go | 6 ++ service/waf/api_op_DeleteGeoMatchSet.go | 6 ++ service/waf/api_op_DeleteIPSet.go | 6 ++ .../waf/api_op_DeleteLoggingConfiguration.go | 6 ++ service/waf/api_op_DeletePermissionPolicy.go | 6 ++ service/waf/api_op_DeleteRateBasedRule.go | 6 ++ service/waf/api_op_DeleteRegexMatchSet.go | 6 ++ service/waf/api_op_DeleteRegexPatternSet.go | 6 ++ service/waf/api_op_DeleteRule.go | 6 ++ service/waf/api_op_DeleteRuleGroup.go | 6 ++ service/waf/api_op_DeleteSizeConstraintSet.go | 6 ++ .../waf/api_op_DeleteSqlInjectionMatchSet.go | 6 ++ service/waf/api_op_DeleteWebACL.go | 6 ++ service/waf/api_op_DeleteXssMatchSet.go | 6 ++ service/waf/api_op_GetByteMatchSet.go | 6 ++ service/waf/api_op_GetChangeToken.go | 6 ++ service/waf/api_op_GetChangeTokenStatus.go | 6 ++ service/waf/api_op_GetGeoMatchSet.go | 6 ++ service/waf/api_op_GetIPSet.go | 6 ++ service/waf/api_op_GetLoggingConfiguration.go | 6 ++ service/waf/api_op_GetPermissionPolicy.go | 6 ++ service/waf/api_op_GetRateBasedRule.go | 6 ++ .../waf/api_op_GetRateBasedRuleManagedKeys.go | 6 ++ service/waf/api_op_GetRegexMatchSet.go | 6 ++ service/waf/api_op_GetRegexPatternSet.go | 6 ++ service/waf/api_op_GetRule.go | 6 ++ service/waf/api_op_GetRuleGroup.go | 6 ++ service/waf/api_op_GetSampledRequests.go | 6 ++ service/waf/api_op_GetSizeConstraintSet.go | 6 ++ service/waf/api_op_GetSqlInjectionMatchSet.go | 6 ++ service/waf/api_op_GetWebACL.go | 6 ++ service/waf/api_op_GetXssMatchSet.go | 6 ++ .../api_op_ListActivatedRulesInRuleGroup.go | 6 ++ service/waf/api_op_ListByteMatchSets.go | 6 ++ service/waf/api_op_ListGeoMatchSets.go | 6 ++ service/waf/api_op_ListIPSets.go | 6 ++ .../waf/api_op_ListLoggingConfigurations.go | 6 ++ service/waf/api_op_ListRateBasedRules.go | 6 ++ service/waf/api_op_ListRegexMatchSets.go | 6 ++ service/waf/api_op_ListRegexPatternSets.go | 6 ++ service/waf/api_op_ListRuleGroups.go | 6 ++ service/waf/api_op_ListRules.go | 6 ++ service/waf/api_op_ListSizeConstraintSets.go | 6 ++ .../waf/api_op_ListSqlInjectionMatchSets.go | 6 ++ .../waf/api_op_ListSubscribedRuleGroups.go | 6 ++ service/waf/api_op_ListTagsForResource.go | 6 ++ service/waf/api_op_ListWebACLs.go | 6 ++ service/waf/api_op_ListXssMatchSets.go | 6 ++ service/waf/api_op_PutLoggingConfiguration.go | 6 ++ service/waf/api_op_PutPermissionPolicy.go | 6 ++ service/waf/api_op_TagResource.go | 6 ++ service/waf/api_op_UntagResource.go | 6 ++ service/waf/api_op_UpdateByteMatchSet.go | 6 ++ service/waf/api_op_UpdateGeoMatchSet.go | 6 ++ service/waf/api_op_UpdateIPSet.go | 6 ++ service/waf/api_op_UpdateRateBasedRule.go | 6 ++ service/waf/api_op_UpdateRegexMatchSet.go | 6 ++ service/waf/api_op_UpdateRegexPatternSet.go | 6 ++ service/waf/api_op_UpdateRule.go | 6 ++ service/waf/api_op_UpdateRuleGroup.go | 6 ++ service/waf/api_op_UpdateSizeConstraintSet.go | 6 ++ .../waf/api_op_UpdateSqlInjectionMatchSet.go | 6 ++ service/waf/api_op_UpdateWebACL.go | 6 ++ service/waf/api_op_UpdateXssMatchSet.go | 6 ++ service/waf/go.mod | 4 +- service/waf/go.sum | 2 - service/wafregional/api_client.go | 52 ++++++++-- service/wafregional/api_op_AssociateWebACL.go | 6 ++ .../wafregional/api_op_CreateByteMatchSet.go | 6 ++ .../wafregional/api_op_CreateGeoMatchSet.go | 6 ++ service/wafregional/api_op_CreateIPSet.go | 6 ++ .../wafregional/api_op_CreateRateBasedRule.go | 6 ++ .../wafregional/api_op_CreateRegexMatchSet.go | 6 ++ .../api_op_CreateRegexPatternSet.go | 6 ++ service/wafregional/api_op_CreateRule.go | 6 ++ service/wafregional/api_op_CreateRuleGroup.go | 6 ++ .../api_op_CreateSizeConstraintSet.go | 6 ++ .../api_op_CreateSqlInjectionMatchSet.go | 6 ++ service/wafregional/api_op_CreateWebACL.go | 6 ++ .../api_op_CreateWebACLMigrationStack.go | 6 ++ .../wafregional/api_op_CreateXssMatchSet.go | 6 ++ .../wafregional/api_op_DeleteByteMatchSet.go | 6 ++ .../wafregional/api_op_DeleteGeoMatchSet.go | 6 ++ service/wafregional/api_op_DeleteIPSet.go | 6 ++ .../api_op_DeleteLoggingConfiguration.go | 6 ++ .../api_op_DeletePermissionPolicy.go | 6 ++ .../wafregional/api_op_DeleteRateBasedRule.go | 6 ++ .../wafregional/api_op_DeleteRegexMatchSet.go | 6 ++ .../api_op_DeleteRegexPatternSet.go | 6 ++ service/wafregional/api_op_DeleteRule.go | 6 ++ service/wafregional/api_op_DeleteRuleGroup.go | 6 ++ .../api_op_DeleteSizeConstraintSet.go | 6 ++ .../api_op_DeleteSqlInjectionMatchSet.go | 6 ++ service/wafregional/api_op_DeleteWebACL.go | 6 ++ .../wafregional/api_op_DeleteXssMatchSet.go | 6 ++ .../wafregional/api_op_DisassociateWebACL.go | 6 ++ service/wafregional/api_op_GetByteMatchSet.go | 6 ++ service/wafregional/api_op_GetChangeToken.go | 6 ++ .../api_op_GetChangeTokenStatus.go | 6 ++ service/wafregional/api_op_GetGeoMatchSet.go | 6 ++ service/wafregional/api_op_GetIPSet.go | 6 ++ .../api_op_GetLoggingConfiguration.go | 6 ++ .../wafregional/api_op_GetPermissionPolicy.go | 6 ++ .../wafregional/api_op_GetRateBasedRule.go | 6 ++ .../api_op_GetRateBasedRuleManagedKeys.go | 6 ++ .../wafregional/api_op_GetRegexMatchSet.go | 6 ++ .../wafregional/api_op_GetRegexPatternSet.go | 6 ++ service/wafregional/api_op_GetRule.go | 6 ++ service/wafregional/api_op_GetRuleGroup.go | 6 ++ .../wafregional/api_op_GetSampledRequests.go | 6 ++ .../api_op_GetSizeConstraintSet.go | 6 ++ .../api_op_GetSqlInjectionMatchSet.go | 6 ++ service/wafregional/api_op_GetWebACL.go | 6 ++ .../api_op_GetWebACLForResource.go | 6 ++ service/wafregional/api_op_GetXssMatchSet.go | 6 ++ .../api_op_ListActivatedRulesInRuleGroup.go | 6 ++ .../wafregional/api_op_ListByteMatchSets.go | 6 ++ .../wafregional/api_op_ListGeoMatchSets.go | 6 ++ service/wafregional/api_op_ListIPSets.go | 6 ++ .../api_op_ListLoggingConfigurations.go | 6 ++ .../wafregional/api_op_ListRateBasedRules.go | 6 ++ .../wafregional/api_op_ListRegexMatchSets.go | 6 ++ .../api_op_ListRegexPatternSets.go | 6 ++ .../api_op_ListResourcesForWebACL.go | 6 ++ service/wafregional/api_op_ListRuleGroups.go | 6 ++ service/wafregional/api_op_ListRules.go | 6 ++ .../api_op_ListSizeConstraintSets.go | 6 ++ .../api_op_ListSqlInjectionMatchSets.go | 6 ++ .../api_op_ListSubscribedRuleGroups.go | 6 ++ .../wafregional/api_op_ListTagsForResource.go | 6 ++ service/wafregional/api_op_ListWebACLs.go | 6 ++ .../wafregional/api_op_ListXssMatchSets.go | 6 ++ .../api_op_PutLoggingConfiguration.go | 6 ++ .../wafregional/api_op_PutPermissionPolicy.go | 6 ++ service/wafregional/api_op_TagResource.go | 6 ++ service/wafregional/api_op_UntagResource.go | 6 ++ .../wafregional/api_op_UpdateByteMatchSet.go | 6 ++ .../wafregional/api_op_UpdateGeoMatchSet.go | 6 ++ service/wafregional/api_op_UpdateIPSet.go | 6 ++ .../wafregional/api_op_UpdateRateBasedRule.go | 6 ++ .../wafregional/api_op_UpdateRegexMatchSet.go | 6 ++ .../api_op_UpdateRegexPatternSet.go | 6 ++ service/wafregional/api_op_UpdateRule.go | 6 ++ service/wafregional/api_op_UpdateRuleGroup.go | 6 ++ .../api_op_UpdateSizeConstraintSet.go | 6 ++ .../api_op_UpdateSqlInjectionMatchSet.go | 6 ++ service/wafregional/api_op_UpdateWebACL.go | 6 ++ .../wafregional/api_op_UpdateXssMatchSet.go | 6 ++ service/wafregional/go.mod | 4 +- service/wafregional/go.sum | 2 - service/wafv2/api_client.go | 52 ++++++++-- service/wafv2/api_op_AssociateWebACL.go | 6 ++ service/wafv2/api_op_CheckCapacity.go | 6 ++ service/wafv2/api_op_CreateIPSet.go | 6 ++ service/wafv2/api_op_CreateRegexPatternSet.go | 6 ++ service/wafv2/api_op_CreateRuleGroup.go | 6 ++ service/wafv2/api_op_CreateWebACL.go | 6 ++ .../api_op_DeleteFirewallManagerRuleGroups.go | 6 ++ service/wafv2/api_op_DeleteIPSet.go | 6 ++ .../api_op_DeleteLoggingConfiguration.go | 6 ++ .../wafv2/api_op_DeletePermissionPolicy.go | 6 ++ service/wafv2/api_op_DeleteRegexPatternSet.go | 6 ++ service/wafv2/api_op_DeleteRuleGroup.go | 6 ++ service/wafv2/api_op_DeleteWebACL.go | 6 ++ .../wafv2/api_op_DescribeManagedRuleGroup.go | 6 ++ service/wafv2/api_op_DisassociateWebACL.go | 6 ++ service/wafv2/api_op_GetIPSet.go | 6 ++ .../wafv2/api_op_GetLoggingConfiguration.go | 6 ++ service/wafv2/api_op_GetPermissionPolicy.go | 6 ++ ...api_op_GetRateBasedStatementManagedKeys.go | 6 ++ service/wafv2/api_op_GetRegexPatternSet.go | 6 ++ service/wafv2/api_op_GetRuleGroup.go | 6 ++ service/wafv2/api_op_GetSampledRequests.go | 6 ++ service/wafv2/api_op_GetWebACL.go | 6 ++ service/wafv2/api_op_GetWebACLForResource.go | 6 ++ .../api_op_ListAvailableManagedRuleGroups.go | 6 ++ service/wafv2/api_op_ListIPSets.go | 6 ++ .../wafv2/api_op_ListLoggingConfigurations.go | 6 ++ service/wafv2/api_op_ListRegexPatternSets.go | 6 ++ .../wafv2/api_op_ListResourcesForWebACL.go | 6 ++ service/wafv2/api_op_ListRuleGroups.go | 6 ++ service/wafv2/api_op_ListTagsForResource.go | 6 ++ service/wafv2/api_op_ListWebACLs.go | 6 ++ .../wafv2/api_op_PutLoggingConfiguration.go | 6 ++ service/wafv2/api_op_PutPermissionPolicy.go | 6 ++ service/wafv2/api_op_TagResource.go | 6 ++ service/wafv2/api_op_UntagResource.go | 6 ++ service/wafv2/api_op_UpdateIPSet.go | 6 ++ service/wafv2/api_op_UpdateRegexPatternSet.go | 6 ++ service/wafv2/api_op_UpdateRuleGroup.go | 6 ++ service/wafv2/api_op_UpdateWebACL.go | 6 ++ service/wafv2/go.mod | 4 +- service/wafv2/go.sum | 2 - service/workdocs/api_client.go | 52 ++++++++-- .../api_op_AbortDocumentVersionUpload.go | 6 ++ service/workdocs/api_op_ActivateUser.go | 6 ++ .../workdocs/api_op_AddResourcePermissions.go | 6 ++ service/workdocs/api_op_CreateComment.go | 6 ++ .../workdocs/api_op_CreateCustomMetadata.go | 6 ++ service/workdocs/api_op_CreateFolder.go | 6 ++ service/workdocs/api_op_CreateLabels.go | 6 ++ .../api_op_CreateNotificationSubscription.go | 6 ++ service/workdocs/api_op_CreateUser.go | 6 ++ service/workdocs/api_op_DeactivateUser.go | 6 ++ service/workdocs/api_op_DeleteComment.go | 6 ++ .../workdocs/api_op_DeleteCustomMetadata.go | 6 ++ service/workdocs/api_op_DeleteDocument.go | 6 ++ service/workdocs/api_op_DeleteFolder.go | 6 ++ .../workdocs/api_op_DeleteFolderContents.go | 6 ++ service/workdocs/api_op_DeleteLabels.go | 6 ++ .../api_op_DeleteNotificationSubscription.go | 6 ++ service/workdocs/api_op_DeleteUser.go | 6 ++ service/workdocs/api_op_DescribeActivities.go | 6 ++ service/workdocs/api_op_DescribeComments.go | 6 ++ .../api_op_DescribeDocumentVersions.go | 6 ++ .../workdocs/api_op_DescribeFolderContents.go | 6 ++ service/workdocs/api_op_DescribeGroups.go | 6 ++ ...pi_op_DescribeNotificationSubscriptions.go | 6 ++ .../api_op_DescribeResourcePermissions.go | 6 ++ .../workdocs/api_op_DescribeRootFolders.go | 6 ++ service/workdocs/api_op_DescribeUsers.go | 6 ++ service/workdocs/api_op_GetCurrentUser.go | 6 ++ service/workdocs/api_op_GetDocument.go | 6 ++ service/workdocs/api_op_GetDocumentPath.go | 6 ++ service/workdocs/api_op_GetDocumentVersion.go | 6 ++ service/workdocs/api_op_GetFolder.go | 6 ++ service/workdocs/api_op_GetFolderPath.go | 6 ++ service/workdocs/api_op_GetResources.go | 6 ++ .../api_op_InitiateDocumentVersionUpload.go | 6 ++ .../api_op_RemoveAllResourcePermissions.go | 6 ++ .../api_op_RemoveResourcePermission.go | 6 ++ service/workdocs/api_op_UpdateDocument.go | 6 ++ .../workdocs/api_op_UpdateDocumentVersion.go | 6 ++ service/workdocs/api_op_UpdateFolder.go | 6 ++ service/workdocs/api_op_UpdateUser.go | 6 ++ service/workdocs/go.mod | 4 +- service/workdocs/go.sum | 2 - service/worklink/api_client.go | 52 ++++++++-- service/worklink/api_op_AssociateDomain.go | 6 ++ ...p_AssociateWebsiteAuthorizationProvider.go | 6 ++ ...op_AssociateWebsiteCertificateAuthority.go | 6 ++ service/worklink/api_op_CreateFleet.go | 6 ++ service/worklink/api_op_DeleteFleet.go | 6 ++ ...api_op_DescribeAuditStreamConfiguration.go | 6 ++ ..._op_DescribeCompanyNetworkConfiguration.go | 6 ++ service/worklink/api_op_DescribeDevice.go | 6 ++ ...pi_op_DescribeDevicePolicyConfiguration.go | 6 ++ service/worklink/api_op_DescribeDomain.go | 6 ++ .../worklink/api_op_DescribeFleetMetadata.go | 6 ++ ...p_DescribeIdentityProviderConfiguration.go | 6 ++ ..._op_DescribeWebsiteCertificateAuthority.go | 6 ++ service/worklink/api_op_DisassociateDomain.go | 6 ++ ...isassociateWebsiteAuthorizationProvider.go | 6 ++ ...DisassociateWebsiteCertificateAuthority.go | 6 ++ service/worklink/api_op_ListDevices.go | 6 ++ service/worklink/api_op_ListDomains.go | 6 ++ service/worklink/api_op_ListFleets.go | 6 ++ .../worklink/api_op_ListTagsForResource.go | 6 ++ ...pi_op_ListWebsiteAuthorizationProviders.go | 6 ++ ...pi_op_ListWebsiteCertificateAuthorities.go | 6 ++ .../worklink/api_op_RestoreDomainAccess.go | 6 ++ service/worklink/api_op_RevokeDomainAccess.go | 6 ++ service/worklink/api_op_SignOutUser.go | 6 ++ service/worklink/api_op_TagResource.go | 6 ++ service/worklink/api_op_UntagResource.go | 6 ++ .../api_op_UpdateAuditStreamConfiguration.go | 6 ++ ...pi_op_UpdateCompanyNetworkConfiguration.go | 6 ++ .../api_op_UpdateDevicePolicyConfiguration.go | 6 ++ .../worklink/api_op_UpdateDomainMetadata.go | 6 ++ .../worklink/api_op_UpdateFleetMetadata.go | 6 ++ ..._op_UpdateIdentityProviderConfiguration.go | 6 ++ service/worklink/go.mod | 4 +- service/worklink/go.sum | 2 - service/workmail/api_client.go | 52 ++++++++-- .../api_op_AssociateDelegateToResource.go | 6 ++ .../workmail/api_op_AssociateMemberToGroup.go | 6 ++ .../workmail/api_op_CancelMailboxExportJob.go | 6 ++ service/workmail/api_op_CreateAlias.go | 6 ++ service/workmail/api_op_CreateGroup.go | 6 ++ service/workmail/api_op_CreateOrganization.go | 6 ++ service/workmail/api_op_CreateResource.go | 6 ++ service/workmail/api_op_CreateUser.go | 6 ++ .../api_op_DeleteAccessControlRule.go | 6 ++ service/workmail/api_op_DeleteAlias.go | 6 ++ service/workmail/api_op_DeleteGroup.go | 6 ++ .../api_op_DeleteMailboxPermissions.go | 6 ++ service/workmail/api_op_DeleteOrganization.go | 6 ++ service/workmail/api_op_DeleteResource.go | 6 ++ .../workmail/api_op_DeleteRetentionPolicy.go | 6 ++ service/workmail/api_op_DeleteUser.go | 6 ++ .../workmail/api_op_DeregisterFromWorkMail.go | 6 ++ service/workmail/api_op_DescribeGroup.go | 6 ++ .../api_op_DescribeMailboxExportJob.go | 6 ++ .../workmail/api_op_DescribeOrganization.go | 6 ++ service/workmail/api_op_DescribeResource.go | 6 ++ service/workmail/api_op_DescribeUser.go | 6 ++ ...api_op_DisassociateDelegateFromResource.go | 6 ++ .../api_op_DisassociateMemberFromGroup.go | 6 ++ .../workmail/api_op_GetAccessControlEffect.go | 6 ++ .../api_op_GetDefaultRetentionPolicy.go | 6 ++ service/workmail/api_op_GetMailboxDetails.go | 6 ++ .../workmail/api_op_ListAccessControlRules.go | 6 ++ service/workmail/api_op_ListAliases.go | 6 ++ service/workmail/api_op_ListGroupMembers.go | 6 ++ service/workmail/api_op_ListGroups.go | 6 ++ .../workmail/api_op_ListMailboxExportJobs.go | 6 ++ .../workmail/api_op_ListMailboxPermissions.go | 6 ++ service/workmail/api_op_ListOrganizations.go | 6 ++ .../workmail/api_op_ListResourceDelegates.go | 6 ++ service/workmail/api_op_ListResources.go | 6 ++ .../workmail/api_op_ListTagsForResource.go | 6 ++ service/workmail/api_op_ListUsers.go | 6 ++ .../workmail/api_op_PutAccessControlRule.go | 6 ++ .../workmail/api_op_PutMailboxPermissions.go | 6 ++ service/workmail/api_op_PutRetentionPolicy.go | 6 ++ service/workmail/api_op_RegisterToWorkMail.go | 6 ++ service/workmail/api_op_ResetPassword.go | 6 ++ .../workmail/api_op_StartMailboxExportJob.go | 6 ++ service/workmail/api_op_TagResource.go | 6 ++ service/workmail/api_op_UntagResource.go | 6 ++ service/workmail/api_op_UpdateMailboxQuota.go | 6 ++ .../api_op_UpdatePrimaryEmailAddress.go | 6 ++ service/workmail/api_op_UpdateResource.go | 6 ++ service/workmail/go.mod | 4 +- service/workmail/go.sum | 2 - service/workmailmessageflow/api_client.go | 52 ++++++++-- .../api_op_GetRawMessageContent.go | 6 ++ service/workmailmessageflow/go.mod | 4 +- service/workmailmessageflow/go.sum | 2 - service/workspaces/api_client.go | 52 ++++++++-- .../api_op_AssociateConnectionAlias.go | 6 ++ .../workspaces/api_op_AssociateIpGroups.go | 6 ++ service/workspaces/api_op_AuthorizeIpRules.go | 6 ++ .../workspaces/api_op_CopyWorkspaceImage.go | 6 ++ .../api_op_CreateConnectionAlias.go | 6 ++ service/workspaces/api_op_CreateIpGroup.go | 6 ++ service/workspaces/api_op_CreateTags.go | 6 ++ service/workspaces/api_op_CreateWorkspaces.go | 6 ++ .../api_op_DeleteConnectionAlias.go | 6 ++ service/workspaces/api_op_DeleteIpGroup.go | 6 ++ service/workspaces/api_op_DeleteTags.go | 6 ++ .../workspaces/api_op_DeleteWorkspaceImage.go | 6 ++ .../api_op_DeregisterWorkspaceDirectory.go | 6 ++ service/workspaces/api_op_DescribeAccount.go | 6 ++ .../api_op_DescribeAccountModifications.go | 6 ++ .../api_op_DescribeClientProperties.go | 6 ++ ...i_op_DescribeConnectionAliasPermissions.go | 6 ++ .../api_op_DescribeConnectionAliases.go | 6 ++ service/workspaces/api_op_DescribeIpGroups.go | 6 ++ service/workspaces/api_op_DescribeTags.go | 6 ++ .../api_op_DescribeWorkspaceBundles.go | 6 ++ .../api_op_DescribeWorkspaceDirectories.go | 6 ++ ...pi_op_DescribeWorkspaceImagePermissions.go | 6 ++ .../api_op_DescribeWorkspaceImages.go | 6 ++ .../api_op_DescribeWorkspaceSnapshots.go | 6 ++ .../workspaces/api_op_DescribeWorkspaces.go | 6 ++ ...i_op_DescribeWorkspacesConnectionStatus.go | 6 ++ .../api_op_DisassociateConnectionAlias.go | 6 ++ .../workspaces/api_op_DisassociateIpGroups.go | 6 ++ .../workspaces/api_op_ImportWorkspaceImage.go | 6 ++ ...pi_op_ListAvailableManagementCidrRanges.go | 6 ++ service/workspaces/api_op_MigrateWorkspace.go | 6 ++ service/workspaces/api_op_ModifyAccount.go | 6 ++ .../api_op_ModifyClientProperties.go | 6 ++ .../api_op_ModifySelfservicePermissions.go | 6 ++ .../api_op_ModifyWorkspaceAccessProperties.go | 6 ++ ...pi_op_ModifyWorkspaceCreationProperties.go | 6 ++ .../api_op_ModifyWorkspaceProperties.go | 6 ++ .../workspaces/api_op_ModifyWorkspaceState.go | 6 ++ service/workspaces/api_op_RebootWorkspaces.go | 6 ++ .../workspaces/api_op_RebuildWorkspaces.go | 6 ++ .../api_op_RegisterWorkspaceDirectory.go | 6 ++ service/workspaces/api_op_RestoreWorkspace.go | 6 ++ service/workspaces/api_op_RevokeIpRules.go | 6 ++ service/workspaces/api_op_StartWorkspaces.go | 6 ++ service/workspaces/api_op_StopWorkspaces.go | 6 ++ .../workspaces/api_op_TerminateWorkspaces.go | 6 ++ .../api_op_UpdateConnectionAliasPermission.go | 6 ++ .../workspaces/api_op_UpdateRulesOfIpGroup.go | 6 ++ .../api_op_UpdateWorkspaceImagePermission.go | 6 ++ service/workspaces/go.mod | 4 +- service/workspaces/go.sum | 2 - service/xray/api_client.go | 52 ++++++++-- service/xray/api_op_BatchGetTraces.go | 6 ++ service/xray/api_op_CreateGroup.go | 6 ++ service/xray/api_op_CreateSamplingRule.go | 6 ++ service/xray/api_op_DeleteGroup.go | 6 ++ service/xray/api_op_DeleteSamplingRule.go | 6 ++ service/xray/api_op_GetEncryptionConfig.go | 6 ++ service/xray/api_op_GetGroup.go | 6 ++ service/xray/api_op_GetGroups.go | 6 ++ service/xray/api_op_GetSamplingRules.go | 6 ++ .../api_op_GetSamplingStatisticSummaries.go | 6 ++ service/xray/api_op_GetSamplingTargets.go | 6 ++ service/xray/api_op_GetServiceGraph.go | 6 ++ .../api_op_GetTimeSeriesServiceStatistics.go | 6 ++ service/xray/api_op_GetTraceGraph.go | 6 ++ service/xray/api_op_GetTraceSummaries.go | 6 ++ service/xray/api_op_ListTagsForResource.go | 6 ++ service/xray/api_op_PutEncryptionConfig.go | 6 ++ service/xray/api_op_PutTelemetryRecords.go | 6 ++ service/xray/api_op_PutTraceSegments.go | 6 ++ service/xray/api_op_TagResource.go | 6 ++ service/xray/api_op_UntagResource.go | 6 ++ service/xray/api_op_UpdateGroup.go | 6 ++ service/xray/api_op_UpdateSamplingRule.go | 6 ++ service/xray/go.mod | 4 +- service/xray/go.sum | 2 - 8979 files changed, 60325 insertions(+), 3376 deletions(-) create mode 100644 aws/logging.go create mode 100644 aws/logging_generate.go create mode 100644 codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RequestResponseLogging.java diff --git a/aws/config.go b/aws/config.go index a2f21560ed5..2d7363a2073 100644 --- a/aws/config.go +++ b/aws/config.go @@ -1,6 +1,9 @@ package aws -import "github.com/awslabs/smithy-go/middleware" +import ( + "github.com/awslabs/smithy-go/logging" + "github.com/awslabs/smithy-go/middleware" +) // A Config provides service configuration for service clients. type Config struct { @@ -43,6 +46,18 @@ type Config struct { // client requests will be handled. This is useful for adding additional // tracing data to a request, or changing behavior of the SDK's client. APIOptions []func(*middleware.Stack) error + + // The logger writer interface to write logging messages to. Defaults to + // standard error. + Logger logging.Logger + + // Configures the events that will be sent to the configured logger. + // This can be used to configure the logging of signing, retries, request, and responses + // of the SDK clients. + // + // See the ClientLogMode type documentation for the complete set of logging modes and available + // configuration. + ClientLogMode ClientLogMode } // NewConfig returns a new Config pointer that can be chained with builder diff --git a/aws/doc.go b/aws/doc.go index 8b060ba9696..6ec6efb5d09 100644 --- a/aws/doc.go +++ b/aws/doc.go @@ -58,4 +58,5 @@ package aws // generate.go uses a build tag of "ignore", go run doesn't need to specify // this because go run ignores all build flags when running a go file directly. //go:generate go run -tags codegen generate.go +//go:generate go run -tags codegen logging_generate.go //go:generate gofmt -w -s . diff --git a/aws/logging.go b/aws/logging.go new file mode 100644 index 00000000000..7cc5d744f9c --- /dev/null +++ b/aws/logging.go @@ -0,0 +1,83 @@ +// Code generated by aws/logging_generate.go DO NOT EDIT. +package aws + +// ClientLogMode represents the logging mode of SDK clients. The client logging mode is a bit-field where +// each bit is a flag that describes the logging behavior for one or more client components. +// The entire 64-bit group is reserved for later expansion by the SDK. +// +// Example: Setting ClientLogMode to enable logging of retries and requests +// clientLogMode := aws.LogRetries | aws.LogRequest +// +// Example: Adding an additional log mode to an existing ClientLogMode value +// clientLogMode |= aws.LogResponse +type ClientLogMode uint64 + +// Supported ClientLogMode bits that can be configured to toggle logging of specific SDK events. +const ( + LogSigning ClientLogMode = 1 << (64 - 1 - iota) + LogRetries + LogRequest + LogRequestWithBody + LogResponse + LogResponseWithBody +) + +// IsSigning returns whether the Signing logging mode bit is set +func (m ClientLogMode) IsSigning() bool { + return m&LogSigning != 0 +} + +// IsRetries returns whether the Retries logging mode bit is set +func (m ClientLogMode) IsRetries() bool { + return m&LogRetries != 0 +} + +// IsRequest returns whether the Request logging mode bit is set +func (m ClientLogMode) IsRequest() bool { + return m&LogRequest != 0 +} + +// IsRequestWithBody returns whether the RequestWithBody logging mode bit is set +func (m ClientLogMode) IsRequestWithBody() bool { + return m&LogRequestWithBody != 0 +} + +// IsResponse returns whether the Response logging mode bit is set +func (m ClientLogMode) IsResponse() bool { + return m&LogResponse != 0 +} + +// IsResponseWithBody returns whether the ResponseWithBody logging mode bit is set +func (m ClientLogMode) IsResponseWithBody() bool { + return m&LogResponseWithBody != 0 +} + +// ClearSigning clears the Signing logging mode bit +func (m *ClientLogMode) ClearSigning() { + *m &^= LogSigning +} + +// ClearRetries clears the Retries logging mode bit +func (m *ClientLogMode) ClearRetries() { + *m &^= LogRetries +} + +// ClearRequest clears the Request logging mode bit +func (m *ClientLogMode) ClearRequest() { + *m &^= LogRequest +} + +// ClearRequestWithBody clears the RequestWithBody logging mode bit +func (m *ClientLogMode) ClearRequestWithBody() { + *m &^= LogRequestWithBody +} + +// ClearResponse clears the Response logging mode bit +func (m *ClientLogMode) ClearResponse() { + *m &^= LogResponse +} + +// ClearResponseWithBody clears the ResponseWithBody logging mode bit +func (m *ClientLogMode) ClearResponseWithBody() { + *m &^= LogResponseWithBody +} diff --git a/aws/logging_generate.go b/aws/logging_generate.go new file mode 100644 index 00000000000..bff9d728ad8 --- /dev/null +++ b/aws/logging_generate.go @@ -0,0 +1,76 @@ +// +build clientlogmode + +package main + +import ( + "log" + "os" + "text/template" +) + +var config = struct { + ModeBits []string +}{ + // Items should be appended only to keep bit-flag positions stable + ModeBits: []string{ + "Signing", + "Retries", + "Request", + "RequestWithBody", + "Response", + "ResponseWithBody", + }, +} + +var tmpl = template.Must(template.New("ClientLogMode").Funcs(map[string]interface{}{ + "symbolName": func(name string) string { + return "Log" + name + }, +}).Parse(`// Code generated by aws/logging_generate.go DO NOT EDIT. +package aws + +// ClientLogMode represents the logging mode of SDK clients. The client logging mode is a bit-field where +// each bit is a flag that describes the logging behavior for one or more client components. +// The entire 64-bit group is reserved for later expansion by the SDK. +// +// Example: Setting ClientLogMode to enable logging of retries and requests +// clientLogMode := aws.LogRetries | aws.LogRequest +// +// Example: Adding an additional log mode to an existing ClientLogMode value +// clientLogMode |= aws.LogResponse +type ClientLogMode uint64 + +// Supported ClientLogMode bits that can be configured to toggle logging of specific SDK events. +const ( +{{- range $index, $field := .ModeBits }} + {{ (symbolName $field) }}{{- if (eq 0 $index) }} ClientLogMode = 1 << (64 - 1 - iota){{- end }} +{{- end }} +) + +{{ range $_, $field := .ModeBits }} +// Is{{- $field }} returns whether the {{ $field }} logging mode bit is set +func (m ClientLogMode) Is{{- $field }}() bool { + return m&{{- (symbolName $field) }} != 0 +} +{{ end }} + +{{ range $_, $field := .ModeBits }} +// Clear{{- $field }} clears the {{ $field }} logging mode bit +func (m *ClientLogMode) Clear{{- $field }}() { + *m &^= {{- (symbolName $field) }} +} +{{ end }} +`)) + +func main() { + file, err := os.Create("logging.go") + if err != nil { + log.Fatal(err) + } + defer file.Close() + + err = tmpl.Execute(file, config) + if err != nil { + log.Fatal(err) + } +} diff --git a/aws/retry/middleware.go b/aws/retry/middleware.go index 4380561228b..40d9ca2ed30 100644 --- a/aws/retry/middleware.go +++ b/aws/retry/middleware.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" awsmiddle "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/internal/sdk" + "github.com/awslabs/smithy-go/logging" smithymiddle "github.com/awslabs/smithy-go/middleware" "github.com/awslabs/smithy-go/transport/http" ) @@ -30,13 +31,21 @@ type retryMetadataKey struct{} // Attempt is a Smithy FinalizeMiddleware that handles retry attempts using the provided // Retryer implementation type Attempt struct { + // Enable the logging of retry attempts performed by the SDK. + // This will include logging retry attempts, unretryable errors, and when max attempts are reached. + LogAttempts bool + retryer Retryer requestCloner RequestCloner } // NewAttemptMiddleware returns a new Attempt -func NewAttemptMiddleware(retryer Retryer, requestCloner RequestCloner) *Attempt { - return &Attempt{retryer: retryer, requestCloner: requestCloner} +func NewAttemptMiddleware(retryer Retryer, requestCloner RequestCloner, optFns ...func(*Attempt)) *Attempt { + m := &Attempt{retryer: retryer, requestCloner: requestCloner} + for _, fn := range optFns { + fn(m) + } + return m } // ID returns the middleware identifier @@ -44,6 +53,13 @@ func (r *Attempt) ID() string { return "Retry" } +func (r Attempt) logf(logger logging.Logger, classification logging.Classification, format string, v ...interface{}) { + if !r.LogAttempts { + return + } + logger.Logf(classification, format, v...) +} + // HandleFinalize utilizes the provider Retryer implementation to attempt retries over the next handler func (r Attempt) HandleFinalize(ctx context.Context, in smithymiddle.FinalizeInput, next smithymiddle.FinalizeHandler) ( out smithymiddle.FinalizeOutput, metadata smithymiddle.Metadata, err error, @@ -55,6 +71,9 @@ func (r Attempt) HandleFinalize(ctx context.Context, in smithymiddle.FinalizeInp relRetryToken := r.retryer.GetInitialToken() + logger := smithymiddle.GetLogger(ctx) + service, operation := awsmiddle.GetServiceID(ctx), awsmiddle.GetOperationName(ctx) + for { attemptNum++ @@ -74,21 +93,28 @@ func (r Attempt) HandleFinalize(ctx context.Context, in smithymiddle.FinalizeInp return out, metadata, fmt.Errorf("failed to rewind transport stream for retry, %w", err) } } + + r.logf(logger, logging.Debug, "retrying request %s/%s, attempt %d", service, operation, attemptNum) } out, metadata, reqErr := next.HandleFinalize(attemptCtx, attemptInput) - relRetryToken(reqErr) + if releaseError := relRetryToken(reqErr); releaseError != nil && reqErr != nil { + return out, metadata, fmt.Errorf("failed to release token after request error, %v", reqErr) + } + if reqErr == nil { return out, metadata, nil } retryable := r.retryer.IsErrorRetryable(reqErr) if !retryable { + r.logf(logger, logging.Debug, "request failed with unretryable error %v", reqErr) return out, metadata, reqErr } if maxAttempts > 0 && attemptNum >= maxAttempts { + r.logf(logger, logging.Debug, "max retry attempts exhausted, max %d", maxAttempts) err = &MaxAttemptsError{ Attempt: attemptNum, Err: reqErr, @@ -179,11 +205,18 @@ func setRetryMetadata(ctx context.Context, metadata retryMetadata) context.Conte // associated middleware. type AddRetryMiddlewaresOptions struct { Retryer Retryer + + // Enable the logging of retry attempts performed by the SDK. + // This will include logging retry attempts, unretryable errors, and when max attempts are reached. + LogRetryAttempts bool } // AddRetryMiddlewares adds retry middleware to operation middleware stack func AddRetryMiddlewares(stack *smithymiddle.Stack, options AddRetryMiddlewaresOptions) error { - attempt := NewAttemptMiddleware(options.Retryer, http.RequestCloner) + attempt := NewAttemptMiddleware(options.Retryer, http.RequestCloner, func(middleware *Attempt) { + middleware.LogAttempts = options.LogRetryAttempts + }) + if err := stack.Finalize.Add(attempt, smithymiddle.After); err != nil { return err } diff --git a/aws/signer/v4/v4.go b/aws/signer/v4/v4.go index 55b3dac94c5..079c627dc4f 100644 --- a/aws/signer/v4/v4.go +++ b/aws/signer/v4/v4.go @@ -47,6 +47,7 @@ import ( "context" "crypto/sha256" "encoding/hex" + "fmt" "hash" "net/http" "net/url" @@ -58,6 +59,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" v4Internal "github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4" "github.com/awslabs/smithy-go/httpbinding" + "github.com/awslabs/smithy-go/logging" ) const ( @@ -92,6 +94,14 @@ type Signer struct { // http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html DisableURIPathEscaping bool + // The logger to send log messages to. + Logger logging.Logger + + // Enable logging of signed requests. + // This will enable logging of the canonical request, the string to sign, and for presigning the subsequent + // presigned URL. + LogSigning bool + keyDerivator keyDerivator } @@ -230,6 +240,10 @@ func buildAuthorizationHeader(credentialStr, signedHeadersStr, signingSignature return parts.String() } +func (v4 Signer) getLogger(ctx context.Context) logging.Logger { + return logging.WithContext(ctx, v4.Logger) +} + // SignHTTP signs AWS v4 requests with the provided payload hash, service name, region the // request is made to, and time the request is signed at. The signTime allows // you to specify that a request is signed for the future, and cannot be @@ -254,11 +268,13 @@ func (v4 Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *h KeyDerivator: v4.keyDerivator, } - _, err := signer.Build() + signedRequest, err := signer.Build() if err != nil { return err } + v4.logSigningInfo(ctx, &signedRequest, false) + return nil } @@ -313,6 +329,8 @@ func (v4 *Signer) PresignHTTP( return "", nil, err } + v4.logSigningInfo(ctx, &signedRequest, true) + return signedRequest.Request.URL.String(), signedRequest.SignedHeaders, nil } @@ -443,6 +461,18 @@ func (s *httpSigner) setRequiredSigningFields(headers http.Header, query url.Val } } +func (v4 Signer) logSigningInfo(ctx context.Context, request *signedRequest, isPresign bool) { + if !v4.LogSigning { + return + } + signedURLMsg := "" + if isPresign { + signedURLMsg = fmt.Sprintf(logSignedURLMsg, request.Request.URL.String()) + } + logger := v4.getLogger(ctx) + logger.Logf(logging.Debug, logSignInfoMsg, request.CanonicalString, request.StringToSign, signedURLMsg) +} + type signedRequest struct { Request *http.Request SignedHeaders http.Header @@ -450,3 +480,13 @@ type signedRequest struct { StringToSign string PreSigned bool } + +const logSignInfoMsg = `Request Signature: +---[ CANONICAL STRING ]----------------------------- +%s +---[ STRING TO SIGN ]-------------------------------- +%s%s +-----------------------------------------------------` +const logSignedURLMsg = ` +---[ SIGNED URL ]------------------------------------ +%s` diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java index 192db36bac4..ebb8c28e764 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java @@ -45,12 +45,14 @@ public class AddAwsConfigFields implements GoIntegration { public static final String ENDPOINT_RESOLVER_CONFIG_NAME = "EndpointResolver"; public static final String HTTP_CLIENT_CONFIG_NAME = "HTTPClient"; public static final String RETRYER_CONFIG_NAME = "Retryer"; + public static final String API_OPTIONS_CONFIG_NAME = "APIOptions"; + public static final String LOGGER_CONFIG_NAME = "Logger"; + public static final String LOG_MODE_CONFIG_NAME = "ClientLogMode"; private static final String RESOLVE_HTTP_CLIENT = "resolveHTTPClient"; private static final String RESOLVE_RETRYER = "resolveRetryer"; private static final String RESOLVE_AWS_CONFIG_ENDPOINT_RESOLVER = "resolveAWSEndpointResolver"; - public static final String API_OPTIONS_CONFIG_NAME = "APIOptions"; private static final List AWS_CONFIG_FIELDS = ListUtils.of( AwsConfigField.builder() .name(REGION_CONFIG_NAME) @@ -90,6 +92,16 @@ public class AddAwsConfigFields implements GoIntegration { .generatedOnClient(false) .awsResolveFunction(SymbolUtils.createValueSymbolBuilder(RESOLVE_AWS_CONFIG_ENDPOINT_RESOLVER) .build()) + .build(), + AwsConfigField.builder() + .name(LOGGER_CONFIG_NAME) + .type(getAwsCoreSymbol("Logger")) + .generatedOnClient(false) + .build(), + AwsConfigField.builder() + .name(LOG_MODE_CONFIG_NAME) + .type(getAwsCoreSymbol("ClientLogMode")) + .documentation("Configures the events that will be sent to the configured logger.") .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 index 2c167f3805f..300a6c11ace 100644 --- 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 @@ -51,6 +51,8 @@ private void generateRetryMiddlewareHelpers(GoWriter writer) { writer.openBlock("mo := $T{", "}", addOptions, () -> { writer.write("$L: o.$L,", AddAwsConfigFields.RETRYER_CONFIG_NAME, AddAwsConfigFields.RETRYER_CONFIG_NAME); + writer.write("LogRetryAttempts: o.$L.IsRetries(),", + AddAwsConfigFields.LOG_MODE_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 3e38dca5c23..b52b67a1fc5 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 @@ -66,8 +66,7 @@ public void writeAdditionalFiles( goDelegator.useShapeWriter(serviceShape, writer -> { writeMiddlewareRegister(model, writer, serviceShape); writerSignerInterface(writer); - writeConfigureSigner(writer, serviceShape); - writerConfigFieldResolver(writer); + writerConfigFieldResolver(writer, serviceShape); }); } } @@ -83,29 +82,27 @@ private void writerSignerInterface(GoWriter writer) { }); } - private void writerConfigFieldResolver(GoWriter writer) { - Symbol signerSymbol = SymbolUtils.createValueSymbolBuilder("NewSigner", AwsGoDependency.AWS_SIGNER_V4).build(); + private void writerConfigFieldResolver(GoWriter writer, ServiceShape serviceShape) { + Symbol newSignerSymbol = SymbolUtils.createValueSymbolBuilder("NewSigner", + AwsGoDependency.AWS_SIGNER_V4).build(); + Symbol signerSymbol = SymbolUtils.createPointableSymbolBuilder("Signer", + AwsGoDependency.AWS_SIGNER_V4).build(); writer.openBlock("func $L(o *Options) {", "}", SIGNER_RESOLVER, () -> { writer.openBlock("if o.$L != nil {", "}", SIGNER_CONFIG_FIELD_NAME, () -> writer.write("return")); - writer.openBlock("o.$L = $T(", ")", SIGNER_CONFIG_FIELD_NAME, signerSymbol, () -> { - writer.write("$L,", CONFIGURE_SIGNER_FUNCTION); + writer.openBlock("o.$L = $T(", ")", SIGNER_CONFIG_FIELD_NAME, newSignerSymbol, () -> { + writer.openBlock("func (s $P) {", "},", signerSymbol, () -> { + writer.write("s.Logger = o.$L", AddAwsConfigFields.LOGGER_CONFIG_NAME); + writer.write("s.LogSigning = o.$L.IsSigning()", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + if (DISABLE_URI_PATH_ESCAPE.contains(serviceShape.getId().toString())) { + writer.write("s.DisableURIPathEscaping = true"); + } + }); }); }); writer.write(""); } - private void writeConfigureSigner(GoWriter writer, ServiceShape serviceShape) { - Symbol signerSymbol = SymbolUtils.createPointableSymbolBuilder("Signer", AwsGoDependency.AWS_SIGNER_V4).build(); - - writer.openBlock("func $L(s $P) {", "}", CONFIGURE_SIGNER_FUNCTION, signerSymbol, () -> { - if (DISABLE_URI_PATH_ESCAPE.contains(serviceShape.getId().toString())) { - writer.write("s.DisableURIPathEscaping = true"); - } - }); - writer.write(""); - } - @Override public List getClientPlugins() { return ListUtils.of(RuntimeClientPlugin.builder() diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RequestResponseLogging.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RequestResponseLogging.java new file mode 100644 index 00000000000..d26fbbcf033 --- /dev/null +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RequestResponseLogging.java @@ -0,0 +1,74 @@ +/* + * 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 java.util.List; +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.SmithyGoDependency; +import software.amazon.smithy.go.codegen.SymbolUtils; +import software.amazon.smithy.go.codegen.integration.GoIntegration; +import software.amazon.smithy.go.codegen.integration.MiddlewareRegistrar; +import software.amazon.smithy.go.codegen.integration.RuntimeClientPlugin; +import software.amazon.smithy.model.Model; +import software.amazon.smithy.utils.ListUtils; + +public class RequestResponseLogging implements GoIntegration { + private final static String MIDDLEWARE_HELPER = "addRequestResponseLogging"; + + @Override + public byte getOrder() { + return 127; + } + + @Override + public void writeAdditionalFiles( + GoSettings settings, + Model model, + SymbolProvider symbolProvider, + GoDelegator goDelegator + ) { + goDelegator.useShapeWriter(settings.getService(model), writer -> { + Symbol stackSymbol = SymbolUtils.createPointableSymbolBuilder("Stack", SmithyGoDependency.SMITHY_MIDDLEWARE) + .build(); + Symbol middlewareSymbol = SymbolUtils.createValueSymbolBuilder("RequestResponseLogger", + SmithyGoDependency.SMITHY_HTTP_TRANSPORT).build(); + + writer.openBlock("func $L(stack $P, o Options) error {", "}", MIDDLEWARE_HELPER, stackSymbol, () -> { + writer.openBlock("return stack.Deserialize.Add(&$T{", "}, middleware.After)", middlewareSymbol, () -> { + writer.write("LogRequest: o.$L.IsRequest(),", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + writer.write("LogRequestWithBody: o.$L.IsRequestWithBody(),", + AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + writer.write("LogResponse: o.$L.IsResponse(),", AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + writer.write("LogResponseWithBody: o.$L.IsResponseWithBody(),", + AddAwsConfigFields.LOG_MODE_CONFIG_NAME); + }); + }); + }); + } + + @Override + public List getClientPlugins() { + return ListUtils.of(RuntimeClientPlugin.builder() + .registerMiddleware(MiddlewareRegistrar.builder() + .resolvedFunction(SymbolUtils.createValueSymbolBuilder(MIDDLEWARE_HELPER).build()) + .useClientOptions() + .build()) + .build()); + } +} 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 13c863f5270..fa5beb418be 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 @@ -27,3 +27,4 @@ software.amazon.smithy.aws.go.codegen.customization.Route53Customizations software.amazon.smithy.aws.go.codegen.customization.S3HeadObjectCustomizations software.amazon.smithy.aws.go.codegen.customization.PresignURLAutoFill software.amazon.smithy.aws.go.codegen.FilterStreamingOperations +software.amazon.smithy.aws.go.codegen.RequestResponseLogging diff --git a/config/config.go b/config/config.go index c2cfe752977..7fb51b54c3d 100644 --- a/config/config.go +++ b/config/config.go @@ -18,6 +18,8 @@ var defaultLoaders = []loader{ // This will setup the AWS configuration's Region, var defaultAWSConfigResolvers = []awsConfigResolver{ resolveDefaultAWSConfig, + resolveLogger, + resolveClientLogMode, resolveCustomCABundle, resolveHTTPClient, resolveEndpointResolver, diff --git a/config/go.mod b/config/go.mod index 3994d1895b6..199160872f3 100644 --- a/config/go.mod +++ b/config/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v0.1.4 github.com/aws/aws-sdk-go-v2/ec2imds v0.1.4 github.com/aws/aws-sdk-go-v2/service/sts v0.29.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace ( diff --git a/config/go.sum b/config/go.sum index c5d76692711..fd672e20286 100644 --- a/config/go.sum +++ b/config/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/config/provider.go b/config/provider.go index 41f5bb3ac43..a316c60bb9d 100644 --- a/config/provider.go +++ b/config/provider.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials/processcreds" "github.com/aws/aws-sdk-go-v2/credentials/stscreds" "github.com/aws/aws-sdk-go-v2/ec2imds" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" ) @@ -508,7 +509,102 @@ func getEndpointResolver(configs configs) (f aws.EndpointResolver, found bool, e if err != nil { return nil, false, err } + if found { + break + } } } return f, found, err } + +// LoggerProvider is an interface for retrieving a logging.Logger from a configuration source. +type LoggerProvider interface { + GetLogger() (logging.Logger, bool, error) +} + +type withLogger struct { + logging.Logger +} + +// WithLogger wraps a logging.Logger value to satisfy the LoggerProvider interface. +func WithLogger(logger logging.Logger) LoggerProvider { + return withLogger{Logger: logger} +} + +func (w withLogger) GetLogger() (logging.Logger, bool, error) { + return w.Logger, true, nil +} + +// getLogger searches the provided config sources for a logging.Logger that can be used +// to configure the aws.Config.Logger value. +func getLogger(configs configs) (l logging.Logger, found bool, err error) { + for _, c := range configs { + if p, ok := c.(LoggerProvider); ok { + l, found, err = p.GetLogger() + if err != nil { + return nil, false, err + } + if found { + break + } + } + } + return l, found, err +} + +// ClientLogModeProvider is an interface for retrieving the aws.ClientLogMode from a configuration source. +type ClientLogModeProvider interface { + GetClientLogMode() (aws.ClientLogMode, bool, error) +} + +// WithClientLogMode is a ClientLogModeProvider implementation that wraps a aws.ClientLogMode value. +type WithClientLogMode aws.ClientLogMode + +// GetClientLogMode returns the wrapped aws.ClientLogMode +func (w WithClientLogMode) GetClientLogMode() (aws.ClientLogMode, bool, error) { + return aws.ClientLogMode(w), true, nil +} + +func getClientLogMode(configs configs) (m aws.ClientLogMode, found bool, err error) { + for _, c := range configs { + if p, ok := c.(ClientLogModeProvider); ok { + m, found, err = p.GetClientLogMode() + if err != nil { + return 0, false, err + } + if found { + break + } + } + } + return m, found, err +} + +// LogConfigurationWarningsProvider is an interface for retrieving a boolean indicating whether configuration issues should +// be logged when encountered when loading from config sources. +type LogConfigurationWarningsProvider interface { + GetLogConfigurationWarnings() (bool, bool, error) +} + +// WithLogConfigurationWarnings implements a LogConfigurationWarningsProvider and returns the wrapped boolean value. +type WithLogConfigurationWarnings bool + +// GetLogConfigurationWarnings returns the wrapped boolean. +func (w WithLogConfigurationWarnings) GetLogConfigurationWarnings() (bool, bool, error) { + return bool(w), true, nil +} + +func getLogConfigurationWarnings(configs configs) (v bool, found bool, err error) { + for _, c := range configs { + if p, ok := c.(LogConfigurationWarningsProvider); ok { + v, found, err = p.GetLogConfigurationWarnings() + if err != nil { + return false, false, err + } + if found { + break + } + } + } + return v, found, err +} diff --git a/config/resolve.go b/config/resolve.go index 919eeea8772..ddfb207c984 100644 --- a/config/resolve.go +++ b/config/resolve.go @@ -5,8 +5,10 @@ import ( "crypto/x509" "fmt" "net/http" + "os" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/awslabs/smithy-go/logging" ) // resolveDefaultAWSConfig will write default configuration values into the cfg @@ -17,6 +19,7 @@ import ( func resolveDefaultAWSConfig(cfg *aws.Config, cfgs configs) error { *cfg = aws.Config{ Credentials: aws.AnonymousCredentials{}, + Logger: logging.NewStandardLogger(os.Stderr), } return nil } @@ -153,3 +156,31 @@ func resolveEndpointResolver(cfg *aws.Config, configs configs) error { return nil } + +func resolveLogger(cfg *aws.Config, configs configs) error { + logger, found, err := getLogger(configs) + if err != nil { + return err + } + if !found { + return nil + } + + cfg.Logger = logger + + return nil +} + +func resolveClientLogMode(cfg *aws.Config, configs configs) error { + mode, found, err := getClientLogMode(configs) + if err != nil { + return err + } + if !found { + return nil + } + + cfg.ClientLogMode = mode + + return nil +} diff --git a/config/resolve_test.go b/config/resolve_test.go index 74c4db4ee50..cb03f6f4074 100644 --- a/config/resolve_test.go +++ b/config/resolve_test.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/internal/awstesting" "github.com/aws/aws-sdk-go-v2/internal/awstesting/unit" + "github.com/awslabs/smithy-go/logging" ) func TestResolveCustomCABundle(t *testing.T) { @@ -180,3 +181,21 @@ func TestDefaultRegion(t *testing.T) { t.Errorf("expected %v, got %v", e, a) } } + +func TestResolveLogger(t *testing.T) { + configs := configs{ + WithLogger(logging.Nop{}), + } + + cfg := unit.Config() + + err := resolveLogger(&cfg, configs) + if err != nil { + t.Fatalf("expect no error, got %v", err) + } + + _, ok := cfg.Logger.(logging.Nop) + if !ok { + t.Error("unexpected logger type") + } +} diff --git a/credentials/go.mod b/credentials/go.mod index f59e8766bfd..9adc21d23f8 100644 --- a/credentials/go.mod +++ b/credentials/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/ec2imds v0.1.4 github.com/aws/aws-sdk-go-v2/service/sts v0.29.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace ( diff --git a/credentials/go.sum b/credentials/go.sum index b4d32559b31..0cd7164dc96 100644 --- a/credentials/go.sum +++ b/credentials/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= diff --git a/ec2imds/api_client.go b/ec2imds/api_client.go index 407f91e3cfb..135979802ba 100644 --- a/ec2imds/api_client.go +++ b/ec2imds/api_client.go @@ -13,6 +13,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" ) @@ -141,6 +142,12 @@ type Options struct { // AWS_EC2_METADATA_DISABLED=true ClientEnableState ClientEnableState + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + + // The logger writer interface to write logging messages to. + Logger logging.Logger + // provides the caching of API tokens used for operation calls. If unset, // the API token will not be retrieved for the operation. tokenProvider *tokenProvider diff --git a/ec2imds/go.sum b/ec2imds/go.sum index 074f6b91625..c669e324b14 100644 --- a/ec2imds/go.sum +++ b/ec2imds/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/ec2imds/request_middleware.go b/ec2imds/request_middleware.go index 5a8cddf6a5f..22164efb7a0 100644 --- a/ec2imds/request_middleware.go +++ b/ec2imds/request_middleware.go @@ -84,7 +84,10 @@ func addRequestMiddleware(stack *middleware.Stack, } // Retry support - return retry.AddRetryMiddlewares(stack, retry.AddRetryMiddlewaresOptions{Retryer: options.Retryer}) + return retry.AddRetryMiddlewares(stack, retry.AddRetryMiddlewaresOptions{ + Retryer: options.Retryer, + LogRetryAttempts: options.ClientLogMode.IsRetries(), + }) } type serializeRequest struct { diff --git a/example/service/s3/listObjects/go.sum b/example/service/s3/listObjects/go.sum index bf7474a0ab2..c669e324b14 100644 --- a/example/service/s3/listObjects/go.sum +++ b/example/service/s3/listObjects/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/feature/s3/manager/download.go b/feature/s3/manager/download.go index 60e5a051f7c..6c1c2d1a944 100644 --- a/feature/s3/manager/download.go +++ b/feature/s3/manager/download.go @@ -14,6 +14,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/internal/awsutil" "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/awslabs/smithy-go/logging" ) const userAgentKey = "S3Manager" @@ -55,6 +56,12 @@ type Downloader struct { // PartBodyMaxRetries is the number of retry attempts to make for failed part uploads PartBodyMaxRetries int + // Logger to send logging messages to + Logger logging.Logger + + // Enable Logging of part download retry attempts + LogInterruptedDownloads bool + // The number of goroutines to spin up in parallel when sending parts. // If this is set to zero, the DefaultDownloadConcurrency value will be used. // @@ -166,6 +173,9 @@ func (d Downloader) Download(ctx context.Context, w io.WriterAt, input *s3.GetOb option(&impl.cfg) } + // Ensures we don't need nil checks later on + impl.cfg.Logger = logging.WithContext(ctx, impl.cfg.Logger) + impl.partBodyMaxRetries = d.PartBodyMaxRetries impl.totalBytes = -1 @@ -347,10 +357,8 @@ func (d *downloader) downloadChunk(chunk dlchunk) error { chunk.cur = 0 - // TODO: Add Logging - //logMessage(d.cfg.S3, aws.LogDebugWithRequestRetries, - // fmt.Sprintf("DEBUG: object part body download interrupted %s, err, %v, retrying attempt %d", - // aws.StringValue(in.Key), err, retry)) + d.cfg.Logger.Logf(logging.Debug, "object part body download interrupted %s, err, %v, retrying attempt %d", + aws.ToString(in.Key), err, retry) } d.incrWritten(n) diff --git a/feature/s3/manager/go.mod b/feature/s3/manager/go.mod index 9fd68332ce8..37a74b4a810 100644 --- a/feature/s3/manager/go.mod +++ b/feature/s3/manager/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v0.2.2 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v0.29.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/feature/s3/manager/go.sum b/feature/s3/manager/go.sum index 5d9c385f17b..b9e71324395 100644 --- a/feature/s3/manager/go.sum +++ b/feature/s3/manager/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= diff --git a/go.mod b/go.mod index 3b005fb468a..27f41d7b6b4 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/aws/aws-sdk-go-v2 require ( - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/go.sum b/go.sum index 791759c610c..b9e71324395 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= diff --git a/internal/protocoltest/awsrestjson/api_client.go b/internal/protocoltest/awsrestjson/api_client.go index 5af8c8655be..12b7a04f3d8 100644 --- a/internal/protocoltest/awsrestjson/api_client.go +++ b/internal/protocoltest/awsrestjson/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The endpoint options to be used when attempting to resolve an endpoint. EndpointOptions EndpointResolverOptions @@ -65,6 +71,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -119,13 +128,26 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -165,7 +187,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -182,3 +205,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go index eeb670399bf..1747b77c2ba 100644 --- a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go +++ b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go @@ -79,6 +79,9 @@ func addOperationAllQueryStringTypesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAllQueryStringTypesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go index d2af7e60f15..c02e75a382b 100644 --- a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go +++ b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go @@ -47,6 +47,9 @@ func addOperationConstantAndVariableQueryStringMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationConstantAndVariableQueryStringMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go index 96338d61ba5..6748d7b9084 100644 --- a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go +++ b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go @@ -46,6 +46,9 @@ func addOperationConstantQueryStringMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationConstantQueryStringMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go index 0e2c2a005af..b6dca6a17d8 100644 --- a/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go @@ -45,6 +45,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go b/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go index 1596dcbfc08..08f388303ba 100644 --- a/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go @@ -58,6 +58,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go index 94e203d70b4..53875d0e8cf 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go @@ -50,6 +50,9 @@ func addOperationHttpPayloadTraitsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationHttpPayloadTraitsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go index 1d14c72b74d..931fb14b720 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go @@ -50,6 +50,9 @@ func addOperationHttpPayloadTraitsWithMediaTypeMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationHttpPayloadTraitsWithMediaTypeMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go index e97f0e0bfef..9925d838417 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go @@ -47,6 +47,9 @@ func addOperationHttpPayloadWithStructureMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationHttpPayloadWithStructureMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go index 20ff3c804a5..153e84f78a2 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go @@ -49,6 +49,9 @@ func addOperationHttpPrefixHeadersMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationHttpPrefixHeadersMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go index a3f795f023b..43bb33ed1ad 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go @@ -44,6 +44,9 @@ func addOperationHttpPrefixHeadersResponseMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationHttpPrefixHeadersResponseMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go index bd0ca220089..ba11321db47 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go @@ -44,6 +44,9 @@ func addOperationHttpRequestWithGreedyLabelInPathMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationHttpRequestWithGreedyLabelInPathMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go index 892caf1a7c5..5cadab40eeb 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go @@ -67,6 +67,9 @@ func addOperationHttpRequestWithLabelsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationHttpRequestWithLabelsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go index 6b0deafd4e5..88bf602ddef 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go @@ -57,6 +57,9 @@ func addOperationHttpRequestWithLabelsAndTimestampFormatMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationHttpRequestWithLabelsAndTimestampFormatMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go b/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go index f91b905c596..0cd4f5e072c 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go @@ -43,6 +43,9 @@ func addOperationHttpResponseCodeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -76,6 +79,9 @@ func addOperationHttpResponseCodeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go b/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go index 6f2c8037fdb..00838f8268e 100644 --- a/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go +++ b/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go @@ -46,6 +46,9 @@ func addOperationIgnoreQueryParamsInResponseMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationIgnoreQueryParamsInResponseMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_InlineDocument.go b/internal/protocoltest/awsrestjson/api_op_InlineDocument.go index 8bffa1d4beb..d74dc3bb7e3 100644 --- a/internal/protocoltest/awsrestjson/api_op_InlineDocument.go +++ b/internal/protocoltest/awsrestjson/api_op_InlineDocument.go @@ -50,6 +50,9 @@ func addOperationInlineDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationInlineDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go b/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go index d61abb36bdb..8ca072a0f08 100644 --- a/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go +++ b/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go @@ -46,6 +46,9 @@ func addOperationInlineDocumentAsPayloadMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationInlineDocumentAsPayloadMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go b/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go index 39a5f1e5dc1..cb1ce9dca18 100644 --- a/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go +++ b/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go @@ -108,6 +108,9 @@ func addOperationInputAndOutputWithHeadersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationInputAndOutputWithHeadersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go b/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go index 7357dcdee3f..6bcf3a03cb9 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go @@ -45,6 +45,9 @@ func addOperationJsonBlobsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationJsonBlobsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_JsonEnums.go b/internal/protocoltest/awsrestjson/api_op_JsonEnums.go index 01c148d760e..11ba3b6f483 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonEnums.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonEnums.go @@ -66,6 +66,9 @@ func addOperationJsonEnumsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationJsonEnumsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_JsonLists.go b/internal/protocoltest/awsrestjson/api_op_JsonLists.go index af0b447ddad..81ac24cab0e 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonLists.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonLists.go @@ -87,6 +87,9 @@ func addOperationJsonListsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationJsonListsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_JsonMaps.go b/internal/protocoltest/awsrestjson/api_op_JsonMaps.go index f082264d642..a9344a3c41f 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonMaps.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonMaps.go @@ -46,6 +46,9 @@ func addOperationJsonMapsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationJsonMapsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go b/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go index c141862e590..5326b5ee90b 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go @@ -59,6 +59,9 @@ func addOperationJsonTimestampsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationJsonTimestampsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_JsonUnions.go b/internal/protocoltest/awsrestjson/api_op_JsonUnions.go index b3a53a53657..6487c74d3a9 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonUnions.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonUnions.go @@ -52,6 +52,9 @@ func addOperationJsonUnionsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationJsonUnionsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go b/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go index a137fb227f9..7e7e6039ad6 100644 --- a/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go +++ b/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go @@ -45,6 +45,9 @@ func addOperationMediaTypeHeaderMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationMediaTypeHeaderMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go b/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go index d09cd456936..946baafb9e6 100644 --- a/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go b/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go index 640275753cb..08d543a771a 100644 --- a/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go index 42867815b1c..ec70cd619ff 100644 --- a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go +++ b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go @@ -53,6 +53,9 @@ func addOperationNullAndEmptyHeadersClientMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationNullAndEmptyHeadersClientMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go index 555bfc5ccb4..da1fc5b6e7b 100644 --- a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go +++ b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go @@ -53,6 +53,9 @@ func addOperationNullAndEmptyHeadersServerMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationNullAndEmptyHeadersServerMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go b/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go index ea0d43a1522..28756265b1f 100644 --- a/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go +++ b/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go @@ -45,6 +45,9 @@ func addOperationOmitsNullSerializesEmptyStringMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationOmitsNullSerializesEmptyStringMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go index dd87860279e..a7104793a26 100644 --- a/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go @@ -44,6 +44,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go b/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go index c08faf46e15..f6e678e0c43 100644 --- a/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go +++ b/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go @@ -46,6 +46,9 @@ func addOperationRecursiveShapesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationRecursiveShapesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go b/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go index 95578fad008..7c2f118f522 100644 --- a/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go +++ b/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go @@ -80,6 +80,9 @@ func addOperationSimpleScalarPropertiesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSimpleScalarPropertiesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go b/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go index bda58460241..d5fb848902d 100644 --- a/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go +++ b/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go @@ -52,6 +52,9 @@ func addOperationStreamingTraitsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationStreamingTraitsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go index f1f2b5efec3..b73ad510835 100644 --- a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go +++ b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go @@ -52,6 +52,9 @@ func addOperationStreamingTraitsRequireLengthMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationStreamingTraitsRequireLengthMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go index b827fe5c7bc..065b79c1e07 100644 --- a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go +++ b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go @@ -52,6 +52,9 @@ func addOperationStreamingTraitsWithMediaTypeMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationStreamingTraitsWithMediaTypeMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go b/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go index 99ff03c85a0..5d14fb7b04d 100644 --- a/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go +++ b/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go @@ -70,6 +70,9 @@ func addOperationTimestampFormatHeadersMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationTimestampFormatHeadersMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/awsrestjson/go.mod b/internal/protocoltest/awsrestjson/go.mod index 362412ad93d..cc4406750eb 100644 --- a/internal/protocoltest/awsrestjson/go.mod +++ b/internal/protocoltest/awsrestjson/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/internal/protocoltest/awsrestjson/go.sum b/internal/protocoltest/awsrestjson/go.sum index 074f6b91625..c669e324b14 100644 --- a/internal/protocoltest/awsrestjson/go.sum +++ b/internal/protocoltest/awsrestjson/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/internal/protocoltest/ec2query/api_client.go b/internal/protocoltest/ec2query/api_client.go index 643bca3034f..6b336545857 100644 --- a/internal/protocoltest/ec2query/api_client.go +++ b/internal/protocoltest/ec2query/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The endpoint options to be used when attempting to resolve an endpoint. EndpointOptions EndpointResolverOptions @@ -65,6 +71,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -119,13 +128,26 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -165,7 +187,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -182,3 +205,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go index fd0d603575c..c59afe31cb3 100644 --- a/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go @@ -44,6 +44,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go b/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go index 4350ab8a34a..1c1da69c6c0 100644 --- a/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go @@ -52,6 +52,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go b/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go index ea51bf3e42a..aeae6547aaf 100644 --- a/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go +++ b/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go @@ -45,6 +45,9 @@ func addOperationIgnoresWrappingXmlNameMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationIgnoresWrappingXmlNameMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_NestedStructures.go b/internal/protocoltest/ec2query/api_op_NestedStructures.go index 8b4a379f568..ed8da2c1788 100644 --- a/internal/protocoltest/ec2query/api_op_NestedStructures.go +++ b/internal/protocoltest/ec2query/api_op_NestedStructures.go @@ -44,6 +44,9 @@ func addOperationNestedStructuresMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNestedStructuresMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go b/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go index 6d22b71e383..67c3d740410 100644 --- a/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go index 2a18724cd92..724d78dc570 100644 --- a/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go @@ -44,6 +44,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_QueryLists.go b/internal/protocoltest/ec2query/api_op_QueryLists.go index b59c056c216..ead2ef09d72 100644 --- a/internal/protocoltest/ec2query/api_op_QueryLists.go +++ b/internal/protocoltest/ec2query/api_op_QueryLists.go @@ -50,6 +50,9 @@ func addOperationQueryListsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationQueryListsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_QueryTimestamps.go b/internal/protocoltest/ec2query/api_op_QueryTimestamps.go index fd282e68156..0aa228ff0e6 100644 --- a/internal/protocoltest/ec2query/api_op_QueryTimestamps.go +++ b/internal/protocoltest/ec2query/api_op_QueryTimestamps.go @@ -57,6 +57,9 @@ func addOperationQueryTimestampsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationQueryTimestampsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go b/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go index 342b0c40e8d..7b6928a4caa 100644 --- a/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go +++ b/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go @@ -45,6 +45,9 @@ func addOperationRecursiveXmlShapesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationRecursiveXmlShapesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_SimpleInputParams.go b/internal/protocoltest/ec2query/api_op_SimpleInputParams.go index f2e8b06e39b..a74549485d4 100644 --- a/internal/protocoltest/ec2query/api_op_SimpleInputParams.go +++ b/internal/protocoltest/ec2query/api_op_SimpleInputParams.go @@ -62,6 +62,9 @@ func addOperationSimpleInputParamsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationSimpleInputParamsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go b/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go index de3ecd4bd66..8782c1feaa0 100644 --- a/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go +++ b/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go @@ -61,6 +61,9 @@ func addOperationSimpleScalarXmlPropertiesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationSimpleScalarXmlPropertiesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlBlobs.go b/internal/protocoltest/ec2query/api_op_XmlBlobs.go index 8b72d5b9676..4ec2c0754cd 100644 --- a/internal/protocoltest/ec2query/api_op_XmlBlobs.go +++ b/internal/protocoltest/ec2query/api_op_XmlBlobs.go @@ -44,6 +44,9 @@ func addOperationXmlBlobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlBlobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go b/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go index 4b12f4aa5f9..2e572d9c0cc 100644 --- a/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go +++ b/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go @@ -43,6 +43,9 @@ func addOperationXmlEmptyBlobsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -76,6 +79,9 @@ func addOperationXmlEmptyBlobsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go b/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go index ea760f52ede..31818cfb8ea 100644 --- a/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go +++ b/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go @@ -66,6 +66,9 @@ func addOperationXmlEmptyListsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationXmlEmptyListsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlEnums.go b/internal/protocoltest/ec2query/api_op_XmlEnums.go index 9c9c42c751e..772df1a88c5 100644 --- a/internal/protocoltest/ec2query/api_op_XmlEnums.go +++ b/internal/protocoltest/ec2query/api_op_XmlEnums.go @@ -55,6 +55,9 @@ func addOperationXmlEnumsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationXmlEnumsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlLists.go b/internal/protocoltest/ec2query/api_op_XmlLists.go index 784683b9fd9..082ceeed3c3 100644 --- a/internal/protocoltest/ec2query/api_op_XmlLists.go +++ b/internal/protocoltest/ec2query/api_op_XmlLists.go @@ -84,6 +84,9 @@ func addOperationXmlListsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationXmlListsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlNamespaces.go b/internal/protocoltest/ec2query/api_op_XmlNamespaces.go index 7b3a2446b26..ef0587fa299 100644 --- a/internal/protocoltest/ec2query/api_op_XmlNamespaces.go +++ b/internal/protocoltest/ec2query/api_op_XmlNamespaces.go @@ -44,6 +44,9 @@ func addOperationXmlNamespacesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlNamespacesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/api_op_XmlTimestamps.go b/internal/protocoltest/ec2query/api_op_XmlTimestamps.go index 08012d80e58..c7d66a4b51d 100644 --- a/internal/protocoltest/ec2query/api_op_XmlTimestamps.go +++ b/internal/protocoltest/ec2query/api_op_XmlTimestamps.go @@ -52,6 +52,9 @@ func addOperationXmlTimestampsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationXmlTimestampsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/ec2query/go.mod b/internal/protocoltest/ec2query/go.mod index 7a814f026df..1a72c94390b 100644 --- a/internal/protocoltest/ec2query/go.mod +++ b/internal/protocoltest/ec2query/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/internal/protocoltest/ec2query/go.sum b/internal/protocoltest/ec2query/go.sum index 074f6b91625..c669e324b14 100644 --- a/internal/protocoltest/ec2query/go.sum +++ b/internal/protocoltest/ec2query/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/internal/protocoltest/jsonrpc/api_client.go b/internal/protocoltest/jsonrpc/api_client.go index 9cf2c4e4458..a7979722cc3 100644 --- a/internal/protocoltest/jsonrpc/api_client.go +++ b/internal/protocoltest/jsonrpc/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go b/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go index 579a58125df..fff83214681 100644 --- a/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go +++ b/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go @@ -42,6 +42,9 @@ func addOperationEmptyOperationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -81,6 +84,9 @@ func addOperationEmptyOperationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go b/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go index ac547d70daa..d61d6396e20 100644 --- a/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go @@ -56,6 +56,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_JsonEnums.go b/internal/protocoltest/jsonrpc/api_op_JsonEnums.go index ac2ed15246e..53c9a420435 100644 --- a/internal/protocoltest/jsonrpc/api_op_JsonEnums.go +++ b/internal/protocoltest/jsonrpc/api_op_JsonEnums.go @@ -67,6 +67,9 @@ func addOperationJsonEnumsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationJsonEnumsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_JsonUnions.go b/internal/protocoltest/jsonrpc/api_op_JsonUnions.go index 8f63731fa46..5baa0b3afed 100644 --- a/internal/protocoltest/jsonrpc/api_op_JsonUnions.go +++ b/internal/protocoltest/jsonrpc/api_op_JsonUnions.go @@ -53,6 +53,9 @@ func addOperationJsonUnionsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationJsonUnionsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go b/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go index 2d4a1ca9523..208d29b6c82 100644 --- a/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go +++ b/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go @@ -147,6 +147,9 @@ func addOperationKitchenSinkOperationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationKitchenSinkOperationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_NullOperation.go b/internal/protocoltest/jsonrpc/api_op_NullOperation.go index c4f30d3a9f8..23bc08fbd20 100644 --- a/internal/protocoltest/jsonrpc/api_op_NullOperation.go +++ b/internal/protocoltest/jsonrpc/api_op_NullOperation.go @@ -53,6 +53,9 @@ func addOperationNullOperationMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationNullOperationMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go b/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go index e78d4eb43b7..607da069657 100644 --- a/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go +++ b/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go @@ -45,6 +45,9 @@ func addOperationOperationWithOptionalInputOutputMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationOperationWithOptionalInputOutputMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go b/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go index 7b462ee7a04..e55ab8f0c84 100644 --- a/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go +++ b/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go @@ -47,6 +47,9 @@ func addOperationPutAndGetInlineDocumentsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationPutAndGetInlineDocumentsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc/go.mod b/internal/protocoltest/jsonrpc/go.mod index 3a214191c96..dd597b8e7e8 100644 --- a/internal/protocoltest/jsonrpc/go.mod +++ b/internal/protocoltest/jsonrpc/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/internal/protocoltest/jsonrpc/go.sum b/internal/protocoltest/jsonrpc/go.sum index 074f6b91625..c669e324b14 100644 --- a/internal/protocoltest/jsonrpc/go.sum +++ b/internal/protocoltest/jsonrpc/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/internal/protocoltest/jsonrpc10/api_client.go b/internal/protocoltest/jsonrpc10/api_client.go index b87e1202efd..4fbd6ea799f 100644 --- a/internal/protocoltest/jsonrpc10/api_client.go +++ b/internal/protocoltest/jsonrpc10/api_client.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -28,6 +29,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -51,12 +54,18 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The endpoint options to be used when attempting to resolve an endpoint. EndpointOptions EndpointResolverOptions // The service endpoint resolver. EndpointResolver EndpointResolver + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -111,13 +120,26 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -150,7 +172,8 @@ func addClientUserAgent(stack *middleware.Stack) error { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -162,3 +185,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go index 735809dde44..1be9e373073 100644 --- a/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go @@ -45,6 +45,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go b/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go index 2c0b714db98..8f6d3d68784 100644 --- a/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go @@ -55,6 +55,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go b/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go index 7f8430b7ace..5647b7f2aca 100644 --- a/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go +++ b/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go @@ -52,6 +52,9 @@ func addOperationJsonUnionsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationJsonUnionsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go b/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go index e5c41e9a0ba..0b70a3d2976 100644 --- a/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go b/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go index 56e54f11772..f4abe5af771 100644 --- a/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/jsonrpc10/go.mod b/internal/protocoltest/jsonrpc10/go.mod index 306071926d8..519e9fbb9de 100644 --- a/internal/protocoltest/jsonrpc10/go.mod +++ b/internal/protocoltest/jsonrpc10/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc10 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/internal/protocoltest/jsonrpc10/go.sum b/internal/protocoltest/jsonrpc10/go.sum index 074f6b91625..c669e324b14 100644 --- a/internal/protocoltest/jsonrpc10/go.sum +++ b/internal/protocoltest/jsonrpc10/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/internal/protocoltest/query/api_client.go b/internal/protocoltest/query/api_client.go index afd406a0515..7c7ffbe5864 100644 --- a/internal/protocoltest/query/api_client.go +++ b/internal/protocoltest/query/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The endpoint options to be used when attempting to resolve an endpoint. EndpointOptions EndpointResolverOptions @@ -65,6 +71,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -119,13 +128,26 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -165,7 +187,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -182,3 +205,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go index 784f0b667d4..432c21f438d 100644 --- a/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go @@ -44,6 +44,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_FlattenedXmlMap.go b/internal/protocoltest/query/api_op_FlattenedXmlMap.go index dd501fcd25a..22a00f12887 100644 --- a/internal/protocoltest/query/api_op_FlattenedXmlMap.go +++ b/internal/protocoltest/query/api_op_FlattenedXmlMap.go @@ -45,6 +45,9 @@ func addOperationFlattenedXmlMapMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationFlattenedXmlMapMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go b/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go index 473e96322cc..9fcb2344af8 100644 --- a/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go +++ b/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go @@ -44,6 +44,9 @@ func addOperationFlattenedXmlMapWithXmlNameMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationFlattenedXmlMapWithXmlNameMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_GreetingWithErrors.go b/internal/protocoltest/query/api_op_GreetingWithErrors.go index 404edcd7136..4cccbfdc16c 100644 --- a/internal/protocoltest/query/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/query/api_op_GreetingWithErrors.go @@ -52,6 +52,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go b/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go index 559e87d8932..b447c5f9bda 100644 --- a/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go +++ b/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go @@ -46,6 +46,9 @@ func addOperationIgnoresWrappingXmlNameMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationIgnoresWrappingXmlNameMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_NestedStructures.go b/internal/protocoltest/query/api_op_NestedStructures.go index cc2cf1f1f11..5d5d6d58d2b 100644 --- a/internal/protocoltest/query/api_op_NestedStructures.go +++ b/internal/protocoltest/query/api_op_NestedStructures.go @@ -44,6 +44,9 @@ func addOperationNestedStructuresMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNestedStructuresMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_NoInputAndNoOutput.go b/internal/protocoltest/query/api_op_NoInputAndNoOutput.go index ea06a4ff9a6..29f3c098b35 100644 --- a/internal/protocoltest/query/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/query/api_op_NoInputAndNoOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_NoInputAndOutput.go b/internal/protocoltest/query/api_op_NoInputAndOutput.go index 8f1ba230636..73a8483ff67 100644 --- a/internal/protocoltest/query/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/query/api_op_NoInputAndOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go index 23a5c2160ea..f70cf90de37 100644 --- a/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go @@ -44,6 +44,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_QueryLists.go b/internal/protocoltest/query/api_op_QueryLists.go index 4a99f467b56..7cdb5bbc135 100644 --- a/internal/protocoltest/query/api_op_QueryLists.go +++ b/internal/protocoltest/query/api_op_QueryLists.go @@ -52,6 +52,9 @@ func addOperationQueryListsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationQueryListsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_QueryMaps.go b/internal/protocoltest/query/api_op_QueryMaps.go index 7d088901d7e..bc6f28105f0 100644 --- a/internal/protocoltest/query/api_op_QueryMaps.go +++ b/internal/protocoltest/query/api_op_QueryMaps.go @@ -56,6 +56,9 @@ func addOperationQueryMapsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationQueryMapsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_QueryTimestamps.go b/internal/protocoltest/query/api_op_QueryTimestamps.go index 77da1c8b405..714585c5a4c 100644 --- a/internal/protocoltest/query/api_op_QueryTimestamps.go +++ b/internal/protocoltest/query/api_op_QueryTimestamps.go @@ -57,6 +57,9 @@ func addOperationQueryTimestampsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationQueryTimestampsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_RecursiveXmlShapes.go b/internal/protocoltest/query/api_op_RecursiveXmlShapes.go index 48d18e52405..16e24e9603c 100644 --- a/internal/protocoltest/query/api_op_RecursiveXmlShapes.go +++ b/internal/protocoltest/query/api_op_RecursiveXmlShapes.go @@ -45,6 +45,9 @@ func addOperationRecursiveXmlShapesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationRecursiveXmlShapesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_SimpleInputParams.go b/internal/protocoltest/query/api_op_SimpleInputParams.go index f2a32259423..b43d79e0279 100644 --- a/internal/protocoltest/query/api_op_SimpleInputParams.go +++ b/internal/protocoltest/query/api_op_SimpleInputParams.go @@ -56,6 +56,9 @@ func addOperationSimpleInputParamsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationSimpleInputParamsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go b/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go index 112d7b6bc95..e2ca698cae2 100644 --- a/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go +++ b/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go @@ -61,6 +61,9 @@ func addOperationSimpleScalarXmlPropertiesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationSimpleScalarXmlPropertiesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlBlobs.go b/internal/protocoltest/query/api_op_XmlBlobs.go index a8565946995..ac155194127 100644 --- a/internal/protocoltest/query/api_op_XmlBlobs.go +++ b/internal/protocoltest/query/api_op_XmlBlobs.go @@ -44,6 +44,9 @@ func addOperationXmlBlobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlBlobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlEmptyBlobs.go b/internal/protocoltest/query/api_op_XmlEmptyBlobs.go index 1b7d2ac2d6f..d1c1ae9fd29 100644 --- a/internal/protocoltest/query/api_op_XmlEmptyBlobs.go +++ b/internal/protocoltest/query/api_op_XmlEmptyBlobs.go @@ -43,6 +43,9 @@ func addOperationXmlEmptyBlobsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -76,6 +79,9 @@ func addOperationXmlEmptyBlobsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlEmptyLists.go b/internal/protocoltest/query/api_op_XmlEmptyLists.go index f3416c2dfee..c6ecbaa6cfe 100644 --- a/internal/protocoltest/query/api_op_XmlEmptyLists.go +++ b/internal/protocoltest/query/api_op_XmlEmptyLists.go @@ -66,6 +66,9 @@ func addOperationXmlEmptyListsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationXmlEmptyListsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlEmptyMaps.go b/internal/protocoltest/query/api_op_XmlEmptyMaps.go index 629f701fad0..e6da2c19a01 100644 --- a/internal/protocoltest/query/api_op_XmlEmptyMaps.go +++ b/internal/protocoltest/query/api_op_XmlEmptyMaps.go @@ -44,6 +44,9 @@ func addOperationXmlEmptyMapsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlEmptyMapsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlEnums.go b/internal/protocoltest/query/api_op_XmlEnums.go index 755854f11ad..86e580e18e8 100644 --- a/internal/protocoltest/query/api_op_XmlEnums.go +++ b/internal/protocoltest/query/api_op_XmlEnums.go @@ -55,6 +55,9 @@ func addOperationXmlEnumsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationXmlEnumsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlLists.go b/internal/protocoltest/query/api_op_XmlLists.go index 6632add1d12..b0cfa65a175 100644 --- a/internal/protocoltest/query/api_op_XmlLists.go +++ b/internal/protocoltest/query/api_op_XmlLists.go @@ -84,6 +84,9 @@ func addOperationXmlListsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationXmlListsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlMaps.go b/internal/protocoltest/query/api_op_XmlMaps.go index 5d277ae151c..f4c82255779 100644 --- a/internal/protocoltest/query/api_op_XmlMaps.go +++ b/internal/protocoltest/query/api_op_XmlMaps.go @@ -45,6 +45,9 @@ func addOperationXmlMapsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationXmlMapsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlMapsXmlName.go b/internal/protocoltest/query/api_op_XmlMapsXmlName.go index 3d6c40d4acf..cd24bb9d651 100644 --- a/internal/protocoltest/query/api_op_XmlMapsXmlName.go +++ b/internal/protocoltest/query/api_op_XmlMapsXmlName.go @@ -44,6 +44,9 @@ func addOperationXmlMapsXmlNameMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlMapsXmlNameMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlNamespaces.go b/internal/protocoltest/query/api_op_XmlNamespaces.go index f52fc8db0ae..4ea14abf9ea 100644 --- a/internal/protocoltest/query/api_op_XmlNamespaces.go +++ b/internal/protocoltest/query/api_op_XmlNamespaces.go @@ -44,6 +44,9 @@ func addOperationXmlNamespacesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlNamespacesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/api_op_XmlTimestamps.go b/internal/protocoltest/query/api_op_XmlTimestamps.go index 526a5fe89f4..202ae41e5ae 100644 --- a/internal/protocoltest/query/api_op_XmlTimestamps.go +++ b/internal/protocoltest/query/api_op_XmlTimestamps.go @@ -52,6 +52,9 @@ func addOperationXmlTimestampsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationXmlTimestampsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/query/go.mod b/internal/protocoltest/query/go.mod index cc3ded32a5f..4720a971a7a 100644 --- a/internal/protocoltest/query/go.mod +++ b/internal/protocoltest/query/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/query go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/internal/protocoltest/query/go.sum b/internal/protocoltest/query/go.sum index 074f6b91625..c669e324b14 100644 --- a/internal/protocoltest/query/go.sum +++ b/internal/protocoltest/query/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/internal/protocoltest/restxml/api_client.go b/internal/protocoltest/restxml/api_client.go index f3d57b00eb9..c576f670b1a 100644 --- a/internal/protocoltest/restxml/api_client.go +++ b/internal/protocoltest/restxml/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The endpoint options to be used when attempting to resolve an endpoint. EndpointOptions EndpointResolverOptions @@ -65,6 +71,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -119,13 +128,26 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -165,7 +187,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -182,3 +205,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go b/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go index 9a3b0a84a47..1b88da2d7d1 100644 --- a/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go +++ b/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go @@ -79,6 +79,9 @@ func addOperationAllQueryStringTypesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAllQueryStringTypesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go b/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go index 304c6e0af01..bfb3107fad6 100644 --- a/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go +++ b/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go @@ -47,6 +47,9 @@ func addOperationConstantAndVariableQueryStringMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationConstantAndVariableQueryStringMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_ConstantQueryString.go b/internal/protocoltest/restxml/api_op_ConstantQueryString.go index ca1a9b991ec..8cbd244baa1 100644 --- a/internal/protocoltest/restxml/api_op_ConstantQueryString.go +++ b/internal/protocoltest/restxml/api_op_ConstantQueryString.go @@ -46,6 +46,9 @@ func addOperationConstantQueryStringMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationConstantQueryStringMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go index 006a6222a6d..2addc4095d5 100644 --- a/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go @@ -45,6 +45,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationEmptyInputAndEmptyOutputMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go b/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go index 9df088559d1..4ce76ac77d9 100644 --- a/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go +++ b/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go @@ -46,6 +46,9 @@ func addOperationFlattenedXmlMapMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationFlattenedXmlMapMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go b/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go index 8293089e926..6a19730b417 100644 --- a/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go +++ b/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go @@ -45,6 +45,9 @@ func addOperationFlattenedXmlMapWithXmlNameMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationFlattenedXmlMapWithXmlNameMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_GreetingWithErrors.go b/internal/protocoltest/restxml/api_op_GreetingWithErrors.go index 5748a2f8296..adfbbe12d68 100644 --- a/internal/protocoltest/restxml/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/restxml/api_op_GreetingWithErrors.go @@ -56,6 +56,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationGreetingWithErrorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go b/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go index 27119f3ef88..b11e371e311 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go @@ -50,6 +50,9 @@ func addOperationHttpPayloadTraitsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationHttpPayloadTraitsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go b/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go index f3326ab273c..180b1c1677e 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go @@ -50,6 +50,9 @@ func addOperationHttpPayloadTraitsWithMediaTypeMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationHttpPayloadTraitsWithMediaTypeMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go index ba1c1eebdd7..f562b93e658 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go @@ -47,6 +47,9 @@ func addOperationHttpPayloadWithStructureMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationHttpPayloadWithStructureMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go index 21336b81826..465777526b8 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go @@ -47,6 +47,9 @@ func addOperationHttpPayloadWithXmlNameMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationHttpPayloadWithXmlNameMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go index 2ab42bd2a1a..22710ec7dc7 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go @@ -46,6 +46,9 @@ func addOperationHttpPayloadWithXmlNamespaceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationHttpPayloadWithXmlNamespaceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go index 314db1f3db4..faa1e0b54fd 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go @@ -46,6 +46,9 @@ func addOperationHttpPayloadWithXmlNamespaceAndPrefixMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationHttpPayloadWithXmlNamespaceAndPrefixMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go b/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go index 42a49135140..10aa437295b 100644 --- a/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go +++ b/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go @@ -49,6 +49,9 @@ func addOperationHttpPrefixHeadersMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationHttpPrefixHeadersMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go b/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go index 3bed5a2e508..2bf9edd45b8 100644 --- a/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go +++ b/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go @@ -44,6 +44,9 @@ func addOperationHttpRequestWithGreedyLabelInPathMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationHttpRequestWithGreedyLabelInPathMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go b/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go index d485300ae70..f9bad66ca23 100644 --- a/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go +++ b/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go @@ -67,6 +67,9 @@ func addOperationHttpRequestWithLabelsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationHttpRequestWithLabelsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go b/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go index 375c1137ba3..550b1157c32 100644 --- a/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go +++ b/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go @@ -57,6 +57,9 @@ func addOperationHttpRequestWithLabelsAndTimestampFormatMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationHttpRequestWithLabelsAndTimestampFormatMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_HttpResponseCode.go b/internal/protocoltest/restxml/api_op_HttpResponseCode.go index 7ec06cfb4d0..b671e5f4f2c 100644 --- a/internal/protocoltest/restxml/api_op_HttpResponseCode.go +++ b/internal/protocoltest/restxml/api_op_HttpResponseCode.go @@ -43,6 +43,9 @@ func addOperationHttpResponseCodeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -76,6 +79,9 @@ func addOperationHttpResponseCodeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go b/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go index dfb44e21546..14f465d498f 100644 --- a/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go +++ b/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go @@ -46,6 +46,9 @@ func addOperationIgnoreQueryParamsInResponseMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationIgnoreQueryParamsInResponseMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go b/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go index 8c17a65fbb1..d2dd706f3d4 100644 --- a/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go +++ b/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go @@ -108,6 +108,9 @@ func addOperationInputAndOutputWithHeadersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationInputAndOutputWithHeadersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go b/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go index f9700611012..b449ace0156 100644 --- a/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndNoOutputMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_NoInputAndOutput.go b/internal/protocoltest/restxml/api_op_NoInputAndOutput.go index 75d8b7c10bb..af9164fac1b 100644 --- a/internal/protocoltest/restxml/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/restxml/api_op_NoInputAndOutput.go @@ -44,6 +44,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationNoInputAndOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go index cb84b1ea610..9e044c8b709 100644 --- a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go +++ b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go @@ -53,6 +53,9 @@ func addOperationNullAndEmptyHeadersClientMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationNullAndEmptyHeadersClientMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go index e9c52c1ae51..1662c41e0f8 100644 --- a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go +++ b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go @@ -53,6 +53,9 @@ func addOperationNullAndEmptyHeadersServerMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationNullAndEmptyHeadersServerMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go b/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go index afefd652377..554cc0b0ce2 100644 --- a/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go +++ b/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go @@ -45,6 +45,9 @@ func addOperationOmitsNullSerializesEmptyStringMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationOmitsNullSerializesEmptyStringMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go index 8b7ecc5c462..183e2ed78f3 100644 --- a/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go @@ -44,6 +44,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -80,6 +83,9 @@ func addOperationQueryIdempotencyTokenAutoFillMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_RecursiveShapes.go b/internal/protocoltest/restxml/api_op_RecursiveShapes.go index ec13f366199..251d898e1c6 100644 --- a/internal/protocoltest/restxml/api_op_RecursiveShapes.go +++ b/internal/protocoltest/restxml/api_op_RecursiveShapes.go @@ -46,6 +46,9 @@ func addOperationRecursiveShapesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationRecursiveShapesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go b/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go index 57503092a47..2760364df68 100644 --- a/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go +++ b/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go @@ -80,6 +80,9 @@ func addOperationSimpleScalarPropertiesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSimpleScalarPropertiesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go b/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go index fb137333333..4c21e9cad28 100644 --- a/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go +++ b/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go @@ -70,6 +70,9 @@ func addOperationTimestampFormatHeadersMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationTimestampFormatHeadersMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlAttributes.go b/internal/protocoltest/restxml/api_op_XmlAttributes.go index fb951475470..63324cdb06b 100644 --- a/internal/protocoltest/restxml/api_op_XmlAttributes.go +++ b/internal/protocoltest/restxml/api_op_XmlAttributes.go @@ -49,6 +49,9 @@ func addOperationXmlAttributesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationXmlAttributesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go b/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go index 598e809e8f6..467bb0a30f4 100644 --- a/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go +++ b/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go @@ -46,6 +46,9 @@ func addOperationXmlAttributesOnPayloadMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationXmlAttributesOnPayloadMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlBlobs.go b/internal/protocoltest/restxml/api_op_XmlBlobs.go index 06819fd0bcd..ec3117eddae 100644 --- a/internal/protocoltest/restxml/api_op_XmlBlobs.go +++ b/internal/protocoltest/restxml/api_op_XmlBlobs.go @@ -45,6 +45,9 @@ func addOperationXmlBlobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationXmlBlobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go b/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go index 88dcfa4e539..a4adfbde990 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go @@ -45,6 +45,9 @@ func addOperationXmlEmptyBlobsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationXmlEmptyBlobsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyLists.go b/internal/protocoltest/restxml/api_op_XmlEmptyLists.go index 3514e62304c..d89343a1f10 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyLists.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyLists.go @@ -88,6 +88,9 @@ func addOperationXmlEmptyListsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationXmlEmptyListsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go b/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go index bc366f5c477..2c37d3d70be 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go @@ -45,6 +45,9 @@ func addOperationXmlEmptyMapsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationXmlEmptyMapsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go b/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go index b8c3443cbd7..a2ed9af6143 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go @@ -44,6 +44,9 @@ func addOperationXmlEmptyStringsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -77,6 +80,9 @@ func addOperationXmlEmptyStringsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlEnums.go b/internal/protocoltest/restxml/api_op_XmlEnums.go index f87a925e701..fdf4f05c0b6 100644 --- a/internal/protocoltest/restxml/api_op_XmlEnums.go +++ b/internal/protocoltest/restxml/api_op_XmlEnums.go @@ -66,6 +66,9 @@ func addOperationXmlEnumsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationXmlEnumsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlLists.go b/internal/protocoltest/restxml/api_op_XmlLists.go index d33e6c707f9..ad020f610a4 100644 --- a/internal/protocoltest/restxml/api_op_XmlLists.go +++ b/internal/protocoltest/restxml/api_op_XmlLists.go @@ -106,6 +106,9 @@ func addOperationXmlListsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationXmlListsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlMaps.go b/internal/protocoltest/restxml/api_op_XmlMaps.go index b5fd3b8f168..71de5207aa6 100644 --- a/internal/protocoltest/restxml/api_op_XmlMaps.go +++ b/internal/protocoltest/restxml/api_op_XmlMaps.go @@ -46,6 +46,9 @@ func addOperationXmlMapsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -79,6 +82,9 @@ func addOperationXmlMapsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go b/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go index 7e1e89e5c0a..00213603b84 100644 --- a/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go +++ b/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go @@ -45,6 +45,9 @@ func addOperationXmlMapsXmlNameMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationXmlMapsXmlNameMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlNamespaces.go b/internal/protocoltest/restxml/api_op_XmlNamespaces.go index 244f63a8fc0..b28a65b085b 100644 --- a/internal/protocoltest/restxml/api_op_XmlNamespaces.go +++ b/internal/protocoltest/restxml/api_op_XmlNamespaces.go @@ -45,6 +45,9 @@ func addOperationXmlNamespacesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -78,6 +81,9 @@ func addOperationXmlNamespacesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/api_op_XmlTimestamps.go b/internal/protocoltest/restxml/api_op_XmlTimestamps.go index 9c72a4f5365..8cfb34cd8ca 100644 --- a/internal/protocoltest/restxml/api_op_XmlTimestamps.go +++ b/internal/protocoltest/restxml/api_op_XmlTimestamps.go @@ -59,6 +59,9 @@ func addOperationXmlTimestampsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationXmlTimestampsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/internal/protocoltest/restxml/go.mod b/internal/protocoltest/restxml/go.mod index 727a63c1acd..babd7395587 100644 --- a/internal/protocoltest/restxml/go.mod +++ b/internal/protocoltest/restxml/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 github.com/google/go-cmp v0.4.1 ) diff --git a/internal/protocoltest/restxml/go.sum b/internal/protocoltest/restxml/go.sum index 074f6b91625..c669e324b14 100644 --- a/internal/protocoltest/restxml/go.sum +++ b/internal/protocoltest/restxml/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/accessanalyzer/api_client.go b/service/accessanalyzer/api_client.go index ae97d8937a6..854ef9378f9 100644 --- a/service/accessanalyzer/api_client.go +++ b/service/accessanalyzer/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/accessanalyzer/api_op_CreateAnalyzer.go b/service/accessanalyzer/api_op_CreateAnalyzer.go index 51f622a9ed3..aa75658c12b 100644 --- a/service/accessanalyzer/api_op_CreateAnalyzer.go +++ b/service/accessanalyzer/api_op_CreateAnalyzer.go @@ -71,6 +71,9 @@ func addOperationCreateAnalyzerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,5 +113,8 @@ func addOperationCreateAnalyzerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_CreateArchiveRule.go b/service/accessanalyzer/api_op_CreateArchiveRule.go index 22a161dbc44..6c00f970a69 100644 --- a/service/accessanalyzer/api_op_CreateArchiveRule.go +++ b/service/accessanalyzer/api_op_CreateArchiveRule.go @@ -64,6 +64,9 @@ func addOperationCreateArchiveRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,5 +106,8 @@ func addOperationCreateArchiveRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_DeleteAnalyzer.go b/service/accessanalyzer/api_op_DeleteAnalyzer.go index 7504de9658a..67532009149 100644 --- a/service/accessanalyzer/api_op_DeleteAnalyzer.go +++ b/service/accessanalyzer/api_op_DeleteAnalyzer.go @@ -54,6 +54,9 @@ func addOperationDeleteAnalyzerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,5 +96,8 @@ func addOperationDeleteAnalyzerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_DeleteArchiveRule.go b/service/accessanalyzer/api_op_DeleteArchiveRule.go index ad4ba46db3e..6fb9ce19241 100644 --- a/service/accessanalyzer/api_op_DeleteArchiveRule.go +++ b/service/accessanalyzer/api_op_DeleteArchiveRule.go @@ -57,6 +57,9 @@ func addOperationDeleteArchiveRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,5 +99,8 @@ func addOperationDeleteArchiveRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_GetAnalyzedResource.go b/service/accessanalyzer/api_op_GetAnalyzedResource.go index 20130c11bd2..be73be9eb8c 100644 --- a/service/accessanalyzer/api_op_GetAnalyzedResource.go +++ b/service/accessanalyzer/api_op_GetAnalyzedResource.go @@ -61,6 +61,9 @@ func addOperationGetAnalyzedResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetAnalyzedResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_GetAnalyzer.go b/service/accessanalyzer/api_op_GetAnalyzer.go index 4c77b38244a..762528f8ac2 100644 --- a/service/accessanalyzer/api_op_GetAnalyzer.go +++ b/service/accessanalyzer/api_op_GetAnalyzer.go @@ -57,6 +57,9 @@ func addOperationGetAnalyzerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,5 +99,8 @@ func addOperationGetAnalyzerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_GetArchiveRule.go b/service/accessanalyzer/api_op_GetArchiveRule.go index 15a6c473fe0..ef04fce4bd7 100644 --- a/service/accessanalyzer/api_op_GetArchiveRule.go +++ b/service/accessanalyzer/api_op_GetArchiveRule.go @@ -62,6 +62,9 @@ func addOperationGetArchiveRuleMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,5 +104,8 @@ func addOperationGetArchiveRuleMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_GetFinding.go b/service/accessanalyzer/api_op_GetFinding.go index 7371e159dbc..d2f030e49a3 100644 --- a/service/accessanalyzer/api_op_GetFinding.go +++ b/service/accessanalyzer/api_op_GetFinding.go @@ -60,6 +60,9 @@ func addOperationGetFindingMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetFindingMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_ListAnalyzedResources.go b/service/accessanalyzer/api_op_ListAnalyzedResources.go index 9edf81d0840..ea116a50faf 100644 --- a/service/accessanalyzer/api_op_ListAnalyzedResources.go +++ b/service/accessanalyzer/api_op_ListAnalyzedResources.go @@ -70,6 +70,9 @@ func addOperationListAnalyzedResourcesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListAnalyzedResourcesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_ListAnalyzers.go b/service/accessanalyzer/api_op_ListAnalyzers.go index 14693d7f475..56ef9875571 100644 --- a/service/accessanalyzer/api_op_ListAnalyzers.go +++ b/service/accessanalyzer/api_op_ListAnalyzers.go @@ -64,6 +64,9 @@ func addOperationListAnalyzersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,5 +103,8 @@ func addOperationListAnalyzersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_ListArchiveRules.go b/service/accessanalyzer/api_op_ListArchiveRules.go index 738604ec738..b8e1fd3ae70 100644 --- a/service/accessanalyzer/api_op_ListArchiveRules.go +++ b/service/accessanalyzer/api_op_ListArchiveRules.go @@ -66,6 +66,9 @@ func addOperationListArchiveRulesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,5 +108,8 @@ func addOperationListArchiveRulesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_ListFindings.go b/service/accessanalyzer/api_op_ListFindings.go index 51443f58f68..2e4015495ec 100644 --- a/service/accessanalyzer/api_op_ListFindings.go +++ b/service/accessanalyzer/api_op_ListFindings.go @@ -73,6 +73,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_ListTagsForResource.go b/service/accessanalyzer/api_op_ListTagsForResource.go index 9750fa4270c..932c0bb4f13 100644 --- a/service/accessanalyzer/api_op_ListTagsForResource.go +++ b/service/accessanalyzer/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_StartResourceScan.go b/service/accessanalyzer/api_op_StartResourceScan.go index f6c1d332152..f5a706ce5c0 100644 --- a/service/accessanalyzer/api_op_StartResourceScan.go +++ b/service/accessanalyzer/api_op_StartResourceScan.go @@ -55,6 +55,9 @@ func addOperationStartResourceScanMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStartResourceScanMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_TagResource.go b/service/accessanalyzer/api_op_TagResource.go index 012034a9f69..5cae5e1b74a 100644 --- a/service/accessanalyzer/api_op_TagResource.go +++ b/service/accessanalyzer/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_UntagResource.go b/service/accessanalyzer/api_op_UntagResource.go index 74f79cde81a..4303def0c7a 100644 --- a/service/accessanalyzer/api_op_UntagResource.go +++ b/service/accessanalyzer/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_UpdateArchiveRule.go b/service/accessanalyzer/api_op_UpdateArchiveRule.go index 42af6b446e6..97e92081331 100644 --- a/service/accessanalyzer/api_op_UpdateArchiveRule.go +++ b/service/accessanalyzer/api_op_UpdateArchiveRule.go @@ -64,6 +64,9 @@ func addOperationUpdateArchiveRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,5 +106,8 @@ func addOperationUpdateArchiveRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/api_op_UpdateFindings.go b/service/accessanalyzer/api_op_UpdateFindings.go index bfcc9e11a89..a0d0ae26ca4 100644 --- a/service/accessanalyzer/api_op_UpdateFindings.go +++ b/service/accessanalyzer/api_op_UpdateFindings.go @@ -67,6 +67,9 @@ func addOperationUpdateFindingsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateFindingsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/accessanalyzer/go.mod b/service/accessanalyzer/go.mod index d668208a478..58d55986fc5 100644 --- a/service/accessanalyzer/go.mod +++ b/service/accessanalyzer/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/accessanalyzer go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/accessanalyzer/go.sum b/service/accessanalyzer/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/accessanalyzer/go.sum +++ b/service/accessanalyzer/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/acm/api_client.go b/service/acm/api_client.go index 332f4da3c64..8c01d014f8d 100644 --- a/service/acm/api_client.go +++ b/service/acm/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/acm/api_op_AddTagsToCertificate.go b/service/acm/api_op_AddTagsToCertificate.go index 198e18f6498..1acd810e03e 100644 --- a/service/acm/api_op_AddTagsToCertificate.go +++ b/service/acm/api_op_AddTagsToCertificate.go @@ -73,6 +73,9 @@ func addOperationAddTagsToCertificateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationAddTagsToCertificateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_DeleteCertificate.go b/service/acm/api_op_DeleteCertificate.go index 29e997232ae..611ad54b1ed 100644 --- a/service/acm/api_op_DeleteCertificate.go +++ b/service/acm/api_op_DeleteCertificate.go @@ -59,6 +59,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_DescribeCertificate.go b/service/acm/api_op_DescribeCertificate.go index 7c67cc7dc09..99dc288257c 100644 --- a/service/acm/api_op_DescribeCertificate.go +++ b/service/acm/api_op_DescribeCertificate.go @@ -58,6 +58,9 @@ func addOperationDescribeCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_ExportCertificate.go b/service/acm/api_op_ExportCertificate.go index 1b695868c30..a0ed488b95d 100644 --- a/service/acm/api_op_ExportCertificate.go +++ b/service/acm/api_op_ExportCertificate.go @@ -77,6 +77,9 @@ func addOperationExportCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationExportCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_GetCertificate.go b/service/acm/api_op_GetCertificate.go index 670dae8f37b..7059064738c 100644 --- a/service/acm/api_op_GetCertificate.go +++ b/service/acm/api_op_GetCertificate.go @@ -65,6 +65,9 @@ func addOperationGetCertificateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetCertificateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_ImportCertificate.go b/service/acm/api_op_ImportCertificate.go index c768e0d66d8..10d98edd378 100644 --- a/service/acm/api_op_ImportCertificate.go +++ b/service/acm/api_op_ImportCertificate.go @@ -134,6 +134,9 @@ func addOperationImportCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationImportCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_ListCertificates.go b/service/acm/api_op_ListCertificates.go index 0d527c054f8..5aa315aff9a 100644 --- a/service/acm/api_op_ListCertificates.go +++ b/service/acm/api_op_ListCertificates.go @@ -72,6 +72,9 @@ func addOperationListCertificatesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListCertificatesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_ListTagsForCertificate.go b/service/acm/api_op_ListTagsForCertificate.go index 3b20a5932d1..703ef58f4c0 100644 --- a/service/acm/api_op_ListTagsForCertificate.go +++ b/service/acm/api_op_ListTagsForCertificate.go @@ -61,6 +61,9 @@ func addOperationListTagsForCertificateMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTagsForCertificateMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_RemoveTagsFromCertificate.go b/service/acm/api_op_RemoveTagsFromCertificate.go index ad809a031e7..e4a28baa87d 100644 --- a/service/acm/api_op_RemoveTagsFromCertificate.go +++ b/service/acm/api_op_RemoveTagsFromCertificate.go @@ -65,6 +65,9 @@ func addOperationRemoveTagsFromCertificateMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationRemoveTagsFromCertificateMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_RenewCertificate.go b/service/acm/api_op_RenewCertificate.go index fa6ea63b025..8fb6c4b8381 100644 --- a/service/acm/api_op_RenewCertificate.go +++ b/service/acm/api_op_RenewCertificate.go @@ -60,6 +60,9 @@ func addOperationRenewCertificateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRenewCertificateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_RequestCertificate.go b/service/acm/api_op_RequestCertificate.go index 89fedb83e51..608738f49c2 100644 --- a/service/acm/api_op_RequestCertificate.go +++ b/service/acm/api_op_RequestCertificate.go @@ -138,6 +138,9 @@ func addOperationRequestCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationRequestCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_ResendValidationEmail.go b/service/acm/api_op_ResendValidationEmail.go index 9389aae71cb..4f3ec6e4377 100644 --- a/service/acm/api_op_ResendValidationEmail.go +++ b/service/acm/api_op_ResendValidationEmail.go @@ -92,6 +92,9 @@ func addOperationResendValidationEmailMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationResendValidationEmailMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/api_op_UpdateCertificateOptions.go b/service/acm/api_op_UpdateCertificateOptions.go index 73c6095a454..2074272543e 100644 --- a/service/acm/api_op_UpdateCertificateOptions.go +++ b/service/acm/api_op_UpdateCertificateOptions.go @@ -62,6 +62,9 @@ func addOperationUpdateCertificateOptionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateCertificateOptionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acm/go.mod b/service/acm/go.mod index 3b22cc0c71a..66d0b4040df 100644 --- a/service/acm/go.mod +++ b/service/acm/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/acm go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/acm/go.sum b/service/acm/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/acm/go.sum +++ b/service/acm/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/acmpca/api_client.go b/service/acmpca/api_client.go index bbdad4b9cc7..250b2028182 100644 --- a/service/acmpca/api_client.go +++ b/service/acmpca/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/acmpca/api_op_CreateCertificateAuthority.go b/service/acmpca/api_op_CreateCertificateAuthority.go index e59defea38a..7dc01ca1ee1 100644 --- a/service/acmpca/api_op_CreateCertificateAuthority.go +++ b/service/acmpca/api_op_CreateCertificateAuthority.go @@ -102,6 +102,9 @@ func addOperationCreateCertificateAuthorityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateCertificateAuthorityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go b/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go index 67e14cb7748..580027710e6 100644 --- a/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go +++ b/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go @@ -81,6 +81,9 @@ func addOperationCreateCertificateAuthorityAuditReportMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateCertificateAuthorityAuditReportMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_CreatePermission.go b/service/acmpca/api_op_CreatePermission.go index 135b8ca6308..913de137caf 100644 --- a/service/acmpca/api_op_CreatePermission.go +++ b/service/acmpca/api_op_CreatePermission.go @@ -90,6 +90,9 @@ func addOperationCreatePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreatePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_DeleteCertificateAuthority.go b/service/acmpca/api_op_DeleteCertificateAuthority.go index 82ea6efcaa7..ab5b5bef802 100644 --- a/service/acmpca/api_op_DeleteCertificateAuthority.go +++ b/service/acmpca/api_op_DeleteCertificateAuthority.go @@ -81,6 +81,9 @@ func addOperationDeleteCertificateAuthorityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteCertificateAuthorityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_DeletePermission.go b/service/acmpca/api_op_DeletePermission.go index e9fab3096db..23fcb90af23 100644 --- a/service/acmpca/api_op_DeletePermission.go +++ b/service/acmpca/api_op_DeletePermission.go @@ -84,6 +84,9 @@ func addOperationDeletePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDeletePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_DeletePolicy.go b/service/acmpca/api_op_DeletePolicy.go index d2a231ec919..dcc54521900 100644 --- a/service/acmpca/api_op_DeletePolicy.go +++ b/service/acmpca/api_op_DeletePolicy.go @@ -81,6 +81,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_DescribeCertificateAuthority.go b/service/acmpca/api_op_DescribeCertificateAuthority.go index 83fc26df9be..a64c168fcce 100644 --- a/service/acmpca/api_op_DescribeCertificateAuthority.go +++ b/service/acmpca/api_op_DescribeCertificateAuthority.go @@ -87,6 +87,9 @@ func addOperationDescribeCertificateAuthorityMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeCertificateAuthorityMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go index defd2ce6ae9..9fb061fd4fc 100644 --- a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go +++ b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go @@ -80,6 +80,9 @@ func addOperationDescribeCertificateAuthorityAuditReportMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeCertificateAuthorityAuditReportMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_GetCertificate.go b/service/acmpca/api_op_GetCertificate.go index 252bf411bbd..603b792df2f 100644 --- a/service/acmpca/api_op_GetCertificate.go +++ b/service/acmpca/api_op_GetCertificate.go @@ -77,6 +77,9 @@ func addOperationGetCertificateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetCertificateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_GetCertificateAuthorityCertificate.go b/service/acmpca/api_op_GetCertificateAuthorityCertificate.go index 0e0e8b61472..2bf0c1c8769 100644 --- a/service/acmpca/api_op_GetCertificateAuthorityCertificate.go +++ b/service/acmpca/api_op_GetCertificateAuthorityCertificate.go @@ -63,6 +63,9 @@ func addOperationGetCertificateAuthorityCertificateMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetCertificateAuthorityCertificateMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_GetCertificateAuthorityCsr.go b/service/acmpca/api_op_GetCertificateAuthorityCsr.go index 9e0474e94d3..8a91bc9d953 100644 --- a/service/acmpca/api_op_GetCertificateAuthorityCsr.go +++ b/service/acmpca/api_op_GetCertificateAuthorityCsr.go @@ -64,6 +64,9 @@ func addOperationGetCertificateAuthorityCsrMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetCertificateAuthorityCsrMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_GetPolicy.go b/service/acmpca/api_op_GetPolicy.go index cf6bf9dfe59..3f17065a8b2 100644 --- a/service/acmpca/api_op_GetPolicy.go +++ b/service/acmpca/api_op_GetPolicy.go @@ -78,6 +78,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go b/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go index fafdd266be9..4d95f1ead27 100644 --- a/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go +++ b/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go @@ -161,6 +161,9 @@ func addOperationImportCertificateAuthorityCertificateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -203,6 +206,9 @@ func addOperationImportCertificateAuthorityCertificateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_IssueCertificate.go b/service/acmpca/api_op_IssueCertificate.go index 33f2b6c7f83..02f936a86fb 100644 --- a/service/acmpca/api_op_IssueCertificate.go +++ b/service/acmpca/api_op_IssueCertificate.go @@ -165,6 +165,9 @@ func addOperationIssueCertificateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -207,6 +210,9 @@ func addOperationIssueCertificateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_ListCertificateAuthorities.go b/service/acmpca/api_op_ListCertificateAuthorities.go index 2131f1f7019..af64f13bf08 100644 --- a/service/acmpca/api_op_ListCertificateAuthorities.go +++ b/service/acmpca/api_op_ListCertificateAuthorities.go @@ -70,6 +70,9 @@ func addOperationListCertificateAuthoritiesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListCertificateAuthoritiesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_ListPermissions.go b/service/acmpca/api_op_ListPermissions.go index 3afd86da018..9e6fbae4418 100644 --- a/service/acmpca/api_op_ListPermissions.go +++ b/service/acmpca/api_op_ListPermissions.go @@ -97,6 +97,9 @@ func addOperationListPermissionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationListPermissionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_ListTags.go b/service/acmpca/api_op_ListTags.go index 265b1d1c040..9e04ca97d33 100644 --- a/service/acmpca/api_op_ListTags.go +++ b/service/acmpca/api_op_ListTags.go @@ -79,6 +79,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_PutPolicy.go b/service/acmpca/api_op_PutPolicy.go index 9e2d80b3441..e27c3e105f3 100644 --- a/service/acmpca/api_op_PutPolicy.go +++ b/service/acmpca/api_op_PutPolicy.go @@ -87,6 +87,9 @@ func addOperationPutPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationPutPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_RestoreCertificateAuthority.go b/service/acmpca/api_op_RestoreCertificateAuthority.go index aec802c6187..b49a8e63301 100644 --- a/service/acmpca/api_op_RestoreCertificateAuthority.go +++ b/service/acmpca/api_op_RestoreCertificateAuthority.go @@ -71,6 +71,9 @@ func addOperationRestoreCertificateAuthorityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationRestoreCertificateAuthorityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_RevokeCertificate.go b/service/acmpca/api_op_RevokeCertificate.go index 83ef3b50ade..207dd6ad9fc 100644 --- a/service/acmpca/api_op_RevokeCertificate.go +++ b/service/acmpca/api_op_RevokeCertificate.go @@ -89,6 +89,9 @@ func addOperationRevokeCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationRevokeCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_TagCertificateAuthority.go b/service/acmpca/api_op_TagCertificateAuthority.go index 03f504fbaf1..19c929e139f 100644 --- a/service/acmpca/api_op_TagCertificateAuthority.go +++ b/service/acmpca/api_op_TagCertificateAuthority.go @@ -69,6 +69,9 @@ func addOperationTagCertificateAuthorityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationTagCertificateAuthorityMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_UntagCertificateAuthority.go b/service/acmpca/api_op_UntagCertificateAuthority.go index dd68e19b247..e1bbffb73f4 100644 --- a/service/acmpca/api_op_UntagCertificateAuthority.go +++ b/service/acmpca/api_op_UntagCertificateAuthority.go @@ -66,6 +66,9 @@ func addOperationUntagCertificateAuthorityMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUntagCertificateAuthorityMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/api_op_UpdateCertificateAuthority.go b/service/acmpca/api_op_UpdateCertificateAuthority.go index de3ce70519a..fdff2fd1bd6 100644 --- a/service/acmpca/api_op_UpdateCertificateAuthority.go +++ b/service/acmpca/api_op_UpdateCertificateAuthority.go @@ -64,6 +64,9 @@ func addOperationUpdateCertificateAuthorityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateCertificateAuthorityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/acmpca/go.mod b/service/acmpca/go.mod index 1290ca58826..82f7746fbe5 100644 --- a/service/acmpca/go.mod +++ b/service/acmpca/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/acmpca go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/acmpca/go.sum b/service/acmpca/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/acmpca/go.sum +++ b/service/acmpca/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/alexaforbusiness/api_client.go b/service/alexaforbusiness/api_client.go index fdde52c1246..d0a81bba8d9 100644 --- a/service/alexaforbusiness/api_client.go +++ b/service/alexaforbusiness/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/alexaforbusiness/api_op_ApproveSkill.go b/service/alexaforbusiness/api_op_ApproveSkill.go index fa95c2714b5..fee70f121ca 100644 --- a/service/alexaforbusiness/api_op_ApproveSkill.go +++ b/service/alexaforbusiness/api_op_ApproveSkill.go @@ -50,6 +50,9 @@ func addOperationApproveSkillMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationApproveSkillMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go b/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go index fcbcf2a78ca..066a6f29839 100644 --- a/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go +++ b/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go @@ -53,6 +53,9 @@ func addOperationAssociateContactWithAddressBookMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateContactWithAddressBookMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go b/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go index 9f68c0b44e4..d475b3b4dd0 100644 --- a/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go +++ b/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go @@ -53,6 +53,9 @@ func addOperationAssociateDeviceWithNetworkProfileMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateDeviceWithNetworkProfileMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go b/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go index a6b97425c21..fc598ec617e 100644 --- a/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go +++ b/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go @@ -52,6 +52,9 @@ func addOperationAssociateDeviceWithRoomMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationAssociateDeviceWithRoomMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go b/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go index aebfe153a44..94b30840233 100644 --- a/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go +++ b/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go @@ -50,6 +50,9 @@ func addOperationAssociateSkillGroupWithRoomMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationAssociateSkillGroupWithRoomMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go b/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go index 0aeafadea49..9eadbd61df3 100644 --- a/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go +++ b/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go @@ -51,6 +51,9 @@ func addOperationAssociateSkillWithSkillGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationAssociateSkillWithSkillGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go b/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go index 0eb9c6dbe8a..172acf80e88 100644 --- a/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go +++ b/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go @@ -48,6 +48,9 @@ func addOperationAssociateSkillWithUsersMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationAssociateSkillWithUsersMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateAddressBook.go b/service/alexaforbusiness/api_op_CreateAddressBook.go index e0c5adcb25e..775251c8163 100644 --- a/service/alexaforbusiness/api_op_CreateAddressBook.go +++ b/service/alexaforbusiness/api_op_CreateAddressBook.go @@ -59,6 +59,9 @@ func addOperationCreateAddressBookMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateAddressBookMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go b/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go index 4c648d95a63..05bc12ba39f 100644 --- a/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go +++ b/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go @@ -81,6 +81,9 @@ func addOperationCreateBusinessReportScheduleMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateBusinessReportScheduleMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateConferenceProvider.go b/service/alexaforbusiness/api_op_CreateConferenceProvider.go index 704651fb776..90142f61af9 100644 --- a/service/alexaforbusiness/api_op_CreateConferenceProvider.go +++ b/service/alexaforbusiness/api_op_CreateConferenceProvider.go @@ -73,6 +73,9 @@ func addOperationCreateConferenceProviderMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateConferenceProviderMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateContact.go b/service/alexaforbusiness/api_op_CreateContact.go index 8cd4f8f07a3..fa9bdff5172 100644 --- a/service/alexaforbusiness/api_op_CreateContact.go +++ b/service/alexaforbusiness/api_op_CreateContact.go @@ -74,6 +74,9 @@ func addOperationCreateContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateGatewayGroup.go b/service/alexaforbusiness/api_op_CreateGatewayGroup.go index e7d6be241cb..f885ad9ea5a 100644 --- a/service/alexaforbusiness/api_op_CreateGatewayGroup.go +++ b/service/alexaforbusiness/api_op_CreateGatewayGroup.go @@ -61,6 +61,9 @@ func addOperationCreateGatewayGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateGatewayGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateNetworkProfile.go b/service/alexaforbusiness/api_op_CreateNetworkProfile.go index ba2d590dccf..8ab62f4f9a8 100644 --- a/service/alexaforbusiness/api_op_CreateNetworkProfile.go +++ b/service/alexaforbusiness/api_op_CreateNetworkProfile.go @@ -93,6 +93,9 @@ func addOperationCreateNetworkProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateNetworkProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateProfile.go b/service/alexaforbusiness/api_op_CreateProfile.go index c1d4af23e9f..a20d4ea4535 100644 --- a/service/alexaforbusiness/api_op_CreateProfile.go +++ b/service/alexaforbusiness/api_op_CreateProfile.go @@ -101,6 +101,9 @@ func addOperationCreateProfileMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateProfileMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateRoom.go b/service/alexaforbusiness/api_op_CreateRoom.go index cd5e731fe85..2486f3cdc09 100644 --- a/service/alexaforbusiness/api_op_CreateRoom.go +++ b/service/alexaforbusiness/api_op_CreateRoom.go @@ -69,6 +69,9 @@ func addOperationCreateRoomMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateRoomMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateSkillGroup.go b/service/alexaforbusiness/api_op_CreateSkillGroup.go index 94695ce35fc..f3dcec8a6ea 100644 --- a/service/alexaforbusiness/api_op_CreateSkillGroup.go +++ b/service/alexaforbusiness/api_op_CreateSkillGroup.go @@ -63,6 +63,9 @@ func addOperationCreateSkillGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateSkillGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_CreateUser.go b/service/alexaforbusiness/api_op_CreateUser.go index 2990e3081cb..ba2eb5f6069 100644 --- a/service/alexaforbusiness/api_op_CreateUser.go +++ b/service/alexaforbusiness/api_op_CreateUser.go @@ -69,6 +69,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteAddressBook.go b/service/alexaforbusiness/api_op_DeleteAddressBook.go index 0a76208c4bb..38e34d62aa2 100644 --- a/service/alexaforbusiness/api_op_DeleteAddressBook.go +++ b/service/alexaforbusiness/api_op_DeleteAddressBook.go @@ -48,6 +48,9 @@ func addOperationDeleteAddressBookMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAddressBookMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go b/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go index 8b9b81b5d69..d89697512ee 100644 --- a/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go +++ b/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go @@ -48,6 +48,9 @@ func addOperationDeleteBusinessReportScheduleMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteBusinessReportScheduleMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteConferenceProvider.go b/service/alexaforbusiness/api_op_DeleteConferenceProvider.go index ff584759c5b..fcc94d0cec3 100644 --- a/service/alexaforbusiness/api_op_DeleteConferenceProvider.go +++ b/service/alexaforbusiness/api_op_DeleteConferenceProvider.go @@ -48,6 +48,9 @@ func addOperationDeleteConferenceProviderMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteConferenceProviderMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteContact.go b/service/alexaforbusiness/api_op_DeleteContact.go index ceaf14a7f10..9da536150b1 100644 --- a/service/alexaforbusiness/api_op_DeleteContact.go +++ b/service/alexaforbusiness/api_op_DeleteContact.go @@ -48,6 +48,9 @@ func addOperationDeleteContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteDevice.go b/service/alexaforbusiness/api_op_DeleteDevice.go index 0c3a2b6d4ff..00fdfc8dde8 100644 --- a/service/alexaforbusiness/api_op_DeleteDevice.go +++ b/service/alexaforbusiness/api_op_DeleteDevice.go @@ -48,6 +48,9 @@ func addOperationDeleteDeviceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDeviceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go b/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go index 2a5c6f1a340..260fe3440e0 100644 --- a/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go +++ b/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go @@ -57,6 +57,9 @@ func addOperationDeleteDeviceUsageDataMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDeviceUsageDataMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteGatewayGroup.go b/service/alexaforbusiness/api_op_DeleteGatewayGroup.go index 1891be2d5d5..1ca8eb1554c 100644 --- a/service/alexaforbusiness/api_op_DeleteGatewayGroup.go +++ b/service/alexaforbusiness/api_op_DeleteGatewayGroup.go @@ -48,6 +48,9 @@ func addOperationDeleteGatewayGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteGatewayGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteNetworkProfile.go b/service/alexaforbusiness/api_op_DeleteNetworkProfile.go index 5dbdd3ae9c7..5050ea968d9 100644 --- a/service/alexaforbusiness/api_op_DeleteNetworkProfile.go +++ b/service/alexaforbusiness/api_op_DeleteNetworkProfile.go @@ -48,6 +48,9 @@ func addOperationDeleteNetworkProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteNetworkProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteProfile.go b/service/alexaforbusiness/api_op_DeleteProfile.go index 2e916d48c9b..ba855e9c893 100644 --- a/service/alexaforbusiness/api_op_DeleteProfile.go +++ b/service/alexaforbusiness/api_op_DeleteProfile.go @@ -46,6 +46,9 @@ func addOperationDeleteProfileMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDeleteProfileMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteRoom.go b/service/alexaforbusiness/api_op_DeleteRoom.go index 7d542a3f396..516dcd589cf 100644 --- a/service/alexaforbusiness/api_op_DeleteRoom.go +++ b/service/alexaforbusiness/api_op_DeleteRoom.go @@ -46,6 +46,9 @@ func addOperationDeleteRoomMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDeleteRoomMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go b/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go index 350108b8ba2..fc136d446cf 100644 --- a/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go +++ b/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go @@ -56,6 +56,9 @@ func addOperationDeleteRoomSkillParameterMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteRoomSkillParameterMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go b/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go index caf81294fd6..928ddc24b83 100644 --- a/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go +++ b/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go @@ -51,6 +51,9 @@ func addOperationDeleteSkillAuthorizationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteSkillAuthorizationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteSkillGroup.go b/service/alexaforbusiness/api_op_DeleteSkillGroup.go index 3a1920244a8..af93b3b53bf 100644 --- a/service/alexaforbusiness/api_op_DeleteSkillGroup.go +++ b/service/alexaforbusiness/api_op_DeleteSkillGroup.go @@ -46,6 +46,9 @@ func addOperationDeleteSkillGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDeleteSkillGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DeleteUser.go b/service/alexaforbusiness/api_op_DeleteUser.go index 1614ba07f59..85198929576 100644 --- a/service/alexaforbusiness/api_op_DeleteUser.go +++ b/service/alexaforbusiness/api_op_DeleteUser.go @@ -51,6 +51,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go b/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go index b0eb531d825..23103905bca 100644 --- a/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go +++ b/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go @@ -53,6 +53,9 @@ func addOperationDisassociateContactFromAddressBookMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDisassociateContactFromAddressBookMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go b/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go index a4066b7ae5d..a05f054b903 100644 --- a/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go +++ b/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go @@ -48,6 +48,9 @@ func addOperationDisassociateDeviceFromRoomMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDisassociateDeviceFromRoomMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go b/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go index 4eaa5a47395..488f49ff400 100644 --- a/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go +++ b/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go @@ -51,6 +51,9 @@ func addOperationDisassociateSkillFromSkillGroupMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDisassociateSkillFromSkillGroupMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go b/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go index bf34a935211..b4402aa80d9 100644 --- a/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go +++ b/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go @@ -49,6 +49,9 @@ func addOperationDisassociateSkillFromUsersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisassociateSkillFromUsersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go b/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go index 62cf5cd4dc7..9564188707b 100644 --- a/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go +++ b/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go @@ -50,6 +50,9 @@ func addOperationDisassociateSkillGroupFromRoomMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDisassociateSkillGroupFromRoomMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go b/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go index 11307f68410..09ec6cc55bb 100644 --- a/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go +++ b/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go @@ -48,6 +48,9 @@ func addOperationForgetSmartHomeAppliancesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationForgetSmartHomeAppliancesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetAddressBook.go b/service/alexaforbusiness/api_op_GetAddressBook.go index e973c20fd49..f5c7b622326 100644 --- a/service/alexaforbusiness/api_op_GetAddressBook.go +++ b/service/alexaforbusiness/api_op_GetAddressBook.go @@ -53,6 +53,9 @@ func addOperationGetAddressBookMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetAddressBookMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetConferencePreference.go b/service/alexaforbusiness/api_op_GetConferencePreference.go index 405eeb74282..73de1fe6605 100644 --- a/service/alexaforbusiness/api_op_GetConferencePreference.go +++ b/service/alexaforbusiness/api_op_GetConferencePreference.go @@ -48,6 +48,9 @@ func addOperationGetConferencePreferenceMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationGetConferencePreferenceMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetConferenceProvider.go b/service/alexaforbusiness/api_op_GetConferenceProvider.go index 4e7b8a62fa7..aa670950da4 100644 --- a/service/alexaforbusiness/api_op_GetConferenceProvider.go +++ b/service/alexaforbusiness/api_op_GetConferenceProvider.go @@ -53,6 +53,9 @@ func addOperationGetConferenceProviderMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetConferenceProviderMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetContact.go b/service/alexaforbusiness/api_op_GetContact.go index 875209aec40..73535fc8cce 100644 --- a/service/alexaforbusiness/api_op_GetContact.go +++ b/service/alexaforbusiness/api_op_GetContact.go @@ -53,6 +53,9 @@ func addOperationGetContactMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetContactMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetDevice.go b/service/alexaforbusiness/api_op_GetDevice.go index 2dff3dc3228..6c67a074fe2 100644 --- a/service/alexaforbusiness/api_op_GetDevice.go +++ b/service/alexaforbusiness/api_op_GetDevice.go @@ -51,6 +51,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetGateway.go b/service/alexaforbusiness/api_op_GetGateway.go index 9d94a3b1bf0..b8a506f5df8 100644 --- a/service/alexaforbusiness/api_op_GetGateway.go +++ b/service/alexaforbusiness/api_op_GetGateway.go @@ -53,6 +53,9 @@ func addOperationGetGatewayMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetGatewayMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetGatewayGroup.go b/service/alexaforbusiness/api_op_GetGatewayGroup.go index 746773510b3..345862887b7 100644 --- a/service/alexaforbusiness/api_op_GetGatewayGroup.go +++ b/service/alexaforbusiness/api_op_GetGatewayGroup.go @@ -53,6 +53,9 @@ func addOperationGetGatewayGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetGatewayGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetInvitationConfiguration.go b/service/alexaforbusiness/api_op_GetInvitationConfiguration.go index 1456bd25f57..74d8945a4bb 100644 --- a/service/alexaforbusiness/api_op_GetInvitationConfiguration.go +++ b/service/alexaforbusiness/api_op_GetInvitationConfiguration.go @@ -56,6 +56,9 @@ func addOperationGetInvitationConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetInvitationConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetNetworkProfile.go b/service/alexaforbusiness/api_op_GetNetworkProfile.go index c38aab150ff..69cf91254ed 100644 --- a/service/alexaforbusiness/api_op_GetNetworkProfile.go +++ b/service/alexaforbusiness/api_op_GetNetworkProfile.go @@ -53,6 +53,9 @@ func addOperationGetNetworkProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetNetworkProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetProfile.go b/service/alexaforbusiness/api_op_GetProfile.go index 5c4d98a3958..866aa0f8f34 100644 --- a/service/alexaforbusiness/api_op_GetProfile.go +++ b/service/alexaforbusiness/api_op_GetProfile.go @@ -51,6 +51,9 @@ func addOperationGetProfileMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetProfileMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetRoom.go b/service/alexaforbusiness/api_op_GetRoom.go index 4804abdc2b3..983c5e770ed 100644 --- a/service/alexaforbusiness/api_op_GetRoom.go +++ b/service/alexaforbusiness/api_op_GetRoom.go @@ -51,6 +51,9 @@ func addOperationGetRoomMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetRoomMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetRoomSkillParameter.go b/service/alexaforbusiness/api_op_GetRoomSkillParameter.go index a466553bf44..eaa00a1b2f9 100644 --- a/service/alexaforbusiness/api_op_GetRoomSkillParameter.go +++ b/service/alexaforbusiness/api_op_GetRoomSkillParameter.go @@ -62,6 +62,9 @@ func addOperationGetRoomSkillParameterMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetRoomSkillParameterMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_GetSkillGroup.go b/service/alexaforbusiness/api_op_GetSkillGroup.go index 576da137640..d1f1ac6c639 100644 --- a/service/alexaforbusiness/api_op_GetSkillGroup.go +++ b/service/alexaforbusiness/api_op_GetSkillGroup.go @@ -51,6 +51,9 @@ func addOperationGetSkillGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetSkillGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go b/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go index 1eb05617e21..23db45c505c 100644 --- a/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go +++ b/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go @@ -59,6 +59,9 @@ func addOperationListBusinessReportSchedulesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListBusinessReportSchedulesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListConferenceProviders.go b/service/alexaforbusiness/api_op_ListConferenceProviders.go index c7ce3d28102..cc64e5482f3 100644 --- a/service/alexaforbusiness/api_op_ListConferenceProviders.go +++ b/service/alexaforbusiness/api_op_ListConferenceProviders.go @@ -57,6 +57,9 @@ func addOperationListConferenceProvidersMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListConferenceProvidersMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListDeviceEvents.go b/service/alexaforbusiness/api_op_ListDeviceEvents.go index 8210d88a1a2..d5ac4d02f40 100644 --- a/service/alexaforbusiness/api_op_ListDeviceEvents.go +++ b/service/alexaforbusiness/api_op_ListDeviceEvents.go @@ -74,6 +74,9 @@ func addOperationListDeviceEventsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListDeviceEventsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListGatewayGroups.go b/service/alexaforbusiness/api_op_ListGatewayGroups.go index bb270ee460d..86ff833fa28 100644 --- a/service/alexaforbusiness/api_op_ListGatewayGroups.go +++ b/service/alexaforbusiness/api_op_ListGatewayGroups.go @@ -58,6 +58,9 @@ func addOperationListGatewayGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListGatewayGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListGateways.go b/service/alexaforbusiness/api_op_ListGateways.go index 63543370f98..9b5f66cefb0 100644 --- a/service/alexaforbusiness/api_op_ListGateways.go +++ b/service/alexaforbusiness/api_op_ListGateways.go @@ -62,6 +62,9 @@ func addOperationListGatewaysMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListGatewaysMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListSkills.go b/service/alexaforbusiness/api_op_ListSkills.go index 9d98fe5b63a..d8c76d33300 100644 --- a/service/alexaforbusiness/api_op_ListSkills.go +++ b/service/alexaforbusiness/api_op_ListSkills.go @@ -70,6 +70,9 @@ func addOperationListSkillsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListSkillsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go b/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go index 4cc7d0d9398..16b3d235cb9 100644 --- a/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go +++ b/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go @@ -57,6 +57,9 @@ func addOperationListSkillsStoreCategoriesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListSkillsStoreCategoriesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go b/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go index 4a8b6b0259b..a17f7e794cb 100644 --- a/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go +++ b/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go @@ -62,6 +62,9 @@ func addOperationListSkillsStoreSkillsByCategoryMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListSkillsStoreSkillsByCategoryMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go b/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go index 77394c3fcbd..b671e068bda 100644 --- a/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go +++ b/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go @@ -62,6 +62,9 @@ func addOperationListSmartHomeAppliancesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListSmartHomeAppliancesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ListTags.go b/service/alexaforbusiness/api_op_ListTags.go index 5a629db9e66..f97a56483b7 100644 --- a/service/alexaforbusiness/api_op_ListTags.go +++ b/service/alexaforbusiness/api_op_ListTags.go @@ -66,6 +66,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_PutConferencePreference.go b/service/alexaforbusiness/api_op_PutConferencePreference.go index dc88940d794..bef98aea54d 100644 --- a/service/alexaforbusiness/api_op_PutConferencePreference.go +++ b/service/alexaforbusiness/api_op_PutConferencePreference.go @@ -50,6 +50,9 @@ func addOperationPutConferencePreferenceMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationPutConferencePreferenceMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_PutInvitationConfiguration.go b/service/alexaforbusiness/api_op_PutInvitationConfiguration.go index 496f60672da..294aee2d35f 100644 --- a/service/alexaforbusiness/api_op_PutInvitationConfiguration.go +++ b/service/alexaforbusiness/api_op_PutInvitationConfiguration.go @@ -57,6 +57,9 @@ func addOperationPutInvitationConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutInvitationConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_PutRoomSkillParameter.go b/service/alexaforbusiness/api_op_PutRoomSkillParameter.go index 426b1589711..ef3b546adf9 100644 --- a/service/alexaforbusiness/api_op_PutRoomSkillParameter.go +++ b/service/alexaforbusiness/api_op_PutRoomSkillParameter.go @@ -58,6 +58,9 @@ func addOperationPutRoomSkillParameterMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutRoomSkillParameterMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_PutSkillAuthorization.go b/service/alexaforbusiness/api_op_PutSkillAuthorization.go index 76f16239b5b..5f6a48e3894 100644 --- a/service/alexaforbusiness/api_op_PutSkillAuthorization.go +++ b/service/alexaforbusiness/api_op_PutSkillAuthorization.go @@ -59,6 +59,9 @@ func addOperationPutSkillAuthorizationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutSkillAuthorizationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_RegisterAVSDevice.go b/service/alexaforbusiness/api_op_RegisterAVSDevice.go index 21368dbca88..32a9d258a47 100644 --- a/service/alexaforbusiness/api_op_RegisterAVSDevice.go +++ b/service/alexaforbusiness/api_op_RegisterAVSDevice.go @@ -79,6 +79,9 @@ func addOperationRegisterAVSDeviceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationRegisterAVSDeviceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_RejectSkill.go b/service/alexaforbusiness/api_op_RejectSkill.go index 40e09fdca15..53892749872 100644 --- a/service/alexaforbusiness/api_op_RejectSkill.go +++ b/service/alexaforbusiness/api_op_RejectSkill.go @@ -51,6 +51,9 @@ func addOperationRejectSkillMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationRejectSkillMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_ResolveRoom.go b/service/alexaforbusiness/api_op_ResolveRoom.go index 1e96b377591..01d83c7f209 100644 --- a/service/alexaforbusiness/api_op_ResolveRoom.go +++ b/service/alexaforbusiness/api_op_ResolveRoom.go @@ -65,6 +65,9 @@ func addOperationResolveRoomMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationResolveRoomMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_RevokeInvitation.go b/service/alexaforbusiness/api_op_RevokeInvitation.go index fff71b16cee..add2da89a65 100644 --- a/service/alexaforbusiness/api_op_RevokeInvitation.go +++ b/service/alexaforbusiness/api_op_RevokeInvitation.go @@ -49,6 +49,9 @@ func addOperationRevokeInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationRevokeInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchAddressBooks.go b/service/alexaforbusiness/api_op_SearchAddressBooks.go index d7a078919b4..fb129471201 100644 --- a/service/alexaforbusiness/api_op_SearchAddressBooks.go +++ b/service/alexaforbusiness/api_op_SearchAddressBooks.go @@ -73,6 +73,9 @@ func addOperationSearchAddressBooksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSearchAddressBooksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchContacts.go b/service/alexaforbusiness/api_op_SearchContacts.go index 65d5dd1a6d8..3a65242d8e1 100644 --- a/service/alexaforbusiness/api_op_SearchContacts.go +++ b/service/alexaforbusiness/api_op_SearchContacts.go @@ -73,6 +73,9 @@ func addOperationSearchContactsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSearchContactsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchDevices.go b/service/alexaforbusiness/api_op_SearchDevices.go index 2d867d6cf42..3f2d5c22da0 100644 --- a/service/alexaforbusiness/api_op_SearchDevices.go +++ b/service/alexaforbusiness/api_op_SearchDevices.go @@ -76,6 +76,9 @@ func addOperationSearchDevicesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationSearchDevicesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchNetworkProfiles.go b/service/alexaforbusiness/api_op_SearchNetworkProfiles.go index cfdf20beb7c..35226f2962d 100644 --- a/service/alexaforbusiness/api_op_SearchNetworkProfiles.go +++ b/service/alexaforbusiness/api_op_SearchNetworkProfiles.go @@ -76,6 +76,9 @@ func addOperationSearchNetworkProfilesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationSearchNetworkProfilesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchProfiles.go b/service/alexaforbusiness/api_op_SearchProfiles.go index 4010bd9688a..325828195ab 100644 --- a/service/alexaforbusiness/api_op_SearchProfiles.go +++ b/service/alexaforbusiness/api_op_SearchProfiles.go @@ -72,6 +72,9 @@ func addOperationSearchProfilesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSearchProfilesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchRooms.go b/service/alexaforbusiness/api_op_SearchRooms.go index f38b42cbd4e..fc68c1a641d 100644 --- a/service/alexaforbusiness/api_op_SearchRooms.go +++ b/service/alexaforbusiness/api_op_SearchRooms.go @@ -72,6 +72,9 @@ func addOperationSearchRoomsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSearchRoomsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchSkillGroups.go b/service/alexaforbusiness/api_op_SearchSkillGroups.go index 9280d959581..97e6a538dd9 100644 --- a/service/alexaforbusiness/api_op_SearchSkillGroups.go +++ b/service/alexaforbusiness/api_op_SearchSkillGroups.go @@ -74,6 +74,9 @@ func addOperationSearchSkillGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationSearchSkillGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SearchUsers.go b/service/alexaforbusiness/api_op_SearchUsers.go index b6d7b241057..b63eb6d4139 100644 --- a/service/alexaforbusiness/api_op_SearchUsers.go +++ b/service/alexaforbusiness/api_op_SearchUsers.go @@ -73,6 +73,9 @@ func addOperationSearchUsersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSearchUsersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SendAnnouncement.go b/service/alexaforbusiness/api_op_SendAnnouncement.go index 3daaa689531..e03386da109 100644 --- a/service/alexaforbusiness/api_op_SendAnnouncement.go +++ b/service/alexaforbusiness/api_op_SendAnnouncement.go @@ -72,6 +72,9 @@ func addOperationSendAnnouncementMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationSendAnnouncementMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_SendInvitation.go b/service/alexaforbusiness/api_op_SendInvitation.go index 2c2f8b4e79e..476a81110f3 100644 --- a/service/alexaforbusiness/api_op_SendInvitation.go +++ b/service/alexaforbusiness/api_op_SendInvitation.go @@ -47,6 +47,9 @@ func addOperationSendInvitationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationSendInvitationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_StartDeviceSync.go b/service/alexaforbusiness/api_op_StartDeviceSync.go index b5ef328c919..63e9def06ac 100644 --- a/service/alexaforbusiness/api_op_StartDeviceSync.go +++ b/service/alexaforbusiness/api_op_StartDeviceSync.go @@ -73,6 +73,9 @@ func addOperationStartDeviceSyncMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationStartDeviceSyncMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go b/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go index 40d5bdfdb85..c41398c0bb0 100644 --- a/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go +++ b/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go @@ -48,6 +48,9 @@ func addOperationStartSmartHomeApplianceDiscoveryMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStartSmartHomeApplianceDiscoveryMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_TagResource.go b/service/alexaforbusiness/api_op_TagResource.go index d9e7741de3b..59db3613c1b 100644 --- a/service/alexaforbusiness/api_op_TagResource.go +++ b/service/alexaforbusiness/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UntagResource.go b/service/alexaforbusiness/api_op_UntagResource.go index a44d83a72de..ed2a4f40ae1 100644 --- a/service/alexaforbusiness/api_op_UntagResource.go +++ b/service/alexaforbusiness/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateAddressBook.go b/service/alexaforbusiness/api_op_UpdateAddressBook.go index f05bda48ad8..cc4a52cc551 100644 --- a/service/alexaforbusiness/api_op_UpdateAddressBook.go +++ b/service/alexaforbusiness/api_op_UpdateAddressBook.go @@ -54,6 +54,9 @@ func addOperationUpdateAddressBookMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateAddressBookMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go b/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go index 517ae0ca33f..dc3d7b47f50 100644 --- a/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go +++ b/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go @@ -66,6 +66,9 @@ func addOperationUpdateBusinessReportScheduleMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateBusinessReportScheduleMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateConferenceProvider.go b/service/alexaforbusiness/api_op_UpdateConferenceProvider.go index e2a0b4d7a52..d59942bc4fb 100644 --- a/service/alexaforbusiness/api_op_UpdateConferenceProvider.go +++ b/service/alexaforbusiness/api_op_UpdateConferenceProvider.go @@ -65,6 +65,9 @@ func addOperationUpdateConferenceProviderMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateConferenceProviderMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateContact.go b/service/alexaforbusiness/api_op_UpdateContact.go index 4231db5311e..dbd5c8e1955 100644 --- a/service/alexaforbusiness/api_op_UpdateContact.go +++ b/service/alexaforbusiness/api_op_UpdateContact.go @@ -69,6 +69,9 @@ func addOperationUpdateContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateDevice.go b/service/alexaforbusiness/api_op_UpdateDevice.go index fca5d3b0beb..77e97c79236 100644 --- a/service/alexaforbusiness/api_op_UpdateDevice.go +++ b/service/alexaforbusiness/api_op_UpdateDevice.go @@ -49,6 +49,9 @@ func addOperationUpdateDeviceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationUpdateDeviceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateGateway.go b/service/alexaforbusiness/api_op_UpdateGateway.go index 6f655702d48..5b65937bdc6 100644 --- a/service/alexaforbusiness/api_op_UpdateGateway.go +++ b/service/alexaforbusiness/api_op_UpdateGateway.go @@ -59,6 +59,9 @@ func addOperationUpdateGatewayMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateGatewayMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateGatewayGroup.go b/service/alexaforbusiness/api_op_UpdateGatewayGroup.go index 16c535f7957..8dd3011eead 100644 --- a/service/alexaforbusiness/api_op_UpdateGatewayGroup.go +++ b/service/alexaforbusiness/api_op_UpdateGatewayGroup.go @@ -55,6 +55,9 @@ func addOperationUpdateGatewayGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateGatewayGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateNetworkProfile.go b/service/alexaforbusiness/api_op_UpdateNetworkProfile.go index b0a6f17faa3..2a07ebdc081 100644 --- a/service/alexaforbusiness/api_op_UpdateNetworkProfile.go +++ b/service/alexaforbusiness/api_op_UpdateNetworkProfile.go @@ -71,6 +71,9 @@ func addOperationUpdateNetworkProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateNetworkProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateProfile.go b/service/alexaforbusiness/api_op_UpdateProfile.go index af918792625..66d797806dc 100644 --- a/service/alexaforbusiness/api_op_UpdateProfile.go +++ b/service/alexaforbusiness/api_op_UpdateProfile.go @@ -85,6 +85,9 @@ func addOperationUpdateProfileMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateProfileMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateRoom.go b/service/alexaforbusiness/api_op_UpdateRoom.go index 8bb75c8d36d..d0efa2c2496 100644 --- a/service/alexaforbusiness/api_op_UpdateRoom.go +++ b/service/alexaforbusiness/api_op_UpdateRoom.go @@ -58,6 +58,9 @@ func addOperationUpdateRoomMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateRoomMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/api_op_UpdateSkillGroup.go b/service/alexaforbusiness/api_op_UpdateSkillGroup.go index 93170709f5e..d547cd6d2aa 100644 --- a/service/alexaforbusiness/api_op_UpdateSkillGroup.go +++ b/service/alexaforbusiness/api_op_UpdateSkillGroup.go @@ -52,6 +52,9 @@ func addOperationUpdateSkillGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationUpdateSkillGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/alexaforbusiness/go.mod b/service/alexaforbusiness/go.mod index dc7c089a58a..57de8fb78b3 100644 --- a/service/alexaforbusiness/go.mod +++ b/service/alexaforbusiness/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/alexaforbusiness go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/alexaforbusiness/go.sum b/service/alexaforbusiness/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/alexaforbusiness/go.sum +++ b/service/alexaforbusiness/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/amplify/api_client.go b/service/amplify/api_client.go index 0975ba03f31..174d0c690c8 100644 --- a/service/amplify/api_client.go +++ b/service/amplify/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/amplify/api_op_CreateApp.go b/service/amplify/api_op_CreateApp.go index 75279125a1f..95868815de7 100644 --- a/service/amplify/api_op_CreateApp.go +++ b/service/amplify/api_op_CreateApp.go @@ -114,6 +114,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_CreateBackendEnvironment.go b/service/amplify/api_op_CreateBackendEnvironment.go index d8dfe83a620..ed5e2578924 100644 --- a/service/amplify/api_op_CreateBackendEnvironment.go +++ b/service/amplify/api_op_CreateBackendEnvironment.go @@ -68,6 +68,9 @@ func addOperationCreateBackendEnvironmentMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateBackendEnvironmentMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_CreateBranch.go b/service/amplify/api_op_CreateBranch.go index 5858078621c..b60c66d0f6a 100644 --- a/service/amplify/api_op_CreateBranch.go +++ b/service/amplify/api_op_CreateBranch.go @@ -115,6 +115,9 @@ func addOperationCreateBranchMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationCreateBranchMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_CreateDeployment.go b/service/amplify/api_op_CreateDeployment.go index b65c2a15374..7c131c8a320 100644 --- a/service/amplify/api_op_CreateDeployment.go +++ b/service/amplify/api_op_CreateDeployment.go @@ -78,6 +78,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_CreateDomainAssociation.go b/service/amplify/api_op_CreateDomainAssociation.go index 4351298e16e..985aaeacaf1 100644 --- a/service/amplify/api_op_CreateDomainAssociation.go +++ b/service/amplify/api_op_CreateDomainAssociation.go @@ -79,6 +79,9 @@ func addOperationCreateDomainAssociationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateDomainAssociationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_CreateWebhook.go b/service/amplify/api_op_CreateWebhook.go index c77373c8f0d..4eb1d7ca42b 100644 --- a/service/amplify/api_op_CreateWebhook.go +++ b/service/amplify/api_op_CreateWebhook.go @@ -65,6 +65,9 @@ func addOperationCreateWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_DeleteApp.go b/service/amplify/api_op_DeleteApp.go index 8cfc9dc033d..68073d7ae88 100644 --- a/service/amplify/api_op_DeleteApp.go +++ b/service/amplify/api_op_DeleteApp.go @@ -58,6 +58,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_DeleteBackendEnvironment.go b/service/amplify/api_op_DeleteBackendEnvironment.go index 199b6bbc400..84d2cccb3c5 100644 --- a/service/amplify/api_op_DeleteBackendEnvironment.go +++ b/service/amplify/api_op_DeleteBackendEnvironment.go @@ -62,6 +62,9 @@ func addOperationDeleteBackendEnvironmentMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteBackendEnvironmentMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_DeleteBranch.go b/service/amplify/api_op_DeleteBranch.go index cf89913c57e..445f27196df 100644 --- a/service/amplify/api_op_DeleteBranch.go +++ b/service/amplify/api_op_DeleteBranch.go @@ -62,6 +62,9 @@ func addOperationDeleteBranchMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteBranchMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_DeleteDomainAssociation.go b/service/amplify/api_op_DeleteDomainAssociation.go index 9b6132ac269..ab0dc25733f 100644 --- a/service/amplify/api_op_DeleteDomainAssociation.go +++ b/service/amplify/api_op_DeleteDomainAssociation.go @@ -62,6 +62,9 @@ func addOperationDeleteDomainAssociationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteDomainAssociationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_DeleteJob.go b/service/amplify/api_op_DeleteJob.go index ea561e3f2a9..b405ad3c26f 100644 --- a/service/amplify/api_op_DeleteJob.go +++ b/service/amplify/api_op_DeleteJob.go @@ -67,6 +67,9 @@ func addOperationDeleteJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_DeleteWebhook.go b/service/amplify/api_op_DeleteWebhook.go index 8e96156c9b2..7964ac015ae 100644 --- a/service/amplify/api_op_DeleteWebhook.go +++ b/service/amplify/api_op_DeleteWebhook.go @@ -57,6 +57,9 @@ func addOperationDeleteWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GenerateAccessLogs.go b/service/amplify/api_op_GenerateAccessLogs.go index 3f82005a34e..9f5d842e704 100644 --- a/service/amplify/api_op_GenerateAccessLogs.go +++ b/service/amplify/api_op_GenerateAccessLogs.go @@ -68,6 +68,9 @@ func addOperationGenerateAccessLogsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGenerateAccessLogsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetApp.go b/service/amplify/api_op_GetApp.go index 14de6110c04..942b5f0ebeb 100644 --- a/service/amplify/api_op_GetApp.go +++ b/service/amplify/api_op_GetApp.go @@ -57,6 +57,9 @@ func addOperationGetAppMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetAppMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetArtifactUrl.go b/service/amplify/api_op_GetArtifactUrl.go index a3fb93b3da6..45de07dd162 100644 --- a/service/amplify/api_op_GetArtifactUrl.go +++ b/service/amplify/api_op_GetArtifactUrl.go @@ -61,6 +61,9 @@ func addOperationGetArtifactUrlMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetArtifactUrlMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetBackendEnvironment.go b/service/amplify/api_op_GetBackendEnvironment.go index c3c6d07bdc0..6bf7d485274 100644 --- a/service/amplify/api_op_GetBackendEnvironment.go +++ b/service/amplify/api_op_GetBackendEnvironment.go @@ -62,6 +62,9 @@ func addOperationGetBackendEnvironmentMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetBackendEnvironmentMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetBranch.go b/service/amplify/api_op_GetBranch.go index dc5fbec527d..4290fa8f4ea 100644 --- a/service/amplify/api_op_GetBranch.go +++ b/service/amplify/api_op_GetBranch.go @@ -61,6 +61,9 @@ func addOperationGetBranchMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetBranchMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetDomainAssociation.go b/service/amplify/api_op_GetDomainAssociation.go index 4c3d59d5b66..5ed12415990 100644 --- a/service/amplify/api_op_GetDomainAssociation.go +++ b/service/amplify/api_op_GetDomainAssociation.go @@ -63,6 +63,9 @@ func addOperationGetDomainAssociationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetDomainAssociationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetJob.go b/service/amplify/api_op_GetJob.go index 02ba4ce1f09..39e38778a67 100644 --- a/service/amplify/api_op_GetJob.go +++ b/service/amplify/api_op_GetJob.go @@ -66,6 +66,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_GetWebhook.go b/service/amplify/api_op_GetWebhook.go index 07f4ef37f50..125a16ae363 100644 --- a/service/amplify/api_op_GetWebhook.go +++ b/service/amplify/api_op_GetWebhook.go @@ -57,6 +57,9 @@ func addOperationGetWebhookMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetWebhookMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListApps.go b/service/amplify/api_op_ListApps.go index 3bc56438da5..96ca7880b61 100644 --- a/service/amplify/api_op_ListApps.go +++ b/service/amplify/api_op_ListApps.go @@ -64,6 +64,9 @@ func addOperationListAppsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListAppsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListArtifacts.go b/service/amplify/api_op_ListArtifacts.go index edb45fc7fea..22f595a7856 100644 --- a/service/amplify/api_op_ListArtifacts.go +++ b/service/amplify/api_op_ListArtifacts.go @@ -79,6 +79,9 @@ func addOperationListArtifactsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListArtifactsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListBackendEnvironments.go b/service/amplify/api_op_ListBackendEnvironments.go index d7716e3f000..c4fd740c77c 100644 --- a/service/amplify/api_op_ListBackendEnvironments.go +++ b/service/amplify/api_op_ListBackendEnvironments.go @@ -72,6 +72,9 @@ func addOperationListBackendEnvironmentsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListBackendEnvironmentsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListBranches.go b/service/amplify/api_op_ListBranches.go index a44540ace57..3482fd1b783 100644 --- a/service/amplify/api_op_ListBranches.go +++ b/service/amplify/api_op_ListBranches.go @@ -69,6 +69,9 @@ func addOperationListBranchesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListBranchesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListDomainAssociations.go b/service/amplify/api_op_ListDomainAssociations.go index b301f6a7d82..290d7f8093f 100644 --- a/service/amplify/api_op_ListDomainAssociations.go +++ b/service/amplify/api_op_ListDomainAssociations.go @@ -69,6 +69,9 @@ func addOperationListDomainAssociationsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListDomainAssociationsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListJobs.go b/service/amplify/api_op_ListJobs.go index fb5fe4d2fee..9e50b38e756 100644 --- a/service/amplify/api_op_ListJobs.go +++ b/service/amplify/api_op_ListJobs.go @@ -74,6 +74,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListTagsForResource.go b/service/amplify/api_op_ListTagsForResource.go index fe309f43a1d..bbaa4fbeb73 100644 --- a/service/amplify/api_op_ListTagsForResource.go +++ b/service/amplify/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_ListWebhooks.go b/service/amplify/api_op_ListWebhooks.go index 4d84479d486..edb2478fedd 100644 --- a/service/amplify/api_op_ListWebhooks.go +++ b/service/amplify/api_op_ListWebhooks.go @@ -69,6 +69,9 @@ func addOperationListWebhooksMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListWebhooksMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_StartDeployment.go b/service/amplify/api_op_StartDeployment.go index 1d7daf0dd3c..04500822bda 100644 --- a/service/amplify/api_op_StartDeployment.go +++ b/service/amplify/api_op_StartDeployment.go @@ -71,6 +71,9 @@ func addOperationStartDeploymentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationStartDeploymentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_StartJob.go b/service/amplify/api_op_StartJob.go index fa794fd1e95..bb096e7852b 100644 --- a/service/amplify/api_op_StartJob.go +++ b/service/amplify/api_op_StartJob.go @@ -87,6 +87,9 @@ func addOperationStartJobMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationStartJobMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_StopJob.go b/service/amplify/api_op_StopJob.go index a2629fc9d17..e07496e4aa3 100644 --- a/service/amplify/api_op_StopJob.go +++ b/service/amplify/api_op_StopJob.go @@ -67,6 +67,9 @@ func addOperationStopJobMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationStopJobMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_TagResource.go b/service/amplify/api_op_TagResource.go index 8044a421d58..885544c2532 100644 --- a/service/amplify/api_op_TagResource.go +++ b/service/amplify/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_UntagResource.go b/service/amplify/api_op_UntagResource.go index 24741583702..e4ac9718361 100644 --- a/service/amplify/api_op_UntagResource.go +++ b/service/amplify/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_UpdateApp.go b/service/amplify/api_op_UpdateApp.go index 9a6a12a8ee2..bced8d7fe64 100644 --- a/service/amplify/api_op_UpdateApp.go +++ b/service/amplify/api_op_UpdateApp.go @@ -113,6 +113,9 @@ func addOperationUpdateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationUpdateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_UpdateBranch.go b/service/amplify/api_op_UpdateBranch.go index fe30ad0cb61..8c59ec341c3 100644 --- a/service/amplify/api_op_UpdateBranch.go +++ b/service/amplify/api_op_UpdateBranch.go @@ -111,6 +111,9 @@ func addOperationUpdateBranchMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationUpdateBranchMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_UpdateDomainAssociation.go b/service/amplify/api_op_UpdateDomainAssociation.go index 49324c2c352..9caf3d43731 100644 --- a/service/amplify/api_op_UpdateDomainAssociation.go +++ b/service/amplify/api_op_UpdateDomainAssociation.go @@ -78,6 +78,9 @@ func addOperationUpdateDomainAssociationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateDomainAssociationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/api_op_UpdateWebhook.go b/service/amplify/api_op_UpdateWebhook.go index 6826e1dbdc9..4f1c7e4c39e 100644 --- a/service/amplify/api_op_UpdateWebhook.go +++ b/service/amplify/api_op_UpdateWebhook.go @@ -63,6 +63,9 @@ func addOperationUpdateWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/amplify/go.mod b/service/amplify/go.mod index 072b69397b1..2dc97aacbfd 100644 --- a/service/amplify/go.mod +++ b/service/amplify/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/amplify go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amplify/go.sum b/service/amplify/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/amplify/go.sum +++ b/service/amplify/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/apigateway/api_client.go b/service/apigateway/api_client.go index 8ae1df3821b..65a923dcdb0 100644 --- a/service/apigateway/api_client.go +++ b/service/apigateway/api_client.go @@ -11,6 +11,7 @@ import ( awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" agcust "github.com/aws/aws-sdk-go-v2/service/apigateway/internal/customizations" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -198,3 +221,12 @@ func addResponseErrorMiddleware(stack *middleware.Stack) error { func addAcceptHeader(stack *middleware.Stack) error { return agcust.AddAcceptHeader(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/apigateway/api_op_CreateApiKey.go b/service/apigateway/api_op_CreateApiKey.go index 9999b62e285..ba2f2634da0 100644 --- a/service/apigateway/api_op_CreateApiKey.go +++ b/service/apigateway/api_op_CreateApiKey.go @@ -109,6 +109,9 @@ func addOperationCreateApiKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateApiKeyMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateAuthorizer.go b/service/apigateway/api_op_CreateAuthorizer.go index eaa1210def9..a9c18718f82 100644 --- a/service/apigateway/api_op_CreateAuthorizer.go +++ b/service/apigateway/api_op_CreateAuthorizer.go @@ -212,6 +212,9 @@ func addOperationCreateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -257,6 +260,9 @@ func addOperationCreateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateBasePathMapping.go b/service/apigateway/api_op_CreateBasePathMapping.go index 0f39d5a8919..fdc0050285a 100644 --- a/service/apigateway/api_op_CreateBasePathMapping.go +++ b/service/apigateway/api_op_CreateBasePathMapping.go @@ -81,6 +81,9 @@ func addOperationCreateBasePathMappingMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateBasePathMappingMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateDeployment.go b/service/apigateway/api_op_CreateDeployment.go index 7a95a299ca7..c911da8326d 100644 --- a/service/apigateway/api_op_CreateDeployment.go +++ b/service/apigateway/api_op_CreateDeployment.go @@ -103,6 +103,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateDocumentationPart.go b/service/apigateway/api_op_CreateDocumentationPart.go index e9a926b7b57..c684b3f30ff 100644 --- a/service/apigateway/api_op_CreateDocumentationPart.go +++ b/service/apigateway/api_op_CreateDocumentationPart.go @@ -94,6 +94,9 @@ func addOperationCreateDocumentationPartMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateDocumentationPartMiddlewares(stack *middleware.Stack, opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateDocumentationVersion.go b/service/apigateway/api_op_CreateDocumentationVersion.go index 29fdca849a2..71c4e3f1740 100644 --- a/service/apigateway/api_op_CreateDocumentationVersion.go +++ b/service/apigateway/api_op_CreateDocumentationVersion.go @@ -75,6 +75,9 @@ func addOperationCreateDocumentationVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateDocumentationVersionMiddlewares(stack *middleware.Stack, if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateDomainName.go b/service/apigateway/api_op_CreateDomainName.go index 73a56d35e9c..12165c9e88b 100644 --- a/service/apigateway/api_op_CreateDomainName.go +++ b/service/apigateway/api_op_CreateDomainName.go @@ -195,6 +195,9 @@ func addOperationCreateDomainNameMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -240,6 +243,9 @@ func addOperationCreateDomainNameMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateModel.go b/service/apigateway/api_op_CreateModel.go index 5059dd4f1ed..c2751ebc594 100644 --- a/service/apigateway/api_op_CreateModel.go +++ b/service/apigateway/api_op_CreateModel.go @@ -90,6 +90,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateRequestValidator.go b/service/apigateway/api_op_CreateRequestValidator.go index 3e885677054..05ac8b65f1e 100644 --- a/service/apigateway/api_op_CreateRequestValidator.go +++ b/service/apigateway/api_op_CreateRequestValidator.go @@ -80,6 +80,9 @@ func addOperationCreateRequestValidatorMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateRequestValidatorMiddlewares(stack *middleware.Stack, opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateResource.go b/service/apigateway/api_op_CreateResource.go index 9192684912e..938ac4f646c 100644 --- a/service/apigateway/api_op_CreateResource.go +++ b/service/apigateway/api_op_CreateResource.go @@ -156,6 +156,9 @@ func addOperationCreateResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -201,6 +204,9 @@ func addOperationCreateResourceMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateRestApi.go b/service/apigateway/api_op_CreateRestApi.go index 646d2ce5876..c760cd3af03 100644 --- a/service/apigateway/api_op_CreateRestApi.go +++ b/service/apigateway/api_op_CreateRestApi.go @@ -158,6 +158,9 @@ func addOperationCreateRestApiMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationCreateRestApiMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateStage.go b/service/apigateway/api_op_CreateStage.go index c6a56d1d55f..15ed7cde86d 100644 --- a/service/apigateway/api_op_CreateStage.go +++ b/service/apigateway/api_op_CreateStage.go @@ -155,6 +155,9 @@ func addOperationCreateStageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationCreateStageMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateUsagePlan.go b/service/apigateway/api_op_CreateUsagePlan.go index 8843b50d463..2d173bdec46 100644 --- a/service/apigateway/api_op_CreateUsagePlan.go +++ b/service/apigateway/api_op_CreateUsagePlan.go @@ -96,6 +96,9 @@ func addOperationCreateUsagePlanMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateUsagePlanMiddlewares(stack *middleware.Stack, options Opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateUsagePlanKey.go b/service/apigateway/api_op_CreateUsagePlanKey.go index 07558ef1cae..b06ac972182 100644 --- a/service/apigateway/api_op_CreateUsagePlanKey.go +++ b/service/apigateway/api_op_CreateUsagePlanKey.go @@ -78,6 +78,9 @@ func addOperationCreateUsagePlanKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateUsagePlanKeyMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_CreateVpcLink.go b/service/apigateway/api_op_CreateVpcLink.go index bdb35df8074..2ee24feb3f7 100644 --- a/service/apigateway/api_op_CreateVpcLink.go +++ b/service/apigateway/api_op_CreateVpcLink.go @@ -100,6 +100,9 @@ func addOperationCreateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteApiKey.go b/service/apigateway/api_op_DeleteApiKey.go index 92fb62cfc6f..db9844021b2 100644 --- a/service/apigateway/api_op_DeleteApiKey.go +++ b/service/apigateway/api_op_DeleteApiKey.go @@ -49,6 +49,9 @@ func addOperationDeleteApiKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteApiKeyMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteAuthorizer.go b/service/apigateway/api_op_DeleteAuthorizer.go index 38dd8b1e7c6..39cec8be987 100644 --- a/service/apigateway/api_op_DeleteAuthorizer.go +++ b/service/apigateway/api_op_DeleteAuthorizer.go @@ -55,6 +55,9 @@ func addOperationDeleteAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteBasePathMapping.go b/service/apigateway/api_op_DeleteBasePathMapping.go index 2a9071d7767..d3b63d169c2 100644 --- a/service/apigateway/api_op_DeleteBasePathMapping.go +++ b/service/apigateway/api_op_DeleteBasePathMapping.go @@ -55,6 +55,9 @@ func addOperationDeleteBasePathMappingMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteBasePathMappingMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteClientCertificate.go b/service/apigateway/api_op_DeleteClientCertificate.go index 6d6ed877595..b5b435ecd33 100644 --- a/service/apigateway/api_op_DeleteClientCertificate.go +++ b/service/apigateway/api_op_DeleteClientCertificate.go @@ -49,6 +49,9 @@ func addOperationDeleteClientCertificateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteClientCertificateMiddlewares(stack *middleware.Stack, opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteDeployment.go b/service/apigateway/api_op_DeleteDeployment.go index 50755b8788a..fa9d1348c94 100644 --- a/service/apigateway/api_op_DeleteDeployment.go +++ b/service/apigateway/api_op_DeleteDeployment.go @@ -55,6 +55,9 @@ func addOperationDeleteDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteDocumentationPart.go b/service/apigateway/api_op_DeleteDocumentationPart.go index 1da22107556..afc3e311cee 100644 --- a/service/apigateway/api_op_DeleteDocumentationPart.go +++ b/service/apigateway/api_op_DeleteDocumentationPart.go @@ -53,6 +53,9 @@ func addOperationDeleteDocumentationPartMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteDocumentationPartMiddlewares(stack *middleware.Stack, opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteDocumentationVersion.go b/service/apigateway/api_op_DeleteDocumentationVersion.go index abf33366ca1..d1d82c5547e 100644 --- a/service/apigateway/api_op_DeleteDocumentationVersion.go +++ b/service/apigateway/api_op_DeleteDocumentationVersion.go @@ -53,6 +53,9 @@ func addOperationDeleteDocumentationVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteDocumentationVersionMiddlewares(stack *middleware.Stack, if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteDomainName.go b/service/apigateway/api_op_DeleteDomainName.go index 07cdb9e6bf0..624bc99625f 100644 --- a/service/apigateway/api_op_DeleteDomainName.go +++ b/service/apigateway/api_op_DeleteDomainName.go @@ -49,6 +49,9 @@ func addOperationDeleteDomainNameMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteDomainNameMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteGatewayResponse.go b/service/apigateway/api_op_DeleteGatewayResponse.go index c44ecb7532a..5a5a81062c1 100644 --- a/service/apigateway/api_op_DeleteGatewayResponse.go +++ b/service/apigateway/api_op_DeleteGatewayResponse.go @@ -103,6 +103,9 @@ func addOperationDeleteGatewayResponseMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationDeleteGatewayResponseMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteIntegration.go b/service/apigateway/api_op_DeleteIntegration.go index 8cfc92d46ca..b7deeaa4c5d 100644 --- a/service/apigateway/api_op_DeleteIntegration.go +++ b/service/apigateway/api_op_DeleteIntegration.go @@ -59,6 +59,9 @@ func addOperationDeleteIntegrationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteIntegrationMiddlewares(stack *middleware.Stack, options O if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteIntegrationResponse.go b/service/apigateway/api_op_DeleteIntegrationResponse.go index 03e986a094c..ad42690fbb4 100644 --- a/service/apigateway/api_op_DeleteIntegrationResponse.go +++ b/service/apigateway/api_op_DeleteIntegrationResponse.go @@ -65,6 +65,9 @@ func addOperationDeleteIntegrationResponseMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteIntegrationResponseMiddlewares(stack *middleware.Stack, o if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteMethod.go b/service/apigateway/api_op_DeleteMethod.go index 6e3ded7319c..c5783138231 100644 --- a/service/apigateway/api_op_DeleteMethod.go +++ b/service/apigateway/api_op_DeleteMethod.go @@ -59,6 +59,9 @@ func addOperationDeleteMethodMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteMethodMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteMethodResponse.go b/service/apigateway/api_op_DeleteMethodResponse.go index aa9a9d1f8a6..52a111ef29a 100644 --- a/service/apigateway/api_op_DeleteMethodResponse.go +++ b/service/apigateway/api_op_DeleteMethodResponse.go @@ -64,6 +64,9 @@ func addOperationDeleteMethodResponseMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteMethodResponseMiddlewares(stack *middleware.Stack, option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteModel.go b/service/apigateway/api_op_DeleteModel.go index d65b0092840..1c32ce9136c 100644 --- a/service/apigateway/api_op_DeleteModel.go +++ b/service/apigateway/api_op_DeleteModel.go @@ -54,6 +54,9 @@ func addOperationDeleteModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteModelMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteRequestValidator.go b/service/apigateway/api_op_DeleteRequestValidator.go index c3bedbf515d..ca085594de6 100644 --- a/service/apigateway/api_op_DeleteRequestValidator.go +++ b/service/apigateway/api_op_DeleteRequestValidator.go @@ -54,6 +54,9 @@ func addOperationDeleteRequestValidatorMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteRequestValidatorMiddlewares(stack *middleware.Stack, opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteResource.go b/service/apigateway/api_op_DeleteResource.go index 5143d5ca0b0..3d160c13305 100644 --- a/service/apigateway/api_op_DeleteResource.go +++ b/service/apigateway/api_op_DeleteResource.go @@ -54,6 +54,9 @@ func addOperationDeleteResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteResourceMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteRestApi.go b/service/apigateway/api_op_DeleteRestApi.go index 7a7f93087a7..8719d9ce98a 100644 --- a/service/apigateway/api_op_DeleteRestApi.go +++ b/service/apigateway/api_op_DeleteRestApi.go @@ -49,6 +49,9 @@ func addOperationDeleteRestApiMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteRestApiMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteStage.go b/service/apigateway/api_op_DeleteStage.go index 246680aaeb5..734b6550082 100644 --- a/service/apigateway/api_op_DeleteStage.go +++ b/service/apigateway/api_op_DeleteStage.go @@ -54,6 +54,9 @@ func addOperationDeleteStageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteStageMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteUsagePlan.go b/service/apigateway/api_op_DeleteUsagePlan.go index 9d889e043a9..707db7ac7f6 100644 --- a/service/apigateway/api_op_DeleteUsagePlan.go +++ b/service/apigateway/api_op_DeleteUsagePlan.go @@ -49,6 +49,9 @@ func addOperationDeleteUsagePlanMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteUsagePlanMiddlewares(stack *middleware.Stack, options Opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteUsagePlanKey.go b/service/apigateway/api_op_DeleteUsagePlanKey.go index ebb9d23b7ba..95677790a6a 100644 --- a/service/apigateway/api_op_DeleteUsagePlanKey.go +++ b/service/apigateway/api_op_DeleteUsagePlanKey.go @@ -57,6 +57,9 @@ func addOperationDeleteUsagePlanKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteUsagePlanKeyMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_DeleteVpcLink.go b/service/apigateway/api_op_DeleteVpcLink.go index dadff41ed39..6b3d688ce06 100644 --- a/service/apigateway/api_op_DeleteVpcLink.go +++ b/service/apigateway/api_op_DeleteVpcLink.go @@ -50,6 +50,9 @@ func addOperationDeleteVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_FlushStageAuthorizersCache.go b/service/apigateway/api_op_FlushStageAuthorizersCache.go index 592c8176b77..8d4917057c5 100644 --- a/service/apigateway/api_op_FlushStageAuthorizersCache.go +++ b/service/apigateway/api_op_FlushStageAuthorizersCache.go @@ -54,6 +54,9 @@ func addOperationFlushStageAuthorizersCacheMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationFlushStageAuthorizersCacheMiddlewares(stack *middleware.Stack, if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_FlushStageCache.go b/service/apigateway/api_op_FlushStageCache.go index eb5b3521094..b24cd26d749 100644 --- a/service/apigateway/api_op_FlushStageCache.go +++ b/service/apigateway/api_op_FlushStageCache.go @@ -54,6 +54,9 @@ func addOperationFlushStageCacheMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationFlushStageCacheMiddlewares(stack *middleware.Stack, options Opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GenerateClientCertificate.go b/service/apigateway/api_op_GenerateClientCertificate.go index cf65d1065cc..e8474fa48be 100644 --- a/service/apigateway/api_op_GenerateClientCertificate.go +++ b/service/apigateway/api_op_GenerateClientCertificate.go @@ -79,6 +79,9 @@ func addOperationGenerateClientCertificateMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGenerateClientCertificateMiddlewares(stack *middleware.Stack, o if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetAccount.go b/service/apigateway/api_op_GetAccount.go index e1c24eae57a..8c5ee904b09 100644 --- a/service/apigateway/api_op_GetAccount.go +++ b/service/apigateway/api_op_GetAccount.go @@ -105,6 +105,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetApiKey.go b/service/apigateway/api_op_GetApiKey.go index 566f2f1598f..43502e1174a 100644 --- a/service/apigateway/api_op_GetApiKey.go +++ b/service/apigateway/api_op_GetApiKey.go @@ -91,6 +91,9 @@ func addOperationGetApiKeyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationGetApiKeyMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetApiKeys.go b/service/apigateway/api_op_GetApiKeys.go index 1ff7c8f7f66..2e72b5df267 100644 --- a/service/apigateway/api_op_GetApiKeys.go +++ b/service/apigateway/api_op_GetApiKeys.go @@ -77,6 +77,9 @@ func addOperationGetApiKeysMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetApiKeysMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetAuthorizer.go b/service/apigateway/api_op_GetAuthorizer.go index da039607dc3..f18ce5e19bd 100644 --- a/service/apigateway/api_op_GetAuthorizer.go +++ b/service/apigateway/api_op_GetAuthorizer.go @@ -142,6 +142,9 @@ func addOperationGetAuthorizerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationGetAuthorizerMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetAuthorizers.go b/service/apigateway/api_op_GetAuthorizers.go index 8b4eb690b45..f95d0b12c0b 100644 --- a/service/apigateway/api_op_GetAuthorizers.go +++ b/service/apigateway/api_op_GetAuthorizers.go @@ -70,6 +70,9 @@ func addOperationGetAuthorizersMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetAuthorizersMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetBasePathMapping.go b/service/apigateway/api_op_GetBasePathMapping.go index b4893dab872..2dd4dcfc896 100644 --- a/service/apigateway/api_op_GetBasePathMapping.go +++ b/service/apigateway/api_op_GetBasePathMapping.go @@ -73,6 +73,9 @@ func addOperationGetBasePathMappingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetBasePathMappingMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetBasePathMappings.go b/service/apigateway/api_op_GetBasePathMappings.go index 4261a5f4fca..ef0db2e91b9 100644 --- a/service/apigateway/api_op_GetBasePathMappings.go +++ b/service/apigateway/api_op_GetBasePathMappings.go @@ -66,6 +66,9 @@ func addOperationGetBasePathMappingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetBasePathMappingsMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetClientCertificate.go b/service/apigateway/api_op_GetClientCertificate.go index 69b91fdce99..d6122b74fdc 100644 --- a/service/apigateway/api_op_GetClientCertificate.go +++ b/service/apigateway/api_op_GetClientCertificate.go @@ -76,6 +76,9 @@ func addOperationGetClientCertificateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetClientCertificateMiddlewares(stack *middleware.Stack, option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetClientCertificates.go b/service/apigateway/api_op_GetClientCertificates.go index e5203dbb31d..65303a74980 100644 --- a/service/apigateway/api_op_GetClientCertificates.go +++ b/service/apigateway/api_op_GetClientCertificates.go @@ -62,6 +62,9 @@ func addOperationGetClientCertificatesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetClientCertificatesMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDeployment.go b/service/apigateway/api_op_GetDeployment.go index 38a3dfd1abf..61b90dd084f 100644 --- a/service/apigateway/api_op_GetDeployment.go +++ b/service/apigateway/api_op_GetDeployment.go @@ -90,6 +90,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDeployments.go b/service/apigateway/api_op_GetDeployments.go index c572add7054..358acb2932a 100644 --- a/service/apigateway/api_op_GetDeployments.go +++ b/service/apigateway/api_op_GetDeployments.go @@ -75,6 +75,9 @@ func addOperationGetDeploymentsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetDeploymentsMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDocumentationPart.go b/service/apigateway/api_op_GetDocumentationPart.go index 2b19b2fdab8..2ab8885f915 100644 --- a/service/apigateway/api_op_GetDocumentationPart.go +++ b/service/apigateway/api_op_GetDocumentationPart.go @@ -86,6 +86,9 @@ func addOperationGetDocumentationPartMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetDocumentationPartMiddlewares(stack *middleware.Stack, option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDocumentationParts.go b/service/apigateway/api_op_GetDocumentationParts.go index debcc7b03b6..526ae7af9ee 100644 --- a/service/apigateway/api_op_GetDocumentationParts.go +++ b/service/apigateway/api_op_GetDocumentationParts.go @@ -81,6 +81,9 @@ func addOperationGetDocumentationPartsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetDocumentationPartsMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDocumentationVersion.go b/service/apigateway/api_op_GetDocumentationVersion.go index c721d07b5fb..287303c4fd1 100644 --- a/service/apigateway/api_op_GetDocumentationVersion.go +++ b/service/apigateway/api_op_GetDocumentationVersion.go @@ -69,6 +69,9 @@ func addOperationGetDocumentationVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetDocumentationVersionMiddlewares(stack *middleware.Stack, opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDocumentationVersions.go b/service/apigateway/api_op_GetDocumentationVersions.go index 844b1fa8337..d5dff129191 100644 --- a/service/apigateway/api_op_GetDocumentationVersions.go +++ b/service/apigateway/api_op_GetDocumentationVersions.go @@ -68,6 +68,9 @@ func addOperationGetDocumentationVersionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetDocumentationVersionsMiddlewares(stack *middleware.Stack, op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDomainName.go b/service/apigateway/api_op_GetDomainName.go index 69c2e34e244..74145d5057d 100644 --- a/service/apigateway/api_op_GetDomainName.go +++ b/service/apigateway/api_op_GetDomainName.go @@ -142,6 +142,9 @@ func addOperationGetDomainNameMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationGetDomainNameMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetDomainNames.go b/service/apigateway/api_op_GetDomainNames.go index af1c476b8c7..03f1089fc93 100644 --- a/service/apigateway/api_op_GetDomainNames.go +++ b/service/apigateway/api_op_GetDomainNames.go @@ -61,6 +61,9 @@ func addOperationGetDomainNamesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetDomainNamesMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetExport.go b/service/apigateway/api_op_GetExport.go index dff6f797210..4acfb3cfb5f 100644 --- a/service/apigateway/api_op_GetExport.go +++ b/service/apigateway/api_op_GetExport.go @@ -86,6 +86,9 @@ func addOperationGetExportMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetExportMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetGatewayResponse.go b/service/apigateway/api_op_GetGatewayResponse.go index 3f7667da78d..d06c0829781 100644 --- a/service/apigateway/api_op_GetGatewayResponse.go +++ b/service/apigateway/api_op_GetGatewayResponse.go @@ -212,6 +212,9 @@ func addOperationGetGatewayResponseMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -257,6 +260,9 @@ func addOperationGetGatewayResponseMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetGatewayResponses.go b/service/apigateway/api_op_GetGatewayResponses.go index 683a02e6529..7412ab15582 100644 --- a/service/apigateway/api_op_GetGatewayResponses.go +++ b/service/apigateway/api_op_GetGatewayResponses.go @@ -286,6 +286,9 @@ func addOperationGetGatewayResponsesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -331,6 +334,9 @@ func addOperationGetGatewayResponsesMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetIntegration.go b/service/apigateway/api_op_GetIntegration.go index d30cefbf077..314a9fff404 100644 --- a/service/apigateway/api_op_GetIntegration.go +++ b/service/apigateway/api_op_GetIntegration.go @@ -256,6 +256,9 @@ func addOperationGetIntegrationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -301,6 +304,9 @@ func addOperationGetIntegrationMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetIntegrationResponse.go b/service/apigateway/api_op_GetIntegrationResponse.go index dea3c53f25f..a4cec078f83 100644 --- a/service/apigateway/api_op_GetIntegrationResponse.go +++ b/service/apigateway/api_op_GetIntegrationResponse.go @@ -116,6 +116,9 @@ func addOperationGetIntegrationResponseMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationGetIntegrationResponseMiddlewares(stack *middleware.Stack, opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetMethod.go b/service/apigateway/api_op_GetMethod.go index 55d59d53618..52fd498ee7c 100644 --- a/service/apigateway/api_op_GetMethod.go +++ b/service/apigateway/api_op_GetMethod.go @@ -290,6 +290,9 @@ func addOperationGetMethodMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -335,6 +338,9 @@ func addOperationGetMethodMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetMethodResponse.go b/service/apigateway/api_op_GetMethodResponse.go index 29957996e42..56fe921be40 100644 --- a/service/apigateway/api_op_GetMethodResponse.go +++ b/service/apigateway/api_op_GetMethodResponse.go @@ -119,6 +119,9 @@ func addOperationGetMethodResponseMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationGetMethodResponseMiddlewares(stack *middleware.Stack, options O if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetModel.go b/service/apigateway/api_op_GetModel.go index b02b2fd7536..58953dce023 100644 --- a/service/apigateway/api_op_GetModel.go +++ b/service/apigateway/api_op_GetModel.go @@ -88,6 +88,9 @@ func addOperationGetModelMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetModelMiddlewares(stack *middleware.Stack, options Options) ( if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetModelTemplate.go b/service/apigateway/api_op_GetModelTemplate.go index de374d4a72f..1e8ec6e0061 100644 --- a/service/apigateway/api_op_GetModelTemplate.go +++ b/service/apigateway/api_op_GetModelTemplate.go @@ -63,6 +63,9 @@ func addOperationGetModelTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetModelTemplateMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetModels.go b/service/apigateway/api_op_GetModels.go index 58f1e681482..270560d0f48 100644 --- a/service/apigateway/api_op_GetModels.go +++ b/service/apigateway/api_op_GetModels.go @@ -67,6 +67,9 @@ func addOperationGetModelsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetModelsMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetRequestValidator.go b/service/apigateway/api_op_GetRequestValidator.go index 97a9e9131f5..12d3e979c32 100644 --- a/service/apigateway/api_op_GetRequestValidator.go +++ b/service/apigateway/api_op_GetRequestValidator.go @@ -77,6 +77,9 @@ func addOperationGetRequestValidatorMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetRequestValidatorMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetRequestValidators.go b/service/apigateway/api_op_GetRequestValidators.go index 38e3a9835db..a7c58d67d02 100644 --- a/service/apigateway/api_op_GetRequestValidators.go +++ b/service/apigateway/api_op_GetRequestValidators.go @@ -70,6 +70,9 @@ func addOperationGetRequestValidatorsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetRequestValidatorsMiddlewares(stack *middleware.Stack, option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetResource.go b/service/apigateway/api_op_GetResource.go index fe34ac08bac..fae0dae9806 100644 --- a/service/apigateway/api_op_GetResource.go +++ b/service/apigateway/api_op_GetResource.go @@ -159,6 +159,9 @@ func addOperationGetResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationGetResourceMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetResources.go b/service/apigateway/api_op_GetResources.go index ef96dbf1fff..a857d5f84bc 100644 --- a/service/apigateway/api_op_GetResources.go +++ b/service/apigateway/api_op_GetResources.go @@ -74,6 +74,9 @@ func addOperationGetResourcesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetResourcesMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetRestApi.go b/service/apigateway/api_op_GetRestApi.go index 608bdcc0666..843c4187dd5 100644 --- a/service/apigateway/api_op_GetRestApi.go +++ b/service/apigateway/api_op_GetRestApi.go @@ -113,6 +113,9 @@ func addOperationGetRestApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationGetRestApiMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetRestApis.go b/service/apigateway/api_op_GetRestApis.go index 215899f532a..a34999ad27b 100644 --- a/service/apigateway/api_op_GetRestApis.go +++ b/service/apigateway/api_op_GetRestApis.go @@ -63,6 +63,9 @@ func addOperationGetRestApisMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetRestApisMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetSdk.go b/service/apigateway/api_op_GetSdk.go index 02920f1dbe5..6461e816d86 100644 --- a/service/apigateway/api_op_GetSdk.go +++ b/service/apigateway/api_op_GetSdk.go @@ -78,6 +78,9 @@ func addOperationGetSdkMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetSdkMiddlewares(stack *middleware.Stack, options Options) (er if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetSdkType.go b/service/apigateway/api_op_GetSdkType.go index 8c95d99cdb5..281efd38c22 100644 --- a/service/apigateway/api_op_GetSdkType.go +++ b/service/apigateway/api_op_GetSdkType.go @@ -63,6 +63,9 @@ func addOperationGetSdkTypeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetSdkTypeMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetSdkTypes.go b/service/apigateway/api_op_GetSdkTypes.go index ffd00626d86..07b055e6c31 100644 --- a/service/apigateway/api_op_GetSdkTypes.go +++ b/service/apigateway/api_op_GetSdkTypes.go @@ -56,6 +56,9 @@ func addOperationGetSdkTypesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetSdkTypesMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetStage.go b/service/apigateway/api_op_GetStage.go index 2fb223c9aab..fcf97d6e735 100644 --- a/service/apigateway/api_op_GetStage.go +++ b/service/apigateway/api_op_GetStage.go @@ -119,6 +119,9 @@ func addOperationGetStageMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationGetStageMiddlewares(stack *middleware.Stack, options Options) ( if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetStages.go b/service/apigateway/api_op_GetStages.go index b781990dd36..49c09b9eed9 100644 --- a/service/apigateway/api_op_GetStages.go +++ b/service/apigateway/api_op_GetStages.go @@ -60,6 +60,9 @@ func addOperationGetStagesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetStagesMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetTags.go b/service/apigateway/api_op_GetTags.go index 5c3b5028ff7..b1bb433f38b 100644 --- a/service/apigateway/api_op_GetTags.go +++ b/service/apigateway/api_op_GetTags.go @@ -62,6 +62,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetUsage.go b/service/apigateway/api_op_GetUsage.go index 35556c479b1..dd78bc750f1 100644 --- a/service/apigateway/api_op_GetUsage.go +++ b/service/apigateway/api_op_GetUsage.go @@ -94,6 +94,9 @@ func addOperationGetUsageMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetUsageMiddlewares(stack *middleware.Stack, options Options) ( if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetUsagePlan.go b/service/apigateway/api_op_GetUsagePlan.go index 8e4a422290b..6d0763935fb 100644 --- a/service/apigateway/api_op_GetUsagePlan.go +++ b/service/apigateway/api_op_GetUsagePlan.go @@ -81,6 +81,9 @@ func addOperationGetUsagePlanMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetUsagePlanMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetUsagePlanKey.go b/service/apigateway/api_op_GetUsagePlanKey.go index 43edd64c0ec..7f702f071a5 100644 --- a/service/apigateway/api_op_GetUsagePlanKey.go +++ b/service/apigateway/api_op_GetUsagePlanKey.go @@ -74,6 +74,9 @@ func addOperationGetUsagePlanKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetUsagePlanKeyMiddlewares(stack *middleware.Stack, options Opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetUsagePlanKeys.go b/service/apigateway/api_op_GetUsagePlanKeys.go index d06b3a5ad93..678164be1e9 100644 --- a/service/apigateway/api_op_GetUsagePlanKeys.go +++ b/service/apigateway/api_op_GetUsagePlanKeys.go @@ -75,6 +75,9 @@ func addOperationGetUsagePlanKeysMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetUsagePlanKeysMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetUsagePlans.go b/service/apigateway/api_op_GetUsagePlans.go index 378ca05d71d..48bfa2a6461 100644 --- a/service/apigateway/api_op_GetUsagePlans.go +++ b/service/apigateway/api_op_GetUsagePlans.go @@ -65,6 +65,9 @@ func addOperationGetUsagePlansMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetUsagePlansMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetVpcLink.go b/service/apigateway/api_op_GetVpcLink.go index b404e87d210..4b2626de666 100644 --- a/service/apigateway/api_op_GetVpcLink.go +++ b/service/apigateway/api_op_GetVpcLink.go @@ -85,6 +85,9 @@ func addOperationGetVpcLinkMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetVpcLinkMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_GetVpcLinks.go b/service/apigateway/api_op_GetVpcLinks.go index 1309a01fcbe..90858a7ef27 100644 --- a/service/apigateway/api_op_GetVpcLinks.go +++ b/service/apigateway/api_op_GetVpcLinks.go @@ -64,6 +64,9 @@ func addOperationGetVpcLinksMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetVpcLinksMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_ImportApiKeys.go b/service/apigateway/api_op_ImportApiKeys.go index 87321c793a0..7bab17319e7 100644 --- a/service/apigateway/api_op_ImportApiKeys.go +++ b/service/apigateway/api_op_ImportApiKeys.go @@ -64,6 +64,9 @@ func addOperationImportApiKeysMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationImportApiKeysMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_ImportDocumentationParts.go b/service/apigateway/api_op_ImportDocumentationParts.go index 2106ca90d27..1ef17d39887 100644 --- a/service/apigateway/api_op_ImportDocumentationParts.go +++ b/service/apigateway/api_op_ImportDocumentationParts.go @@ -72,6 +72,9 @@ func addOperationImportDocumentationPartsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationImportDocumentationPartsMiddlewares(stack *middleware.Stack, op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_ImportRestApi.go b/service/apigateway/api_op_ImportRestApi.go index 84a1b589353..17aba6d6eb2 100644 --- a/service/apigateway/api_op_ImportRestApi.go +++ b/service/apigateway/api_op_ImportRestApi.go @@ -130,6 +130,9 @@ func addOperationImportRestApiMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationImportRestApiMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_PutGatewayResponse.go b/service/apigateway/api_op_PutGatewayResponse.go index 5ae3e8bf830..d3fa846802c 100644 --- a/service/apigateway/api_op_PutGatewayResponse.go +++ b/service/apigateway/api_op_PutGatewayResponse.go @@ -225,6 +225,9 @@ func addOperationPutGatewayResponseMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -270,6 +273,9 @@ func addOperationPutGatewayResponseMiddlewares(stack *middleware.Stack, options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_PutIntegration.go b/service/apigateway/api_op_PutIntegration.go index e197dcc4f55..1260212d4be 100644 --- a/service/apigateway/api_op_PutIntegration.go +++ b/service/apigateway/api_op_PutIntegration.go @@ -373,6 +373,9 @@ func addOperationPutIntegrationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -418,6 +421,9 @@ func addOperationPutIntegrationMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_PutIntegrationResponse.go b/service/apigateway/api_op_PutIntegrationResponse.go index ff1ba3ef4b1..8fd81ed0f7d 100644 --- a/service/apigateway/api_op_PutIntegrationResponse.go +++ b/service/apigateway/api_op_PutIntegrationResponse.go @@ -151,6 +151,9 @@ func addOperationPutIntegrationResponseMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -196,6 +199,9 @@ func addOperationPutIntegrationResponseMiddlewares(stack *middleware.Stack, opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_PutMethod.go b/service/apigateway/api_op_PutMethod.go index ae085159818..d8e7f67e17e 100644 --- a/service/apigateway/api_op_PutMethod.go +++ b/service/apigateway/api_op_PutMethod.go @@ -338,6 +338,9 @@ func addOperationPutMethodMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -383,6 +386,9 @@ func addOperationPutMethodMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_PutMethodResponse.go b/service/apigateway/api_op_PutMethodResponse.go index fbe4c7acd03..75e9daea72e 100644 --- a/service/apigateway/api_op_PutMethodResponse.go +++ b/service/apigateway/api_op_PutMethodResponse.go @@ -138,6 +138,9 @@ func addOperationPutMethodResponseMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationPutMethodResponseMiddlewares(stack *middleware.Stack, options O if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_PutRestApi.go b/service/apigateway/api_op_PutRestApi.go index f7d92675ac8..fab9722dbfb 100644 --- a/service/apigateway/api_op_PutRestApi.go +++ b/service/apigateway/api_op_PutRestApi.go @@ -131,6 +131,9 @@ func addOperationPutRestApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationPutRestApiMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_TagResource.go b/service/apigateway/api_op_TagResource.go index 01e9c804058..b6bdc217c0c 100644 --- a/service/apigateway/api_op_TagResource.go +++ b/service/apigateway/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_TestInvokeAuthorizer.go b/service/apigateway/api_op_TestInvokeAuthorizer.go index a08243aaefa..a529dd50f93 100644 --- a/service/apigateway/api_op_TestInvokeAuthorizer.go +++ b/service/apigateway/api_op_TestInvokeAuthorizer.go @@ -107,6 +107,9 @@ func addOperationTestInvokeAuthorizerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationTestInvokeAuthorizerMiddlewares(stack *middleware.Stack, option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_TestInvokeMethod.go b/service/apigateway/api_op_TestInvokeMethod.go index 49492f281b5..482a41a7492 100644 --- a/service/apigateway/api_op_TestInvokeMethod.go +++ b/service/apigateway/api_op_TestInvokeMethod.go @@ -105,6 +105,9 @@ func addOperationTestInvokeMethodMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationTestInvokeMethodMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UntagResource.go b/service/apigateway/api_op_UntagResource.go index 509204097b0..c351d824dd7 100644 --- a/service/apigateway/api_op_UntagResource.go +++ b/service/apigateway/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateAccount.go b/service/apigateway/api_op_UpdateAccount.go index ea7a9822d92..704e102131f 100644 --- a/service/apigateway/api_op_UpdateAccount.go +++ b/service/apigateway/api_op_UpdateAccount.go @@ -109,6 +109,9 @@ func addOperationUpdateAccountMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationUpdateAccountMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateApiKey.go b/service/apigateway/api_op_UpdateApiKey.go index b74fb5ff847..5cdb11f4fed 100644 --- a/service/apigateway/api_op_UpdateApiKey.go +++ b/service/apigateway/api_op_UpdateApiKey.go @@ -92,6 +92,9 @@ func addOperationUpdateApiKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdateApiKeyMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateAuthorizer.go b/service/apigateway/api_op_UpdateAuthorizer.go index 567c4b6f2ac..95f87e2e95f 100644 --- a/service/apigateway/api_op_UpdateAuthorizer.go +++ b/service/apigateway/api_op_UpdateAuthorizer.go @@ -146,6 +146,9 @@ func addOperationUpdateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationUpdateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateBasePathMapping.go b/service/apigateway/api_op_UpdateBasePathMapping.go index 1ddcc695aec..df99a6da91b 100644 --- a/service/apigateway/api_op_UpdateBasePathMapping.go +++ b/service/apigateway/api_op_UpdateBasePathMapping.go @@ -76,6 +76,9 @@ func addOperationUpdateBasePathMappingMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateBasePathMappingMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateClientCertificate.go b/service/apigateway/api_op_UpdateClientCertificate.go index 834a5a0c1ec..3efd63ac0bd 100644 --- a/service/apigateway/api_op_UpdateClientCertificate.go +++ b/service/apigateway/api_op_UpdateClientCertificate.go @@ -81,6 +81,9 @@ func addOperationUpdateClientCertificateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateClientCertificateMiddlewares(stack *middleware.Stack, opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateDeployment.go b/service/apigateway/api_op_UpdateDeployment.go index 0f86540e631..ffc438d26e0 100644 --- a/service/apigateway/api_op_UpdateDeployment.go +++ b/service/apigateway/api_op_UpdateDeployment.go @@ -84,6 +84,9 @@ func addOperationUpdateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationUpdateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateDocumentationPart.go b/service/apigateway/api_op_UpdateDocumentationPart.go index 118dc8daf7d..7fa45a6ca3f 100644 --- a/service/apigateway/api_op_UpdateDocumentationPart.go +++ b/service/apigateway/api_op_UpdateDocumentationPart.go @@ -90,6 +90,9 @@ func addOperationUpdateDocumentationPartMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationUpdateDocumentationPartMiddlewares(stack *middleware.Stack, opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateDocumentationVersion.go b/service/apigateway/api_op_UpdateDocumentationVersion.go index 02eaf963c0d..298c5d8b5e2 100644 --- a/service/apigateway/api_op_UpdateDocumentationVersion.go +++ b/service/apigateway/api_op_UpdateDocumentationVersion.go @@ -74,6 +74,9 @@ func addOperationUpdateDocumentationVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateDocumentationVersionMiddlewares(stack *middleware.Stack, if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateDomainName.go b/service/apigateway/api_op_UpdateDomainName.go index 6fd8e5903ef..76e82323892 100644 --- a/service/apigateway/api_op_UpdateDomainName.go +++ b/service/apigateway/api_op_UpdateDomainName.go @@ -145,6 +145,9 @@ func addOperationUpdateDomainNameMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationUpdateDomainNameMiddlewares(stack *middleware.Stack, options Op if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateGatewayResponse.go b/service/apigateway/api_op_UpdateGatewayResponse.go index 8fd4c764a47..420982e692b 100644 --- a/service/apigateway/api_op_UpdateGatewayResponse.go +++ b/service/apigateway/api_op_UpdateGatewayResponse.go @@ -216,6 +216,9 @@ func addOperationUpdateGatewayResponseMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -261,6 +264,9 @@ func addOperationUpdateGatewayResponseMiddlewares(stack *middleware.Stack, optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateIntegration.go b/service/apigateway/api_op_UpdateIntegration.go index bc4c4b041df..517bcdc0940 100644 --- a/service/apigateway/api_op_UpdateIntegration.go +++ b/service/apigateway/api_op_UpdateIntegration.go @@ -260,6 +260,9 @@ func addOperationUpdateIntegrationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -305,6 +308,9 @@ func addOperationUpdateIntegrationMiddlewares(stack *middleware.Stack, options O if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateIntegrationResponse.go b/service/apigateway/api_op_UpdateIntegrationResponse.go index 28415462487..33ffa48c57f 100644 --- a/service/apigateway/api_op_UpdateIntegrationResponse.go +++ b/service/apigateway/api_op_UpdateIntegrationResponse.go @@ -121,6 +121,9 @@ func addOperationUpdateIntegrationResponseMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateIntegrationResponseMiddlewares(stack *middleware.Stack, o if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateMethod.go b/service/apigateway/api_op_UpdateMethod.go index b08283d0309..46510ea74c3 100644 --- a/service/apigateway/api_op_UpdateMethod.go +++ b/service/apigateway/api_op_UpdateMethod.go @@ -294,6 +294,9 @@ func addOperationUpdateMethodMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -339,6 +342,9 @@ func addOperationUpdateMethodMiddlewares(stack *middleware.Stack, options Option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateMethodResponse.go b/service/apigateway/api_op_UpdateMethodResponse.go index d91b002744e..bd59e42d2c0 100644 --- a/service/apigateway/api_op_UpdateMethodResponse.go +++ b/service/apigateway/api_op_UpdateMethodResponse.go @@ -124,6 +124,9 @@ func addOperationUpdateMethodResponseMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationUpdateMethodResponseMiddlewares(stack *middleware.Stack, option if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateModel.go b/service/apigateway/api_op_UpdateModel.go index b60dacc7d61..694093fb7c4 100644 --- a/service/apigateway/api_op_UpdateModel.go +++ b/service/apigateway/api_op_UpdateModel.go @@ -88,6 +88,9 @@ func addOperationUpdateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationUpdateModelMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateRequestValidator.go b/service/apigateway/api_op_UpdateRequestValidator.go index f8e3efb53ee..2284610b15c 100644 --- a/service/apigateway/api_op_UpdateRequestValidator.go +++ b/service/apigateway/api_op_UpdateRequestValidator.go @@ -82,6 +82,9 @@ func addOperationUpdateRequestValidatorMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationUpdateRequestValidatorMiddlewares(stack *middleware.Stack, opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateResource.go b/service/apigateway/api_op_UpdateResource.go index 35c0771b13c..4fade20f56b 100644 --- a/service/apigateway/api_op_UpdateResource.go +++ b/service/apigateway/api_op_UpdateResource.go @@ -155,6 +155,9 @@ func addOperationUpdateResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationUpdateResourceMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateRestApi.go b/service/apigateway/api_op_UpdateRestApi.go index 8e4c88bcfb9..bc3ec8afaef 100644 --- a/service/apigateway/api_op_UpdateRestApi.go +++ b/service/apigateway/api_op_UpdateRestApi.go @@ -117,6 +117,9 @@ func addOperationUpdateRestApiMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationUpdateRestApiMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateStage.go b/service/apigateway/api_op_UpdateStage.go index 38635a1df0d..2473d993979 100644 --- a/service/apigateway/api_op_UpdateStage.go +++ b/service/apigateway/api_op_UpdateStage.go @@ -123,6 +123,9 @@ func addOperationUpdateStageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationUpdateStageMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateUsage.go b/service/apigateway/api_op_UpdateUsage.go index f78184d9134..7c1ab2fe8d4 100644 --- a/service/apigateway/api_op_UpdateUsage.go +++ b/service/apigateway/api_op_UpdateUsage.go @@ -86,6 +86,9 @@ func addOperationUpdateUsageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationUpdateUsageMiddlewares(stack *middleware.Stack, options Options if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateUsagePlan.go b/service/apigateway/api_op_UpdateUsagePlan.go index c9d1b4b714a..5dd25e96f34 100644 --- a/service/apigateway/api_op_UpdateUsagePlan.go +++ b/service/apigateway/api_op_UpdateUsagePlan.go @@ -85,6 +85,9 @@ func addOperationUpdateUsagePlanMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationUpdateUsagePlanMiddlewares(stack *middleware.Stack, options Opt if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/api_op_UpdateVpcLink.go b/service/apigateway/api_op_UpdateVpcLink.go index 8cee3d85448..b7ca07114cc 100644 --- a/service/apigateway/api_op_UpdateVpcLink.go +++ b/service/apigateway/api_op_UpdateVpcLink.go @@ -89,6 +89,9 @@ func addOperationUpdateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptHeader(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigateway/go.mod b/service/apigateway/go.mod index e16190893fb..19c88c44463 100644 --- a/service/apigateway/go.mod +++ b/service/apigateway/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/apigateway go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigateway/go.sum b/service/apigateway/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/apigateway/go.sum +++ b/service/apigateway/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/apigatewaymanagementapi/api_client.go b/service/apigatewaymanagementapi/api_client.go index 43cd5a9cc4b..1a301e6a51e 100644 --- a/service/apigatewaymanagementapi/api_client.go +++ b/service/apigatewaymanagementapi/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/apigatewaymanagementapi/api_op_DeleteConnection.go b/service/apigatewaymanagementapi/api_op_DeleteConnection.go index 9e58c9fe881..7afa9eb3284 100644 --- a/service/apigatewaymanagementapi/api_op_DeleteConnection.go +++ b/service/apigatewaymanagementapi/api_op_DeleteConnection.go @@ -44,6 +44,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewaymanagementapi/api_op_GetConnection.go b/service/apigatewaymanagementapi/api_op_GetConnection.go index f51b2fddd47..487f1394f9b 100644 --- a/service/apigatewaymanagementapi/api_op_GetConnection.go +++ b/service/apigatewaymanagementapi/api_op_GetConnection.go @@ -55,6 +55,9 @@ func addOperationGetConnectionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetConnectionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewaymanagementapi/api_op_PostToConnection.go b/service/apigatewaymanagementapi/api_op_PostToConnection.go index 1abc55a79df..6029866731d 100644 --- a/service/apigatewaymanagementapi/api_op_PostToConnection.go +++ b/service/apigatewaymanagementapi/api_op_PostToConnection.go @@ -53,6 +53,9 @@ func addOperationPostToConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationPostToConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewaymanagementapi/go.mod b/service/apigatewaymanagementapi/go.mod index 451fac22224..4eef3eebf7d 100644 --- a/service/apigatewaymanagementapi/go.mod +++ b/service/apigatewaymanagementapi/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/apigatewaymanagementapi go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigatewaymanagementapi/go.sum b/service/apigatewaymanagementapi/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/apigatewaymanagementapi/go.sum +++ b/service/apigatewaymanagementapi/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/apigatewayv2/api_client.go b/service/apigatewayv2/api_client.go index d97c149fcc7..21c48e5acf6 100644 --- a/service/apigatewayv2/api_client.go +++ b/service/apigatewayv2/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/apigatewayv2/api_op_CreateApi.go b/service/apigatewayv2/api_op_CreateApi.go index d703e7cff7d..0d00368b129 100644 --- a/service/apigatewayv2/api_op_CreateApi.go +++ b/service/apigatewayv2/api_op_CreateApi.go @@ -182,6 +182,9 @@ func addOperationCreateApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -224,6 +227,9 @@ func addOperationCreateApiMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateApiMapping.go b/service/apigatewayv2/api_op_CreateApiMapping.go index adc71d764ca..d537f26a711 100644 --- a/service/apigatewayv2/api_op_CreateApiMapping.go +++ b/service/apigatewayv2/api_op_CreateApiMapping.go @@ -75,6 +75,9 @@ func addOperationCreateApiMappingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateApiMappingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateAuthorizer.go b/service/apigatewayv2/api_op_CreateAuthorizer.go index f5b423b3e63..700d55c276f 100644 --- a/service/apigatewayv2/api_op_CreateAuthorizer.go +++ b/service/apigatewayv2/api_op_CreateAuthorizer.go @@ -209,6 +209,9 @@ func addOperationCreateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -251,6 +254,9 @@ func addOperationCreateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateDeployment.go b/service/apigatewayv2/api_op_CreateDeployment.go index 1730c5ccb31..5938484e52b 100644 --- a/service/apigatewayv2/api_op_CreateDeployment.go +++ b/service/apigatewayv2/api_op_CreateDeployment.go @@ -76,6 +76,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateDomainName.go b/service/apigatewayv2/api_op_CreateDomainName.go index 961809b590e..79e0b6a7708 100644 --- a/service/apigatewayv2/api_op_CreateDomainName.go +++ b/service/apigatewayv2/api_op_CreateDomainName.go @@ -75,6 +75,9 @@ func addOperationCreateDomainNameMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateDomainNameMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateIntegration.go b/service/apigatewayv2/api_op_CreateIntegration.go index 7252bb59bd4..e834c16033d 100644 --- a/service/apigatewayv2/api_op_CreateIntegration.go +++ b/service/apigatewayv2/api_op_CreateIntegration.go @@ -300,6 +300,9 @@ func addOperationCreateIntegrationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -342,6 +345,9 @@ func addOperationCreateIntegrationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateIntegrationResponse.go b/service/apigatewayv2/api_op_CreateIntegrationResponse.go index b0a6f0b5f27..af14fb98e4e 100644 --- a/service/apigatewayv2/api_op_CreateIntegrationResponse.go +++ b/service/apigatewayv2/api_op_CreateIntegrationResponse.go @@ -129,6 +129,9 @@ func addOperationCreateIntegrationResponseMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationCreateIntegrationResponseMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateModel.go b/service/apigatewayv2/api_op_CreateModel.go index 648c6da5caf..a40f4da0096 100644 --- a/service/apigatewayv2/api_op_CreateModel.go +++ b/service/apigatewayv2/api_op_CreateModel.go @@ -83,6 +83,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateRoute.go b/service/apigatewayv2/api_op_CreateRoute.go index 6b52eab0b43..08a3853bde7 100644 --- a/service/apigatewayv2/api_op_CreateRoute.go +++ b/service/apigatewayv2/api_op_CreateRoute.go @@ -149,6 +149,9 @@ func addOperationCreateRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationCreateRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateRouteResponse.go b/service/apigatewayv2/api_op_CreateRouteResponse.go index f991160bc1a..903ddee29f3 100644 --- a/service/apigatewayv2/api_op_CreateRouteResponse.go +++ b/service/apigatewayv2/api_op_CreateRouteResponse.go @@ -87,6 +87,9 @@ func addOperationCreateRouteResponseMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateRouteResponseMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateStage.go b/service/apigatewayv2/api_op_CreateStage.go index 24999fd8428..dba6ca0ec36 100644 --- a/service/apigatewayv2/api_op_CreateStage.go +++ b/service/apigatewayv2/api_op_CreateStage.go @@ -138,6 +138,9 @@ func addOperationCreateStageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationCreateStageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_CreateVpcLink.go b/service/apigatewayv2/api_op_CreateVpcLink.go index da876b4d05b..3f774cce226 100644 --- a/service/apigatewayv2/api_op_CreateVpcLink.go +++ b/service/apigatewayv2/api_op_CreateVpcLink.go @@ -90,6 +90,9 @@ func addOperationCreateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteAccessLogSettings.go b/service/apigatewayv2/api_op_DeleteAccessLogSettings.go index 99f9e0d24e0..86fdda3a2d0 100644 --- a/service/apigatewayv2/api_op_DeleteAccessLogSettings.go +++ b/service/apigatewayv2/api_op_DeleteAccessLogSettings.go @@ -55,6 +55,9 @@ func addOperationDeleteAccessLogSettingsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteAccessLogSettingsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteApi.go b/service/apigatewayv2/api_op_DeleteApi.go index 60aab054079..c11c2ace9e6 100644 --- a/service/apigatewayv2/api_op_DeleteApi.go +++ b/service/apigatewayv2/api_op_DeleteApi.go @@ -48,6 +48,9 @@ func addOperationDeleteApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteApiMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteApiMapping.go b/service/apigatewayv2/api_op_DeleteApiMapping.go index f3676dae4b5..373510841b9 100644 --- a/service/apigatewayv2/api_op_DeleteApiMapping.go +++ b/service/apigatewayv2/api_op_DeleteApiMapping.go @@ -53,6 +53,9 @@ func addOperationDeleteApiMappingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteApiMappingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteAuthorizer.go b/service/apigatewayv2/api_op_DeleteAuthorizer.go index d2a7f175ebb..87ffc8074c9 100644 --- a/service/apigatewayv2/api_op_DeleteAuthorizer.go +++ b/service/apigatewayv2/api_op_DeleteAuthorizer.go @@ -53,6 +53,9 @@ func addOperationDeleteAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteCorsConfiguration.go b/service/apigatewayv2/api_op_DeleteCorsConfiguration.go index 91e58e2749b..29a8421b11f 100644 --- a/service/apigatewayv2/api_op_DeleteCorsConfiguration.go +++ b/service/apigatewayv2/api_op_DeleteCorsConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeleteCorsConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteCorsConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteDeployment.go b/service/apigatewayv2/api_op_DeleteDeployment.go index 8a707fba4c4..a22e87b782d 100644 --- a/service/apigatewayv2/api_op_DeleteDeployment.go +++ b/service/apigatewayv2/api_op_DeleteDeployment.go @@ -53,6 +53,9 @@ func addOperationDeleteDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteDomainName.go b/service/apigatewayv2/api_op_DeleteDomainName.go index 8740917d1f2..50e734fe763 100644 --- a/service/apigatewayv2/api_op_DeleteDomainName.go +++ b/service/apigatewayv2/api_op_DeleteDomainName.go @@ -48,6 +48,9 @@ func addOperationDeleteDomainNameMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDomainNameMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteIntegration.go b/service/apigatewayv2/api_op_DeleteIntegration.go index 3da40661b47..a22d6098fed 100644 --- a/service/apigatewayv2/api_op_DeleteIntegration.go +++ b/service/apigatewayv2/api_op_DeleteIntegration.go @@ -53,6 +53,9 @@ func addOperationDeleteIntegrationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteIntegrationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteIntegrationResponse.go b/service/apigatewayv2/api_op_DeleteIntegrationResponse.go index fdc89a81293..636c2e0da08 100644 --- a/service/apigatewayv2/api_op_DeleteIntegrationResponse.go +++ b/service/apigatewayv2/api_op_DeleteIntegrationResponse.go @@ -58,6 +58,9 @@ func addOperationDeleteIntegrationResponseMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteIntegrationResponseMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteModel.go b/service/apigatewayv2/api_op_DeleteModel.go index 96540d61c5a..7d42c7931bd 100644 --- a/service/apigatewayv2/api_op_DeleteModel.go +++ b/service/apigatewayv2/api_op_DeleteModel.go @@ -53,6 +53,9 @@ func addOperationDeleteModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteRoute.go b/service/apigatewayv2/api_op_DeleteRoute.go index e06851a79f9..c348adf91db 100644 --- a/service/apigatewayv2/api_op_DeleteRoute.go +++ b/service/apigatewayv2/api_op_DeleteRoute.go @@ -53,6 +53,9 @@ func addOperationDeleteRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go b/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go index 5bb79000630..2180c034cca 100644 --- a/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go +++ b/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go @@ -58,6 +58,9 @@ func addOperationDeleteRouteRequestParameterMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteRouteRequestParameterMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteRouteResponse.go b/service/apigatewayv2/api_op_DeleteRouteResponse.go index d5f88b7d11f..904b7f592bf 100644 --- a/service/apigatewayv2/api_op_DeleteRouteResponse.go +++ b/service/apigatewayv2/api_op_DeleteRouteResponse.go @@ -58,6 +58,9 @@ func addOperationDeleteRouteResponseMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteRouteResponseMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteRouteSettings.go b/service/apigatewayv2/api_op_DeleteRouteSettings.go index 3a421f758ff..374de1ca255 100644 --- a/service/apigatewayv2/api_op_DeleteRouteSettings.go +++ b/service/apigatewayv2/api_op_DeleteRouteSettings.go @@ -59,6 +59,9 @@ func addOperationDeleteRouteSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteRouteSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteStage.go b/service/apigatewayv2/api_op_DeleteStage.go index f780cc816a7..6e2ff97fd2e 100644 --- a/service/apigatewayv2/api_op_DeleteStage.go +++ b/service/apigatewayv2/api_op_DeleteStage.go @@ -54,6 +54,9 @@ func addOperationDeleteStageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteStageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_DeleteVpcLink.go b/service/apigatewayv2/api_op_DeleteVpcLink.go index c835b080243..2f528aaa2d3 100644 --- a/service/apigatewayv2/api_op_DeleteVpcLink.go +++ b/service/apigatewayv2/api_op_DeleteVpcLink.go @@ -48,6 +48,9 @@ func addOperationDeleteVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_ExportApi.go b/service/apigatewayv2/api_op_ExportApi.go index 00e8fdb27da..9a4d22aa60f 100644 --- a/service/apigatewayv2/api_op_ExportApi.go +++ b/service/apigatewayv2/api_op_ExportApi.go @@ -77,6 +77,9 @@ func addOperationExportApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationExportApiMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetApi.go b/service/apigatewayv2/api_op_GetApi.go index 4f6b638e401..762325def5e 100644 --- a/service/apigatewayv2/api_op_GetApi.go +++ b/service/apigatewayv2/api_op_GetApi.go @@ -116,6 +116,9 @@ func addOperationGetApiMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationGetApiMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetApiMapping.go b/service/apigatewayv2/api_op_GetApiMapping.go index 0c2bbc0153e..bd0063b358c 100644 --- a/service/apigatewayv2/api_op_GetApiMapping.go +++ b/service/apigatewayv2/api_op_GetApiMapping.go @@ -66,6 +66,9 @@ func addOperationGetApiMappingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetApiMappingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetApiMappings.go b/service/apigatewayv2/api_op_GetApiMappings.go index a5a460c0668..5c8710dd798 100644 --- a/service/apigatewayv2/api_op_GetApiMappings.go +++ b/service/apigatewayv2/api_op_GetApiMappings.go @@ -64,6 +64,9 @@ func addOperationGetApiMappingsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetApiMappingsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetApis.go b/service/apigatewayv2/api_op_GetApis.go index 6f96364de18..ee46f503ecd 100644 --- a/service/apigatewayv2/api_op_GetApis.go +++ b/service/apigatewayv2/api_op_GetApis.go @@ -59,6 +59,9 @@ func addOperationGetApisMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetApisMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetAuthorizer.go b/service/apigatewayv2/api_op_GetAuthorizer.go index 78810a00754..c65c9fcac2c 100644 --- a/service/apigatewayv2/api_op_GetAuthorizer.go +++ b/service/apigatewayv2/api_op_GetAuthorizer.go @@ -132,6 +132,9 @@ func addOperationGetAuthorizerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationGetAuthorizerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetAuthorizers.go b/service/apigatewayv2/api_op_GetAuthorizers.go index 82311cda1ec..956a922a7b7 100644 --- a/service/apigatewayv2/api_op_GetAuthorizers.go +++ b/service/apigatewayv2/api_op_GetAuthorizers.go @@ -64,6 +64,9 @@ func addOperationGetAuthorizersMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetAuthorizersMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetDeployment.go b/service/apigatewayv2/api_op_GetDeployment.go index ac080b6285d..8783e6a01bc 100644 --- a/service/apigatewayv2/api_op_GetDeployment.go +++ b/service/apigatewayv2/api_op_GetDeployment.go @@ -74,6 +74,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetDeployments.go b/service/apigatewayv2/api_op_GetDeployments.go index 82b98206344..2575e217bc2 100644 --- a/service/apigatewayv2/api_op_GetDeployments.go +++ b/service/apigatewayv2/api_op_GetDeployments.go @@ -64,6 +64,9 @@ func addOperationGetDeploymentsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetDeploymentsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetDomainName.go b/service/apigatewayv2/api_op_GetDomainName.go index f4a2a6d0f5b..2f5388b3bad 100644 --- a/service/apigatewayv2/api_op_GetDomainName.go +++ b/service/apigatewayv2/api_op_GetDomainName.go @@ -65,6 +65,9 @@ func addOperationGetDomainNameMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetDomainNameMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetDomainNames.go b/service/apigatewayv2/api_op_GetDomainNames.go index 1ace4f05a41..fdacedfb635 100644 --- a/service/apigatewayv2/api_op_GetDomainNames.go +++ b/service/apigatewayv2/api_op_GetDomainNames.go @@ -59,6 +59,9 @@ func addOperationGetDomainNamesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetDomainNamesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetIntegration.go b/service/apigatewayv2/api_op_GetIntegration.go index 10ebaf61d26..44839858647 100644 --- a/service/apigatewayv2/api_op_GetIntegration.go +++ b/service/apigatewayv2/api_op_GetIntegration.go @@ -185,6 +185,9 @@ func addOperationGetIntegrationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -227,6 +230,9 @@ func addOperationGetIntegrationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetIntegrationResponse.go b/service/apigatewayv2/api_op_GetIntegrationResponse.go index 55986b7e2f8..b0d12857cbc 100644 --- a/service/apigatewayv2/api_op_GetIntegrationResponse.go +++ b/service/apigatewayv2/api_op_GetIntegrationResponse.go @@ -97,6 +97,9 @@ func addOperationGetIntegrationResponseMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetIntegrationResponseMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetIntegrationResponses.go b/service/apigatewayv2/api_op_GetIntegrationResponses.go index 3c65cf09973..59d4ac4f738 100644 --- a/service/apigatewayv2/api_op_GetIntegrationResponses.go +++ b/service/apigatewayv2/api_op_GetIntegrationResponses.go @@ -69,6 +69,9 @@ func addOperationGetIntegrationResponsesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetIntegrationResponsesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetIntegrations.go b/service/apigatewayv2/api_op_GetIntegrations.go index 1e4dd932eb1..22b425828cc 100644 --- a/service/apigatewayv2/api_op_GetIntegrations.go +++ b/service/apigatewayv2/api_op_GetIntegrations.go @@ -64,6 +64,9 @@ func addOperationGetIntegrationsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetIntegrationsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetModel.go b/service/apigatewayv2/api_op_GetModel.go index 5e942eb2956..75993391900 100644 --- a/service/apigatewayv2/api_op_GetModel.go +++ b/service/apigatewayv2/api_op_GetModel.go @@ -70,6 +70,9 @@ func addOperationGetModelMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetModelMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetModelTemplate.go b/service/apigatewayv2/api_op_GetModelTemplate.go index 745351662b3..b09dc659435 100644 --- a/service/apigatewayv2/api_op_GetModelTemplate.go +++ b/service/apigatewayv2/api_op_GetModelTemplate.go @@ -57,6 +57,9 @@ func addOperationGetModelTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetModelTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetModels.go b/service/apigatewayv2/api_op_GetModels.go index c54f9f569ae..a9cadf713d1 100644 --- a/service/apigatewayv2/api_op_GetModels.go +++ b/service/apigatewayv2/api_op_GetModels.go @@ -64,6 +64,9 @@ func addOperationGetModelsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetModelsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetRoute.go b/service/apigatewayv2/api_op_GetRoute.go index ac87b2bc625..39a468bb930 100644 --- a/service/apigatewayv2/api_op_GetRoute.go +++ b/service/apigatewayv2/api_op_GetRoute.go @@ -110,6 +110,9 @@ func addOperationGetRouteMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationGetRouteMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetRouteResponse.go b/service/apigatewayv2/api_op_GetRouteResponse.go index cb5c2382ec9..c2f5bb605f5 100644 --- a/service/apigatewayv2/api_op_GetRouteResponse.go +++ b/service/apigatewayv2/api_op_GetRouteResponse.go @@ -76,6 +76,9 @@ func addOperationGetRouteResponseMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetRouteResponseMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetRouteResponses.go b/service/apigatewayv2/api_op_GetRouteResponses.go index d715a5e7c34..6cccc75312a 100644 --- a/service/apigatewayv2/api_op_GetRouteResponses.go +++ b/service/apigatewayv2/api_op_GetRouteResponses.go @@ -69,6 +69,9 @@ func addOperationGetRouteResponsesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetRouteResponsesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetRoutes.go b/service/apigatewayv2/api_op_GetRoutes.go index f02e9f36241..da86e0fe95c 100644 --- a/service/apigatewayv2/api_op_GetRoutes.go +++ b/service/apigatewayv2/api_op_GetRoutes.go @@ -64,6 +64,9 @@ func addOperationGetRoutesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetRoutesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetStage.go b/service/apigatewayv2/api_op_GetStage.go index 8cb290972f1..61a21643562 100644 --- a/service/apigatewayv2/api_op_GetStage.go +++ b/service/apigatewayv2/api_op_GetStage.go @@ -107,6 +107,9 @@ func addOperationGetStageMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationGetStageMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetStages.go b/service/apigatewayv2/api_op_GetStages.go index 99777f57e8d..610b156c46d 100644 --- a/service/apigatewayv2/api_op_GetStages.go +++ b/service/apigatewayv2/api_op_GetStages.go @@ -64,6 +64,9 @@ func addOperationGetStagesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetStagesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetTags.go b/service/apigatewayv2/api_op_GetTags.go index cb3463500d8..9b99c60e8f2 100644 --- a/service/apigatewayv2/api_op_GetTags.go +++ b/service/apigatewayv2/api_op_GetTags.go @@ -52,6 +52,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetVpcLink.go b/service/apigatewayv2/api_op_GetVpcLink.go index 19864c6551f..45dcaebb8b8 100644 --- a/service/apigatewayv2/api_op_GetVpcLink.go +++ b/service/apigatewayv2/api_op_GetVpcLink.go @@ -78,6 +78,9 @@ func addOperationGetVpcLinkMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetVpcLinkMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_GetVpcLinks.go b/service/apigatewayv2/api_op_GetVpcLinks.go index 8836605bdfd..6ffb6f33c2a 100644 --- a/service/apigatewayv2/api_op_GetVpcLinks.go +++ b/service/apigatewayv2/api_op_GetVpcLinks.go @@ -59,6 +59,9 @@ func addOperationGetVpcLinksMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetVpcLinksMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_ImportApi.go b/service/apigatewayv2/api_op_ImportApi.go index 50d4d77b984..3f297248ea2 100644 --- a/service/apigatewayv2/api_op_ImportApi.go +++ b/service/apigatewayv2/api_op_ImportApi.go @@ -128,6 +128,9 @@ func addOperationImportApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationImportApiMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_ReimportApi.go b/service/apigatewayv2/api_op_ReimportApi.go index 4d14f50dcd9..9def68ed486 100644 --- a/service/apigatewayv2/api_op_ReimportApi.go +++ b/service/apigatewayv2/api_op_ReimportApi.go @@ -133,6 +133,9 @@ func addOperationReimportApiMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationReimportApiMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_ResetAuthorizersCache.go b/service/apigatewayv2/api_op_ResetAuthorizersCache.go index 8605d7fac8c..fbd76e97532 100644 --- a/service/apigatewayv2/api_op_ResetAuthorizersCache.go +++ b/service/apigatewayv2/api_op_ResetAuthorizersCache.go @@ -54,6 +54,9 @@ func addOperationResetAuthorizersCacheMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationResetAuthorizersCacheMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_TagResource.go b/service/apigatewayv2/api_op_TagResource.go index 3a68960ceca..61565217441 100644 --- a/service/apigatewayv2/api_op_TagResource.go +++ b/service/apigatewayv2/api_op_TagResource.go @@ -52,6 +52,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UntagResource.go b/service/apigatewayv2/api_op_UntagResource.go index a995672d4fe..c7119b0ec8b 100644 --- a/service/apigatewayv2/api_op_UntagResource.go +++ b/service/apigatewayv2/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateApi.go b/service/apigatewayv2/api_op_UpdateApi.go index 56cca4bc1e7..c7c6ff1b25b 100644 --- a/service/apigatewayv2/api_op_UpdateApi.go +++ b/service/apigatewayv2/api_op_UpdateApi.go @@ -174,6 +174,9 @@ func addOperationUpdateApiMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -216,6 +219,9 @@ func addOperationUpdateApiMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateApiMapping.go b/service/apigatewayv2/api_op_UpdateApiMapping.go index 539592f3c4b..ea2987b0e5c 100644 --- a/service/apigatewayv2/api_op_UpdateApiMapping.go +++ b/service/apigatewayv2/api_op_UpdateApiMapping.go @@ -78,6 +78,9 @@ func addOperationUpdateApiMappingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateApiMappingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateAuthorizer.go b/service/apigatewayv2/api_op_UpdateAuthorizer.go index d0982ad97a2..d38336d9de0 100644 --- a/service/apigatewayv2/api_op_UpdateAuthorizer.go +++ b/service/apigatewayv2/api_op_UpdateAuthorizer.go @@ -208,6 +208,9 @@ func addOperationUpdateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -250,6 +253,9 @@ func addOperationUpdateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateDeployment.go b/service/apigatewayv2/api_op_UpdateDeployment.go index ccf49147d94..450691a40e2 100644 --- a/service/apigatewayv2/api_op_UpdateDeployment.go +++ b/service/apigatewayv2/api_op_UpdateDeployment.go @@ -78,6 +78,9 @@ func addOperationUpdateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateDomainName.go b/service/apigatewayv2/api_op_UpdateDomainName.go index ad645df0312..808fc7905ed 100644 --- a/service/apigatewayv2/api_op_UpdateDomainName.go +++ b/service/apigatewayv2/api_op_UpdateDomainName.go @@ -72,6 +72,9 @@ func addOperationUpdateDomainNameMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateDomainNameMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateIntegration.go b/service/apigatewayv2/api_op_UpdateIntegration.go index 74695f80ace..00463272386 100644 --- a/service/apigatewayv2/api_op_UpdateIntegration.go +++ b/service/apigatewayv2/api_op_UpdateIntegration.go @@ -303,6 +303,9 @@ func addOperationUpdateIntegrationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -345,6 +348,9 @@ func addOperationUpdateIntegrationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateIntegrationResponse.go b/service/apigatewayv2/api_op_UpdateIntegrationResponse.go index 0a4e59ea723..5f35bf7aa24 100644 --- a/service/apigatewayv2/api_op_UpdateIntegrationResponse.go +++ b/service/apigatewayv2/api_op_UpdateIntegrationResponse.go @@ -133,6 +133,9 @@ func addOperationUpdateIntegrationResponseMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationUpdateIntegrationResponseMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateModel.go b/service/apigatewayv2/api_op_UpdateModel.go index 01be7abf602..df50aecdab0 100644 --- a/service/apigatewayv2/api_op_UpdateModel.go +++ b/service/apigatewayv2/api_op_UpdateModel.go @@ -84,6 +84,9 @@ func addOperationUpdateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateRoute.go b/service/apigatewayv2/api_op_UpdateRoute.go index 9b3f96cda0b..bba4804476a 100644 --- a/service/apigatewayv2/api_op_UpdateRoute.go +++ b/service/apigatewayv2/api_op_UpdateRoute.go @@ -152,6 +152,9 @@ func addOperationUpdateRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationUpdateRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateRouteResponse.go b/service/apigatewayv2/api_op_UpdateRouteResponse.go index 6cbbdddc80a..37448b429c0 100644 --- a/service/apigatewayv2/api_op_UpdateRouteResponse.go +++ b/service/apigatewayv2/api_op_UpdateRouteResponse.go @@ -90,6 +90,9 @@ func addOperationUpdateRouteResponseMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationUpdateRouteResponseMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateStage.go b/service/apigatewayv2/api_op_UpdateStage.go index afb18ca87e4..0ef418a0c41 100644 --- a/service/apigatewayv2/api_op_UpdateStage.go +++ b/service/apigatewayv2/api_op_UpdateStage.go @@ -136,6 +136,9 @@ func addOperationUpdateStageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationUpdateStageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/api_op_UpdateVpcLink.go b/service/apigatewayv2/api_op_UpdateVpcLink.go index a8b9f68e736..ec1cc8bc898 100644 --- a/service/apigatewayv2/api_op_UpdateVpcLink.go +++ b/service/apigatewayv2/api_op_UpdateVpcLink.go @@ -82,6 +82,9 @@ func addOperationUpdateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateVpcLinkMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/apigatewayv2/go.mod b/service/apigatewayv2/go.mod index ccc429246bd..39ccd2518e8 100644 --- a/service/apigatewayv2/go.mod +++ b/service/apigatewayv2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/apigatewayv2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigatewayv2/go.sum b/service/apigatewayv2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/apigatewayv2/go.sum +++ b/service/apigatewayv2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appconfig/api_client.go b/service/appconfig/api_client.go index af5aa3848e3..67a0bb0c7b2 100644 --- a/service/appconfig/api_client.go +++ b/service/appconfig/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/appconfig/api_op_CreateApplication.go b/service/appconfig/api_op_CreateApplication.go index 9e7b91cdc1c..aa4d458877d 100644 --- a/service/appconfig/api_op_CreateApplication.go +++ b/service/appconfig/api_op_CreateApplication.go @@ -70,6 +70,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_CreateConfigurationProfile.go b/service/appconfig/api_op_CreateConfigurationProfile.go index 9f23583ec3c..8306f8f491f 100644 --- a/service/appconfig/api_op_CreateConfigurationProfile.go +++ b/service/appconfig/api_op_CreateConfigurationProfile.go @@ -120,6 +120,9 @@ func addOperationCreateConfigurationProfileMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationCreateConfigurationProfileMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_CreateDeploymentStrategy.go b/service/appconfig/api_op_CreateDeploymentStrategy.go index d253d3aaf52..a7e48559df0 100644 --- a/service/appconfig/api_op_CreateDeploymentStrategy.go +++ b/service/appconfig/api_op_CreateDeploymentStrategy.go @@ -128,6 +128,9 @@ func addOperationCreateDeploymentStrategyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationCreateDeploymentStrategyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_CreateEnvironment.go b/service/appconfig/api_op_CreateEnvironment.go index ebc63a18e60..2486fbf7146 100644 --- a/service/appconfig/api_op_CreateEnvironment.go +++ b/service/appconfig/api_op_CreateEnvironment.go @@ -91,6 +91,9 @@ func addOperationCreateEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_CreateHostedConfigurationVersion.go b/service/appconfig/api_op_CreateHostedConfigurationVersion.go index 9d3a2d8edec..83c8a1d1e1e 100644 --- a/service/appconfig/api_op_CreateHostedConfigurationVersion.go +++ b/service/appconfig/api_op_CreateHostedConfigurationVersion.go @@ -95,6 +95,9 @@ func addOperationCreateHostedConfigurationVersionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateHostedConfigurationVersionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_DeleteApplication.go b/service/appconfig/api_op_DeleteApplication.go index 9c38db19a31..054a3bb3d95 100644 --- a/service/appconfig/api_op_DeleteApplication.go +++ b/service/appconfig/api_op_DeleteApplication.go @@ -49,6 +49,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_DeleteConfigurationProfile.go b/service/appconfig/api_op_DeleteConfigurationProfile.go index 7227cf01216..344d0ae06b4 100644 --- a/service/appconfig/api_op_DeleteConfigurationProfile.go +++ b/service/appconfig/api_op_DeleteConfigurationProfile.go @@ -54,6 +54,9 @@ func addOperationDeleteConfigurationProfileMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteConfigurationProfileMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_DeleteDeploymentStrategy.go b/service/appconfig/api_op_DeleteDeploymentStrategy.go index f3e998783f2..b682542fa24 100644 --- a/service/appconfig/api_op_DeleteDeploymentStrategy.go +++ b/service/appconfig/api_op_DeleteDeploymentStrategy.go @@ -49,6 +49,9 @@ func addOperationDeleteDeploymentStrategyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteDeploymentStrategyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_DeleteEnvironment.go b/service/appconfig/api_op_DeleteEnvironment.go index 6398b8ef462..cfdafa00c26 100644 --- a/service/appconfig/api_op_DeleteEnvironment.go +++ b/service/appconfig/api_op_DeleteEnvironment.go @@ -54,6 +54,9 @@ func addOperationDeleteEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_DeleteHostedConfigurationVersion.go b/service/appconfig/api_op_DeleteHostedConfigurationVersion.go index d1a57abba37..6d54ef9c564 100644 --- a/service/appconfig/api_op_DeleteHostedConfigurationVersion.go +++ b/service/appconfig/api_op_DeleteHostedConfigurationVersion.go @@ -58,6 +58,9 @@ func addOperationDeleteHostedConfigurationVersionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteHostedConfigurationVersionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetApplication.go b/service/appconfig/api_op_GetApplication.go index c5d5ab8ae48..894bf60ac43 100644 --- a/service/appconfig/api_op_GetApplication.go +++ b/service/appconfig/api_op_GetApplication.go @@ -58,6 +58,9 @@ func addOperationGetApplicationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetApplicationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetConfiguration.go b/service/appconfig/api_op_GetConfiguration.go index 0d3e0ead54a..fb3fc8b1de2 100644 --- a/service/appconfig/api_op_GetConfiguration.go +++ b/service/appconfig/api_op_GetConfiguration.go @@ -102,6 +102,9 @@ func addOperationGetConfigurationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationGetConfigurationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetConfigurationProfile.go b/service/appconfig/api_op_GetConfigurationProfile.go index f14633b58a9..0c03e22d306 100644 --- a/service/appconfig/api_op_GetConfigurationProfile.go +++ b/service/appconfig/api_op_GetConfigurationProfile.go @@ -78,6 +78,9 @@ func addOperationGetConfigurationProfileMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetConfigurationProfileMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetDeployment.go b/service/appconfig/api_op_GetDeployment.go index 3f03fd0ed19..34d79478f8e 100644 --- a/service/appconfig/api_op_GetDeployment.go +++ b/service/appconfig/api_op_GetDeployment.go @@ -118,6 +118,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetDeploymentStrategy.go b/service/appconfig/api_op_GetDeploymentStrategy.go index ce47b335f8f..01faa8a9c99 100644 --- a/service/appconfig/api_op_GetDeploymentStrategy.go +++ b/service/appconfig/api_op_GetDeploymentStrategy.go @@ -80,6 +80,9 @@ func addOperationGetDeploymentStrategyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetDeploymentStrategyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetEnvironment.go b/service/appconfig/api_op_GetEnvironment.go index 20a07485aaa..4da573e1dda 100644 --- a/service/appconfig/api_op_GetEnvironment.go +++ b/service/appconfig/api_op_GetEnvironment.go @@ -79,6 +79,9 @@ func addOperationGetEnvironmentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetEnvironmentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_GetHostedConfigurationVersion.go b/service/appconfig/api_op_GetHostedConfigurationVersion.go index d73831f9a4d..cc240ed93d1 100644 --- a/service/appconfig/api_op_GetHostedConfigurationVersion.go +++ b/service/appconfig/api_op_GetHostedConfigurationVersion.go @@ -79,6 +79,9 @@ func addOperationGetHostedConfigurationVersionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetHostedConfigurationVersionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListApplications.go b/service/appconfig/api_op_ListApplications.go index 1f20aad1345..85965e8bb6e 100644 --- a/service/appconfig/api_op_ListApplications.go +++ b/service/appconfig/api_op_ListApplications.go @@ -59,6 +59,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListConfigurationProfiles.go b/service/appconfig/api_op_ListConfigurationProfiles.go index b8ba1eb5e1b..53562a3fd4a 100644 --- a/service/appconfig/api_op_ListConfigurationProfiles.go +++ b/service/appconfig/api_op_ListConfigurationProfiles.go @@ -64,6 +64,9 @@ func addOperationListConfigurationProfilesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListConfigurationProfilesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListDeploymentStrategies.go b/service/appconfig/api_op_ListDeploymentStrategies.go index d2e0fc9821b..a69b9a2563a 100644 --- a/service/appconfig/api_op_ListDeploymentStrategies.go +++ b/service/appconfig/api_op_ListDeploymentStrategies.go @@ -59,6 +59,9 @@ func addOperationListDeploymentStrategiesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDeploymentStrategiesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListDeployments.go b/service/appconfig/api_op_ListDeployments.go index 0b0e45deaee..a6a5965c5e6 100644 --- a/service/appconfig/api_op_ListDeployments.go +++ b/service/appconfig/api_op_ListDeployments.go @@ -69,6 +69,9 @@ func addOperationListDeploymentsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListDeploymentsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListEnvironments.go b/service/appconfig/api_op_ListEnvironments.go index 6f69009f56a..df5d08530cf 100644 --- a/service/appconfig/api_op_ListEnvironments.go +++ b/service/appconfig/api_op_ListEnvironments.go @@ -64,6 +64,9 @@ func addOperationListEnvironmentsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListEnvironmentsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListHostedConfigurationVersions.go b/service/appconfig/api_op_ListHostedConfigurationVersions.go index 958de47d5c6..a07b615a5e7 100644 --- a/service/appconfig/api_op_ListHostedConfigurationVersions.go +++ b/service/appconfig/api_op_ListHostedConfigurationVersions.go @@ -70,6 +70,9 @@ func addOperationListHostedConfigurationVersionsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListHostedConfigurationVersionsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ListTagsForResource.go b/service/appconfig/api_op_ListTagsForResource.go index 4b8b00b1e55..0915fbfa294 100644 --- a/service/appconfig/api_op_ListTagsForResource.go +++ b/service/appconfig/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_StartDeployment.go b/service/appconfig/api_op_StartDeployment.go index 2b93324737c..f2077ab72aa 100644 --- a/service/appconfig/api_op_StartDeployment.go +++ b/service/appconfig/api_op_StartDeployment.go @@ -136,6 +136,9 @@ func addOperationStartDeploymentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationStartDeploymentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_StopDeployment.go b/service/appconfig/api_op_StopDeployment.go index e9046e359d7..5092e720abe 100644 --- a/service/appconfig/api_op_StopDeployment.go +++ b/service/appconfig/api_op_StopDeployment.go @@ -119,6 +119,9 @@ func addOperationStopDeploymentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationStopDeploymentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_TagResource.go b/service/appconfig/api_op_TagResource.go index 3b00714bca6..1c857196feb 100644 --- a/service/appconfig/api_op_TagResource.go +++ b/service/appconfig/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_UntagResource.go b/service/appconfig/api_op_UntagResource.go index 0f3ea59038a..44ea8de78cc 100644 --- a/service/appconfig/api_op_UntagResource.go +++ b/service/appconfig/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_UpdateApplication.go b/service/appconfig/api_op_UpdateApplication.go index 6159f78a8d9..6ae2133feea 100644 --- a/service/appconfig/api_op_UpdateApplication.go +++ b/service/appconfig/api_op_UpdateApplication.go @@ -64,6 +64,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_UpdateConfigurationProfile.go b/service/appconfig/api_op_UpdateConfigurationProfile.go index 547d58b44f4..a6c2af7470c 100644 --- a/service/appconfig/api_op_UpdateConfigurationProfile.go +++ b/service/appconfig/api_op_UpdateConfigurationProfile.go @@ -90,6 +90,9 @@ func addOperationUpdateConfigurationProfileMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationUpdateConfigurationProfileMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_UpdateDeploymentStrategy.go b/service/appconfig/api_op_UpdateDeploymentStrategy.go index 7ad68828b10..f698a6480ac 100644 --- a/service/appconfig/api_op_UpdateDeploymentStrategy.go +++ b/service/appconfig/api_op_UpdateDeploymentStrategy.go @@ -110,6 +110,9 @@ func addOperationUpdateDeploymentStrategyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationUpdateDeploymentStrategyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_UpdateEnvironment.go b/service/appconfig/api_op_UpdateEnvironment.go index 57f0dd3675a..954f176e6a1 100644 --- a/service/appconfig/api_op_UpdateEnvironment.go +++ b/service/appconfig/api_op_UpdateEnvironment.go @@ -83,6 +83,9 @@ func addOperationUpdateEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationUpdateEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/api_op_ValidateConfiguration.go b/service/appconfig/api_op_ValidateConfiguration.go index a022bf06c74..94e58dc166b 100644 --- a/service/appconfig/api_op_ValidateConfiguration.go +++ b/service/appconfig/api_op_ValidateConfiguration.go @@ -58,6 +58,9 @@ func addOperationValidateConfigurationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationValidateConfigurationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appconfig/go.mod b/service/appconfig/go.mod index 21f46d9f818..76467d862ca 100644 --- a/service/appconfig/go.mod +++ b/service/appconfig/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/appconfig go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appconfig/go.sum b/service/appconfig/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/appconfig/go.sum +++ b/service/appconfig/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appflow/api_client.go b/service/appflow/api_client.go index 92352aaed9a..dda08abc26b 100644 --- a/service/appflow/api_client.go +++ b/service/appflow/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/appflow/api_op_CreateConnectorProfile.go b/service/appflow/api_op_CreateConnectorProfile.go index 5dd0ff65ef0..a5937b65e68 100644 --- a/service/appflow/api_op_CreateConnectorProfile.go +++ b/service/appflow/api_op_CreateConnectorProfile.go @@ -80,6 +80,9 @@ func addOperationCreateConnectorProfileMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateConnectorProfileMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_CreateFlow.go b/service/appflow/api_op_CreateFlow.go index 12c526cf333..e24ac9ee867 100644 --- a/service/appflow/api_op_CreateFlow.go +++ b/service/appflow/api_op_CreateFlow.go @@ -96,6 +96,9 @@ func addOperationCreateFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DeleteConnectorProfile.go b/service/appflow/api_op_DeleteConnectorProfile.go index 0768d5d8f24..935f26a685a 100644 --- a/service/appflow/api_op_DeleteConnectorProfile.go +++ b/service/appflow/api_op_DeleteConnectorProfile.go @@ -53,6 +53,9 @@ func addOperationDeleteConnectorProfileMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteConnectorProfileMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DeleteFlow.go b/service/appflow/api_op_DeleteFlow.go index a0c2c03e4bc..b5577a879d0 100644 --- a/service/appflow/api_op_DeleteFlow.go +++ b/service/appflow/api_op_DeleteFlow.go @@ -55,6 +55,9 @@ func addOperationDeleteFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DescribeConnectorEntity.go b/service/appflow/api_op_DescribeConnectorEntity.go index a3b200feebd..c7111368da3 100644 --- a/service/appflow/api_op_DescribeConnectorEntity.go +++ b/service/appflow/api_op_DescribeConnectorEntity.go @@ -64,6 +64,9 @@ func addOperationDescribeConnectorEntityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeConnectorEntityMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DescribeConnectorProfiles.go b/service/appflow/api_op_DescribeConnectorProfiles.go index 9093ddd943d..9e039fb5c6c 100644 --- a/service/appflow/api_op_DescribeConnectorProfiles.go +++ b/service/appflow/api_op_DescribeConnectorProfiles.go @@ -70,6 +70,9 @@ func addOperationDescribeConnectorProfilesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeConnectorProfilesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DescribeConnectors.go b/service/appflow/api_op_DescribeConnectors.go index 49e13bd7770..fbe44775ee3 100644 --- a/service/appflow/api_op_DescribeConnectors.go +++ b/service/appflow/api_op_DescribeConnectors.go @@ -61,6 +61,9 @@ func addOperationDescribeConnectorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeConnectorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DescribeFlow.go b/service/appflow/api_op_DescribeFlow.go index 790fb960862..ec860071185 100644 --- a/service/appflow/api_op_DescribeFlow.go +++ b/service/appflow/api_op_DescribeFlow.go @@ -108,6 +108,9 @@ func addOperationDescribeFlowMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeFlowMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_DescribeFlowExecutionRecords.go b/service/appflow/api_op_DescribeFlowExecutionRecords.go index db57ebe1277..e77c52f68d1 100644 --- a/service/appflow/api_op_DescribeFlowExecutionRecords.go +++ b/service/appflow/api_op_DescribeFlowExecutionRecords.go @@ -64,6 +64,9 @@ func addOperationDescribeFlowExecutionRecordsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeFlowExecutionRecordsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_ListConnectorEntities.go b/service/appflow/api_op_ListConnectorEntities.go index 10ccbd9b21c..717734135f4 100644 --- a/service/appflow/api_op_ListConnectorEntities.go +++ b/service/appflow/api_op_ListConnectorEntities.go @@ -69,6 +69,9 @@ func addOperationListConnectorEntitiesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListConnectorEntitiesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_ListFlows.go b/service/appflow/api_op_ListFlows.go index 2773149b162..08a898e2179 100644 --- a/service/appflow/api_op_ListFlows.go +++ b/service/appflow/api_op_ListFlows.go @@ -57,6 +57,9 @@ func addOperationListFlowsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListFlowsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_ListTagsForResource.go b/service/appflow/api_op_ListTagsForResource.go index fe0e498722a..5a73a659198 100644 --- a/service/appflow/api_op_ListTagsForResource.go +++ b/service/appflow/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_StartFlow.go b/service/appflow/api_op_StartFlow.go index 37daa056cd5..9f9c226a55f 100644 --- a/service/appflow/api_op_StartFlow.go +++ b/service/appflow/api_op_StartFlow.go @@ -63,6 +63,9 @@ func addOperationStartFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStartFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_StopFlow.go b/service/appflow/api_op_StopFlow.go index 2d6f09c825b..a168b7bbd43 100644 --- a/service/appflow/api_op_StopFlow.go +++ b/service/appflow/api_op_StopFlow.go @@ -59,6 +59,9 @@ func addOperationStopFlowMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationStopFlowMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_TagResource.go b/service/appflow/api_op_TagResource.go index bb8b5fcb54e..5a213b39ffd 100644 --- a/service/appflow/api_op_TagResource.go +++ b/service/appflow/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_UntagResource.go b/service/appflow/api_op_UntagResource.go index 96349edf5e1..316b6404e6e 100644 --- a/service/appflow/api_op_UntagResource.go +++ b/service/appflow/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_UpdateConnectorProfile.go b/service/appflow/api_op_UpdateConnectorProfile.go index 93869d57747..d0e588fd28d 100644 --- a/service/appflow/api_op_UpdateConnectorProfile.go +++ b/service/appflow/api_op_UpdateConnectorProfile.go @@ -64,6 +64,9 @@ func addOperationUpdateConnectorProfileMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateConnectorProfileMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/api_op_UpdateFlow.go b/service/appflow/api_op_UpdateFlow.go index 0e605052185..6c290e8b7ff 100644 --- a/service/appflow/api_op_UpdateFlow.go +++ b/service/appflow/api_op_UpdateFlow.go @@ -78,6 +78,9 @@ func addOperationUpdateFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appflow/go.mod b/service/appflow/go.mod index b18a76f11c9..6f513c201d0 100644 --- a/service/appflow/go.mod +++ b/service/appflow/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/appflow go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appflow/go.sum b/service/appflow/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/appflow/go.sum +++ b/service/appflow/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/applicationautoscaling/api_client.go b/service/applicationautoscaling/api_client.go index c672118502c..0c1bdd26269 100644 --- a/service/applicationautoscaling/api_client.go +++ b/service/applicationautoscaling/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/applicationautoscaling/api_op_DeleteScalingPolicy.go b/service/applicationautoscaling/api_op_DeleteScalingPolicy.go index c5099d48761..4a7174f11cc 100644 --- a/service/applicationautoscaling/api_op_DeleteScalingPolicy.go +++ b/service/applicationautoscaling/api_op_DeleteScalingPolicy.go @@ -199,6 +199,9 @@ func addOperationDeleteScalingPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -241,6 +244,9 @@ func addOperationDeleteScalingPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_DeleteScheduledAction.go b/service/applicationautoscaling/api_op_DeleteScheduledAction.go index 9c899e95906..29c7facd3ab 100644 --- a/service/applicationautoscaling/api_op_DeleteScheduledAction.go +++ b/service/applicationautoscaling/api_op_DeleteScheduledAction.go @@ -194,6 +194,9 @@ func addOperationDeleteScheduledActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -236,6 +239,9 @@ func addOperationDeleteScheduledActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_DeregisterScalableTarget.go b/service/applicationautoscaling/api_op_DeregisterScalableTarget.go index 4083f162ae5..453f41400ee 100644 --- a/service/applicationautoscaling/api_op_DeregisterScalableTarget.go +++ b/service/applicationautoscaling/api_op_DeregisterScalableTarget.go @@ -191,6 +191,9 @@ func addOperationDeregisterScalableTargetMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -233,6 +236,9 @@ func addOperationDeregisterScalableTargetMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_DescribeScalableTargets.go b/service/applicationautoscaling/api_op_DescribeScalableTargets.go index aa81a98933c..93ab1df7561 100644 --- a/service/applicationautoscaling/api_op_DescribeScalableTargets.go +++ b/service/applicationautoscaling/api_op_DescribeScalableTargets.go @@ -203,6 +203,9 @@ func addOperationDescribeScalableTargetsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -245,6 +248,9 @@ func addOperationDescribeScalableTargetsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_DescribeScalingActivities.go b/service/applicationautoscaling/api_op_DescribeScalingActivities.go index 2efc77a093f..6f18c4f1d64 100644 --- a/service/applicationautoscaling/api_op_DescribeScalingActivities.go +++ b/service/applicationautoscaling/api_op_DescribeScalingActivities.go @@ -204,6 +204,9 @@ func addOperationDescribeScalingActivitiesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -246,6 +249,9 @@ func addOperationDescribeScalingActivitiesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_DescribeScalingPolicies.go b/service/applicationautoscaling/api_op_DescribeScalingPolicies.go index 410287d55d6..023c128a6c0 100644 --- a/service/applicationautoscaling/api_op_DescribeScalingPolicies.go +++ b/service/applicationautoscaling/api_op_DescribeScalingPolicies.go @@ -212,6 +212,9 @@ func addOperationDescribeScalingPoliciesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -254,6 +257,9 @@ func addOperationDescribeScalingPoliciesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_DescribeScheduledActions.go b/service/applicationautoscaling/api_op_DescribeScheduledActions.go index e14f2e8dcce..2e15b9184f8 100644 --- a/service/applicationautoscaling/api_op_DescribeScheduledActions.go +++ b/service/applicationautoscaling/api_op_DescribeScheduledActions.go @@ -210,6 +210,9 @@ func addOperationDescribeScheduledActionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -252,6 +255,9 @@ func addOperationDescribeScheduledActionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_PutScalingPolicy.go b/service/applicationautoscaling/api_op_PutScalingPolicy.go index 001adcc30ba..7ac7f3c3bb3 100644 --- a/service/applicationautoscaling/api_op_PutScalingPolicy.go +++ b/service/applicationautoscaling/api_op_PutScalingPolicy.go @@ -247,6 +247,9 @@ func addOperationPutScalingPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -289,6 +292,9 @@ func addOperationPutScalingPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_PutScheduledAction.go b/service/applicationautoscaling/api_op_PutScheduledAction.go index bff86fd5560..ddc912858fd 100644 --- a/service/applicationautoscaling/api_op_PutScheduledAction.go +++ b/service/applicationautoscaling/api_op_PutScheduledAction.go @@ -241,6 +241,9 @@ func addOperationPutScheduledActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -283,6 +286,9 @@ func addOperationPutScheduledActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/api_op_RegisterScalableTarget.go b/service/applicationautoscaling/api_op_RegisterScalableTarget.go index d0ca9c58cc3..21c72d7567f 100644 --- a/service/applicationautoscaling/api_op_RegisterScalableTarget.go +++ b/service/applicationautoscaling/api_op_RegisterScalableTarget.go @@ -260,6 +260,9 @@ func addOperationRegisterScalableTargetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -302,6 +305,9 @@ func addOperationRegisterScalableTargetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationautoscaling/go.mod b/service/applicationautoscaling/go.mod index 12b08b9b7df..34367d272c9 100644 --- a/service/applicationautoscaling/go.mod +++ b/service/applicationautoscaling/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationautoscaling/go.sum b/service/applicationautoscaling/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/applicationautoscaling/go.sum +++ b/service/applicationautoscaling/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/applicationdiscoveryservice/api_client.go b/service/applicationdiscoveryservice/api_client.go index fc1d92d1d32..dc00e4aa42d 100644 --- a/service/applicationdiscoveryservice/api_client.go +++ b/service/applicationdiscoveryservice/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go b/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go index c24b05ce4fe..b4804980852 100644 --- a/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go +++ b/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go @@ -53,6 +53,9 @@ func addOperationAssociateConfigurationItemsToApplicationMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateConfigurationItemsToApplicationMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go b/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go index af98447695b..2376e1e5dbf 100644 --- a/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go +++ b/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go @@ -61,6 +61,9 @@ func addOperationBatchDeleteImportDataMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationBatchDeleteImportDataMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_CreateApplication.go b/service/applicationdiscoveryservice/api_op_CreateApplication.go index bc759702ade..8e9db9877f4 100644 --- a/service/applicationdiscoveryservice/api_op_CreateApplication.go +++ b/service/applicationdiscoveryservice/api_op_CreateApplication.go @@ -55,6 +55,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_CreateTags.go b/service/applicationdiscoveryservice/api_op_CreateTags.go index 80c48a62d58..4f3601a39bf 100644 --- a/service/applicationdiscoveryservice/api_op_CreateTags.go +++ b/service/applicationdiscoveryservice/api_op_CreateTags.go @@ -58,6 +58,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DeleteApplications.go b/service/applicationdiscoveryservice/api_op_DeleteApplications.go index 39a3f214879..e64d16098af 100644 --- a/service/applicationdiscoveryservice/api_op_DeleteApplications.go +++ b/service/applicationdiscoveryservice/api_op_DeleteApplications.go @@ -48,6 +48,9 @@ func addOperationDeleteApplicationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteApplicationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DeleteTags.go b/service/applicationdiscoveryservice/api_op_DeleteTags.go index c907d869ece..5bc6275c295 100644 --- a/service/applicationdiscoveryservice/api_op_DeleteTags.go +++ b/service/applicationdiscoveryservice/api_op_DeleteTags.go @@ -55,6 +55,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeAgents.go b/service/applicationdiscoveryservice/api_op_DescribeAgents.go index 71912ce8389..30ce3f0cbf0 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeAgents.go +++ b/service/applicationdiscoveryservice/api_op_DescribeAgents.go @@ -79,6 +79,9 @@ func addOperationDescribeAgentsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeAgentsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go b/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go index ec884b78028..8efd8d59143 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go @@ -70,6 +70,9 @@ func addOperationDescribeConfigurationsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeConfigurationsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go b/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go index 12a1a544858..4b8d10af76a 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go +++ b/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go @@ -63,6 +63,9 @@ func addOperationDescribeContinuousExportsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeContinuousExportsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go b/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go index 05e427e4b1b..6d9b3648af7 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go @@ -63,6 +63,9 @@ func addOperationDescribeExportConfigurationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeExportConfigurationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go b/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go index f466ee4ff42..684ca1f3e86 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go +++ b/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go @@ -78,6 +78,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go b/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go index e2111eb865e..ec2534ae34d 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go +++ b/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go @@ -64,6 +64,9 @@ func addOperationDescribeImportTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeImportTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DescribeTags.go b/service/applicationdiscoveryservice/api_op_DescribeTags.go index db071dc0070..0c7a37537a1 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeTags.go +++ b/service/applicationdiscoveryservice/api_op_DescribeTags.go @@ -77,6 +77,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go b/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go index 3a64cd01288..1dd37d55655 100644 --- a/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go +++ b/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go @@ -53,6 +53,9 @@ func addOperationDisassociateConfigurationItemsFromApplicationMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDisassociateConfigurationItemsFromApplicationMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_ExportConfigurations.go b/service/applicationdiscoveryservice/api_op_ExportConfigurations.go index 4f15ceb34fa..5d7577db225 100644 --- a/service/applicationdiscoveryservice/api_op_ExportConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_ExportConfigurations.go @@ -52,6 +52,9 @@ func addOperationExportConfigurationsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationExportConfigurationsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go b/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go index 49233dbb975..e4f44d37ab7 100644 --- a/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go +++ b/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go @@ -65,6 +65,9 @@ func addOperationGetDiscoverySummaryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetDiscoverySummaryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_ListConfigurations.go b/service/applicationdiscoveryservice/api_op_ListConfigurations.go index b63ee47bb56..c1fded0fba7 100644 --- a/service/applicationdiscoveryservice/api_op_ListConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_ListConfigurations.go @@ -87,6 +87,9 @@ func addOperationListConfigurationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListConfigurationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go b/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go index 06bcad1d247..211c1c6dee6 100644 --- a/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go +++ b/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go @@ -83,6 +83,9 @@ func addOperationListServerNeighborsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListServerNeighborsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_StartContinuousExport.go b/service/applicationdiscoveryservice/api_op_StartContinuousExport.go index 4c7521c52b4..a1e036d649a 100644 --- a/service/applicationdiscoveryservice/api_op_StartContinuousExport.go +++ b/service/applicationdiscoveryservice/api_op_StartContinuousExport.go @@ -65,6 +65,9 @@ func addOperationStartContinuousExportMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationStartContinuousExportMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go b/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go index 425e39e7ca1..d142e0e7165 100644 --- a/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go +++ b/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go @@ -62,6 +62,9 @@ func addOperationStartDataCollectionByAgentIdsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationStartDataCollectionByAgentIdsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_StartExportTask.go b/service/applicationdiscoveryservice/api_op_StartExportTask.go index 23ab55512b1..594fa792a06 100644 --- a/service/applicationdiscoveryservice/api_op_StartExportTask.go +++ b/service/applicationdiscoveryservice/api_op_StartExportTask.go @@ -78,6 +78,9 @@ func addOperationStartExportTaskMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationStartExportTaskMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_StartImportTask.go b/service/applicationdiscoveryservice/api_op_StartImportTask.go index a8016dcadf5..e37bc98e65a 100644 --- a/service/applicationdiscoveryservice/api_op_StartImportTask.go +++ b/service/applicationdiscoveryservice/api_op_StartImportTask.go @@ -103,6 +103,9 @@ func addOperationStartImportTaskMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationStartImportTaskMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_StopContinuousExport.go b/service/applicationdiscoveryservice/api_op_StopContinuousExport.go index 1c8bdecdfa4..4e600250260 100644 --- a/service/applicationdiscoveryservice/api_op_StopContinuousExport.go +++ b/service/applicationdiscoveryservice/api_op_StopContinuousExport.go @@ -56,6 +56,9 @@ func addOperationStopContinuousExportMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopContinuousExportMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go b/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go index 8843b77c3c6..cc0844515eb 100644 --- a/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go +++ b/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go @@ -56,6 +56,9 @@ func addOperationStopDataCollectionByAgentIdsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopDataCollectionByAgentIdsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/api_op_UpdateApplication.go b/service/applicationdiscoveryservice/api_op_UpdateApplication.go index c8b4ee20a43..59664bac1f8 100644 --- a/service/applicationdiscoveryservice/api_op_UpdateApplication.go +++ b/service/applicationdiscoveryservice/api_op_UpdateApplication.go @@ -54,6 +54,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationdiscoveryservice/go.mod b/service/applicationdiscoveryservice/go.mod index 9a6e7dd40af..05bcde70fc6 100644 --- a/service/applicationdiscoveryservice/go.mod +++ b/service/applicationdiscoveryservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationdiscoveryservice/go.sum b/service/applicationdiscoveryservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/applicationdiscoveryservice/go.sum +++ b/service/applicationdiscoveryservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/applicationinsights/api_client.go b/service/applicationinsights/api_client.go index f8c108938ba..9dfdb6d1667 100644 --- a/service/applicationinsights/api_client.go +++ b/service/applicationinsights/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/applicationinsights/api_op_CreateApplication.go b/service/applicationinsights/api_op_CreateApplication.go index d5f8ded5f4c..a8765a7be04 100644 --- a/service/applicationinsights/api_op_CreateApplication.go +++ b/service/applicationinsights/api_op_CreateApplication.go @@ -70,6 +70,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_CreateComponent.go b/service/applicationinsights/api_op_CreateComponent.go index 3d61106066b..fcb5feddff9 100644 --- a/service/applicationinsights/api_op_CreateComponent.go +++ b/service/applicationinsights/api_op_CreateComponent.go @@ -58,6 +58,9 @@ func addOperationCreateComponentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateComponentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_CreateLogPattern.go b/service/applicationinsights/api_op_CreateLogPattern.go index 4ea61e4bbd5..189204341de 100644 --- a/service/applicationinsights/api_op_CreateLogPattern.go +++ b/service/applicationinsights/api_op_CreateLogPattern.go @@ -76,6 +76,9 @@ func addOperationCreateLogPatternMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateLogPatternMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DeleteApplication.go b/service/applicationinsights/api_op_DeleteApplication.go index 6e2ec0a9cae..5030a7b92fc 100644 --- a/service/applicationinsights/api_op_DeleteApplication.go +++ b/service/applicationinsights/api_op_DeleteApplication.go @@ -49,6 +49,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DeleteComponent.go b/service/applicationinsights/api_op_DeleteComponent.go index 6f157ca5f46..9175691aa7b 100644 --- a/service/applicationinsights/api_op_DeleteComponent.go +++ b/service/applicationinsights/api_op_DeleteComponent.go @@ -55,6 +55,9 @@ func addOperationDeleteComponentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteComponentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DeleteLogPattern.go b/service/applicationinsights/api_op_DeleteLogPattern.go index 47ef71f6da7..4e4129107f5 100644 --- a/service/applicationinsights/api_op_DeleteLogPattern.go +++ b/service/applicationinsights/api_op_DeleteLogPattern.go @@ -58,6 +58,9 @@ func addOperationDeleteLogPatternMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteLogPatternMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeApplication.go b/service/applicationinsights/api_op_DescribeApplication.go index c086dc4b13f..e66892ce3a7 100644 --- a/service/applicationinsights/api_op_DescribeApplication.go +++ b/service/applicationinsights/api_op_DescribeApplication.go @@ -53,6 +53,9 @@ func addOperationDescribeApplicationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeApplicationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeComponent.go b/service/applicationinsights/api_op_DescribeComponent.go index d1cd6a06bc4..d5cce8990ea 100644 --- a/service/applicationinsights/api_op_DescribeComponent.go +++ b/service/applicationinsights/api_op_DescribeComponent.go @@ -63,6 +63,9 @@ func addOperationDescribeComponentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeComponentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeComponentConfiguration.go b/service/applicationinsights/api_op_DescribeComponentConfiguration.go index 382a1109642..1752b75da1f 100644 --- a/service/applicationinsights/api_op_DescribeComponentConfiguration.go +++ b/service/applicationinsights/api_op_DescribeComponentConfiguration.go @@ -66,6 +66,9 @@ func addOperationDescribeComponentConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeComponentConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go b/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go index 16769a0df44..cc28a2c5337 100644 --- a/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go +++ b/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go @@ -65,6 +65,9 @@ func addOperationDescribeComponentConfigurationRecommendationMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeComponentConfigurationRecommendationMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeLogPattern.go b/service/applicationinsights/api_op_DescribeLogPattern.go index 6b5f5e46218..1f5f28a5a87 100644 --- a/service/applicationinsights/api_op_DescribeLogPattern.go +++ b/service/applicationinsights/api_op_DescribeLogPattern.go @@ -66,6 +66,9 @@ func addOperationDescribeLogPatternMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeLogPatternMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeObservation.go b/service/applicationinsights/api_op_DescribeObservation.go index 26596ea9a4e..d729a9bc554 100644 --- a/service/applicationinsights/api_op_DescribeObservation.go +++ b/service/applicationinsights/api_op_DescribeObservation.go @@ -53,6 +53,9 @@ func addOperationDescribeObservationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeObservationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeProblem.go b/service/applicationinsights/api_op_DescribeProblem.go index 9e753602844..4edb98243f6 100644 --- a/service/applicationinsights/api_op_DescribeProblem.go +++ b/service/applicationinsights/api_op_DescribeProblem.go @@ -53,6 +53,9 @@ func addOperationDescribeProblemMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeProblemMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_DescribeProblemObservations.go b/service/applicationinsights/api_op_DescribeProblemObservations.go index d0a8e5af164..6a9b50b7681 100644 --- a/service/applicationinsights/api_op_DescribeProblemObservations.go +++ b/service/applicationinsights/api_op_DescribeProblemObservations.go @@ -53,6 +53,9 @@ func addOperationDescribeProblemObservationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeProblemObservationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListApplications.go b/service/applicationinsights/api_op_ListApplications.go index 08f654425d3..cf2577e7971 100644 --- a/service/applicationinsights/api_op_ListApplications.go +++ b/service/applicationinsights/api_op_ListApplications.go @@ -59,6 +59,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListComponents.go b/service/applicationinsights/api_op_ListComponents.go index 36625e060d7..6a8dc666980 100644 --- a/service/applicationinsights/api_op_ListComponents.go +++ b/service/applicationinsights/api_op_ListComponents.go @@ -63,6 +63,9 @@ func addOperationListComponentsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListComponentsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListConfigurationHistory.go b/service/applicationinsights/api_op_ListConfigurationHistory.go index fa951be6ff2..b72f7f711ed 100644 --- a/service/applicationinsights/api_op_ListConfigurationHistory.go +++ b/service/applicationinsights/api_op_ListConfigurationHistory.go @@ -93,6 +93,9 @@ func addOperationListConfigurationHistoryMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListConfigurationHistoryMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListLogPatternSets.go b/service/applicationinsights/api_op_ListLogPatternSets.go index 1470afc15ef..ec4647c40f7 100644 --- a/service/applicationinsights/api_op_ListLogPatternSets.go +++ b/service/applicationinsights/api_op_ListLogPatternSets.go @@ -66,6 +66,9 @@ func addOperationListLogPatternSetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListLogPatternSetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListLogPatterns.go b/service/applicationinsights/api_op_ListLogPatterns.go index 83802af6bcb..ea9cc6edde9 100644 --- a/service/applicationinsights/api_op_ListLogPatterns.go +++ b/service/applicationinsights/api_op_ListLogPatterns.go @@ -70,6 +70,9 @@ func addOperationListLogPatternsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListLogPatternsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListProblems.go b/service/applicationinsights/api_op_ListProblems.go index 6f614c326d3..9bc807cac4a 100644 --- a/service/applicationinsights/api_op_ListProblems.go +++ b/service/applicationinsights/api_op_ListProblems.go @@ -71,6 +71,9 @@ func addOperationListProblemsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListProblemsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_ListTagsForResource.go b/service/applicationinsights/api_op_ListTagsForResource.go index 455048420d0..9ebdc00410d 100644 --- a/service/applicationinsights/api_op_ListTagsForResource.go +++ b/service/applicationinsights/api_op_ListTagsForResource.go @@ -59,6 +59,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_TagResource.go b/service/applicationinsights/api_op_TagResource.go index 86c2eac4a0c..baaff0b861a 100644 --- a/service/applicationinsights/api_op_TagResource.go +++ b/service/applicationinsights/api_op_TagResource.go @@ -63,6 +63,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_UntagResource.go b/service/applicationinsights/api_op_UntagResource.go index 359d5680fb3..2d0bf813f2a 100644 --- a/service/applicationinsights/api_op_UntagResource.go +++ b/service/applicationinsights/api_op_UntagResource.go @@ -57,6 +57,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_UpdateApplication.go b/service/applicationinsights/api_op_UpdateApplication.go index 1b5370ce657..3a76069bc61 100644 --- a/service/applicationinsights/api_op_UpdateApplication.go +++ b/service/applicationinsights/api_op_UpdateApplication.go @@ -68,6 +68,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_UpdateComponent.go b/service/applicationinsights/api_op_UpdateComponent.go index 490fd90424c..fa1d6022557 100644 --- a/service/applicationinsights/api_op_UpdateComponent.go +++ b/service/applicationinsights/api_op_UpdateComponent.go @@ -60,6 +60,9 @@ func addOperationUpdateComponentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateComponentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_UpdateComponentConfiguration.go b/service/applicationinsights/api_op_UpdateComponentConfiguration.go index 2a542bedb68..eab6c4010e8 100644 --- a/service/applicationinsights/api_op_UpdateComponentConfiguration.go +++ b/service/applicationinsights/api_op_UpdateComponentConfiguration.go @@ -73,6 +73,9 @@ func addOperationUpdateComponentConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateComponentConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/api_op_UpdateLogPattern.go b/service/applicationinsights/api_op_UpdateLogPattern.go index 84224cb3b71..5b86309c6cb 100644 --- a/service/applicationinsights/api_op_UpdateLogPattern.go +++ b/service/applicationinsights/api_op_UpdateLogPattern.go @@ -72,6 +72,9 @@ func addOperationUpdateLogPatternMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateLogPatternMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/applicationinsights/go.mod b/service/applicationinsights/go.mod index a8e742e12b0..0c0139637b8 100644 --- a/service/applicationinsights/go.mod +++ b/service/applicationinsights/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/applicationinsights go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationinsights/go.sum b/service/applicationinsights/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/applicationinsights/go.sum +++ b/service/applicationinsights/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appmesh/api_client.go b/service/appmesh/api_client.go index c53dfc1f7b4..0b51f0d221a 100644 --- a/service/appmesh/api_client.go +++ b/service/appmesh/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/appmesh/api_op_CreateGatewayRoute.go b/service/appmesh/api_op_CreateGatewayRoute.go index c9ac05eb1f7..c691c62324c 100644 --- a/service/appmesh/api_op_CreateGatewayRoute.go +++ b/service/appmesh/api_op_CreateGatewayRoute.go @@ -93,6 +93,9 @@ func addOperationCreateGatewayRouteMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,5 +135,8 @@ func addOperationCreateGatewayRouteMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_CreateMesh.go b/service/appmesh/api_op_CreateMesh.go index a3dd3843fdb..a256b90764d 100644 --- a/service/appmesh/api_op_CreateMesh.go +++ b/service/appmesh/api_op_CreateMesh.go @@ -75,6 +75,9 @@ func addOperationCreateMeshMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,5 +117,8 @@ func addOperationCreateMeshMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_CreateRoute.go b/service/appmesh/api_op_CreateRoute.go index d5ffc81b0d4..4d6d3ac6e92 100644 --- a/service/appmesh/api_op_CreateRoute.go +++ b/service/appmesh/api_op_CreateRoute.go @@ -94,6 +94,9 @@ func addOperationCreateRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,5 +136,8 @@ func addOperationCreateRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_CreateVirtualGateway.go b/service/appmesh/api_op_CreateVirtualGateway.go index 800ec94b2f3..860468fdee7 100644 --- a/service/appmesh/api_op_CreateVirtualGateway.go +++ b/service/appmesh/api_op_CreateVirtualGateway.go @@ -89,6 +89,9 @@ func addOperationCreateVirtualGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,5 +131,8 @@ func addOperationCreateVirtualGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_CreateVirtualNode.go b/service/appmesh/api_op_CreateVirtualNode.go index 75706664c0d..968ff4b8c23 100644 --- a/service/appmesh/api_op_CreateVirtualNode.go +++ b/service/appmesh/api_op_CreateVirtualNode.go @@ -101,6 +101,9 @@ func addOperationCreateVirtualNodeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,5 +143,8 @@ func addOperationCreateVirtualNodeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_CreateVirtualRouter.go b/service/appmesh/api_op_CreateVirtualRouter.go index 51327eed9bd..9b1e47720a8 100644 --- a/service/appmesh/api_op_CreateVirtualRouter.go +++ b/service/appmesh/api_op_CreateVirtualRouter.go @@ -91,6 +91,9 @@ func addOperationCreateVirtualRouterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,5 +133,8 @@ func addOperationCreateVirtualRouterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_CreateVirtualService.go b/service/appmesh/api_op_CreateVirtualService.go index a00ea47779a..1b2a15102c3 100644 --- a/service/appmesh/api_op_CreateVirtualService.go +++ b/service/appmesh/api_op_CreateVirtualService.go @@ -90,6 +90,9 @@ func addOperationCreateVirtualServiceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,5 +132,8 @@ func addOperationCreateVirtualServiceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteGatewayRoute.go b/service/appmesh/api_op_DeleteGatewayRoute.go index 4716e06cf5e..4c2af7db05b 100644 --- a/service/appmesh/api_op_DeleteGatewayRoute.go +++ b/service/appmesh/api_op_DeleteGatewayRoute.go @@ -71,6 +71,9 @@ func addOperationDeleteGatewayRouteMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,5 +113,8 @@ func addOperationDeleteGatewayRouteMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteMesh.go b/service/appmesh/api_op_DeleteMesh.go index b2fd8faa88a..d56d427f276 100644 --- a/service/appmesh/api_op_DeleteMesh.go +++ b/service/appmesh/api_op_DeleteMesh.go @@ -59,6 +59,9 @@ func addOperationDeleteMeshMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,5 +101,8 @@ func addOperationDeleteMeshMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteRoute.go b/service/appmesh/api_op_DeleteRoute.go index 20f2367cfd9..7ca7e31e606 100644 --- a/service/appmesh/api_op_DeleteRoute.go +++ b/service/appmesh/api_op_DeleteRoute.go @@ -73,6 +73,9 @@ func addOperationDeleteRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,5 +115,8 @@ func addOperationDeleteRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteVirtualGateway.go b/service/appmesh/api_op_DeleteVirtualGateway.go index 0f9910b400f..312378b6a88 100644 --- a/service/appmesh/api_op_DeleteVirtualGateway.go +++ b/service/appmesh/api_op_DeleteVirtualGateway.go @@ -67,6 +67,9 @@ func addOperationDeleteVirtualGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,5 +109,8 @@ func addOperationDeleteVirtualGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteVirtualNode.go b/service/appmesh/api_op_DeleteVirtualNode.go index fcaccc0832f..e3668d0a080 100644 --- a/service/appmesh/api_op_DeleteVirtualNode.go +++ b/service/appmesh/api_op_DeleteVirtualNode.go @@ -70,6 +70,9 @@ func addOperationDeleteVirtualNodeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,5 +112,8 @@ func addOperationDeleteVirtualNodeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteVirtualRouter.go b/service/appmesh/api_op_DeleteVirtualRouter.go index 5685783917f..c00bbf3623c 100644 --- a/service/appmesh/api_op_DeleteVirtualRouter.go +++ b/service/appmesh/api_op_DeleteVirtualRouter.go @@ -69,6 +69,9 @@ func addOperationDeleteVirtualRouterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,5 +111,8 @@ func addOperationDeleteVirtualRouterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DeleteVirtualService.go b/service/appmesh/api_op_DeleteVirtualService.go index efe32d3bfc1..5a00eb861d5 100644 --- a/service/appmesh/api_op_DeleteVirtualService.go +++ b/service/appmesh/api_op_DeleteVirtualService.go @@ -68,6 +68,9 @@ func addOperationDeleteVirtualServiceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,5 +110,8 @@ func addOperationDeleteVirtualServiceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeGatewayRoute.go b/service/appmesh/api_op_DescribeGatewayRoute.go index 2ba19998575..5e86f707a87 100644 --- a/service/appmesh/api_op_DescribeGatewayRoute.go +++ b/service/appmesh/api_op_DescribeGatewayRoute.go @@ -71,6 +71,9 @@ func addOperationDescribeGatewayRouteMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,5 +113,8 @@ func addOperationDescribeGatewayRouteMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeMesh.go b/service/appmesh/api_op_DescribeMesh.go index 000447a5459..c797e533fab 100644 --- a/service/appmesh/api_op_DescribeMesh.go +++ b/service/appmesh/api_op_DescribeMesh.go @@ -63,6 +63,9 @@ func addOperationDescribeMeshMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,5 +105,8 @@ func addOperationDescribeMeshMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeRoute.go b/service/appmesh/api_op_DescribeRoute.go index 65b9da9e05b..59aa887cf48 100644 --- a/service/appmesh/api_op_DescribeRoute.go +++ b/service/appmesh/api_op_DescribeRoute.go @@ -73,6 +73,9 @@ func addOperationDescribeRouteMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,5 +115,8 @@ func addOperationDescribeRouteMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeVirtualGateway.go b/service/appmesh/api_op_DescribeVirtualGateway.go index 5930cec37e8..d0b45e25dc3 100644 --- a/service/appmesh/api_op_DescribeVirtualGateway.go +++ b/service/appmesh/api_op_DescribeVirtualGateway.go @@ -66,6 +66,9 @@ func addOperationDescribeVirtualGatewayMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,5 +108,8 @@ func addOperationDescribeVirtualGatewayMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeVirtualNode.go b/service/appmesh/api_op_DescribeVirtualNode.go index e5a9f461d47..b4ef7ed82be 100644 --- a/service/appmesh/api_op_DescribeVirtualNode.go +++ b/service/appmesh/api_op_DescribeVirtualNode.go @@ -68,6 +68,9 @@ func addOperationDescribeVirtualNodeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,5 +110,8 @@ func addOperationDescribeVirtualNodeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeVirtualRouter.go b/service/appmesh/api_op_DescribeVirtualRouter.go index a58db7c2ba9..c890f1be16c 100644 --- a/service/appmesh/api_op_DescribeVirtualRouter.go +++ b/service/appmesh/api_op_DescribeVirtualRouter.go @@ -68,6 +68,9 @@ func addOperationDescribeVirtualRouterMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,5 +110,8 @@ func addOperationDescribeVirtualRouterMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_DescribeVirtualService.go b/service/appmesh/api_op_DescribeVirtualService.go index a56cb497acc..472f2e142fa 100644 --- a/service/appmesh/api_op_DescribeVirtualService.go +++ b/service/appmesh/api_op_DescribeVirtualService.go @@ -68,6 +68,9 @@ func addOperationDescribeVirtualServiceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,5 +110,8 @@ func addOperationDescribeVirtualServiceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListGatewayRoutes.go b/service/appmesh/api_op_ListGatewayRoutes.go index e02888112fc..05ed0b06a60 100644 --- a/service/appmesh/api_op_ListGatewayRoutes.go +++ b/service/appmesh/api_op_ListGatewayRoutes.go @@ -89,6 +89,9 @@ func addOperationListGatewayRoutesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,5 +131,8 @@ func addOperationListGatewayRoutesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListMeshes.go b/service/appmesh/api_op_ListMeshes.go index 731e1ef1a03..d6c6658f33d 100644 --- a/service/appmesh/api_op_ListMeshes.go +++ b/service/appmesh/api_op_ListMeshes.go @@ -74,6 +74,9 @@ func addOperationListMeshesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,5 +113,8 @@ func addOperationListMeshesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListRoutes.go b/service/appmesh/api_op_ListRoutes.go index 6538741e7c7..fcc2ec4c43b 100644 --- a/service/appmesh/api_op_ListRoutes.go +++ b/service/appmesh/api_op_ListRoutes.go @@ -89,6 +89,9 @@ func addOperationListRoutesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,5 +131,8 @@ func addOperationListRoutesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListTagsForResource.go b/service/appmesh/api_op_ListTagsForResource.go index 12bfea786f6..53646940f8b 100644 --- a/service/appmesh/api_op_ListTagsForResource.go +++ b/service/appmesh/api_op_ListTagsForResource.go @@ -79,6 +79,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListVirtualGateways.go b/service/appmesh/api_op_ListVirtualGateways.go index ca60937709b..673205574b1 100644 --- a/service/appmesh/api_op_ListVirtualGateways.go +++ b/service/appmesh/api_op_ListVirtualGateways.go @@ -82,6 +82,9 @@ func addOperationListVirtualGatewaysMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,5 +124,8 @@ func addOperationListVirtualGatewaysMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListVirtualNodes.go b/service/appmesh/api_op_ListVirtualNodes.go index 565d8b988d6..c1747eb9f3c 100644 --- a/service/appmesh/api_op_ListVirtualNodes.go +++ b/service/appmesh/api_op_ListVirtualNodes.go @@ -84,6 +84,9 @@ func addOperationListVirtualNodesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,5 +126,8 @@ func addOperationListVirtualNodesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListVirtualRouters.go b/service/appmesh/api_op_ListVirtualRouters.go index e13efb84c8b..576c9d41536 100644 --- a/service/appmesh/api_op_ListVirtualRouters.go +++ b/service/appmesh/api_op_ListVirtualRouters.go @@ -84,6 +84,9 @@ func addOperationListVirtualRoutersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,5 +126,8 @@ func addOperationListVirtualRoutersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_ListVirtualServices.go b/service/appmesh/api_op_ListVirtualServices.go index d14042309a6..f1afaaef860 100644 --- a/service/appmesh/api_op_ListVirtualServices.go +++ b/service/appmesh/api_op_ListVirtualServices.go @@ -84,6 +84,9 @@ func addOperationListVirtualServicesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,5 +126,8 @@ func addOperationListVirtualServicesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_TagResource.go b/service/appmesh/api_op_TagResource.go index 605d26c1028..991136ef0b6 100644 --- a/service/appmesh/api_op_TagResource.go +++ b/service/appmesh/api_op_TagResource.go @@ -61,6 +61,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UntagResource.go b/service/appmesh/api_op_UntagResource.go index f2a35c752ec..739daa3247a 100644 --- a/service/appmesh/api_op_UntagResource.go +++ b/service/appmesh/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateGatewayRoute.go b/service/appmesh/api_op_UpdateGatewayRoute.go index 460c49a6f1d..3d056c99c47 100644 --- a/service/appmesh/api_op_UpdateGatewayRoute.go +++ b/service/appmesh/api_op_UpdateGatewayRoute.go @@ -81,6 +81,9 @@ func addOperationUpdateGatewayRouteMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,5 +123,8 @@ func addOperationUpdateGatewayRouteMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateMesh.go b/service/appmesh/api_op_UpdateMesh.go index 455dbba920d..b49170f24c3 100644 --- a/service/appmesh/api_op_UpdateMesh.go +++ b/service/appmesh/api_op_UpdateMesh.go @@ -64,6 +64,9 @@ func addOperationUpdateMeshMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,5 +106,8 @@ func addOperationUpdateMeshMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateRoute.go b/service/appmesh/api_op_UpdateRoute.go index c17dac063a6..9fccb69c661 100644 --- a/service/appmesh/api_op_UpdateRoute.go +++ b/service/appmesh/api_op_UpdateRoute.go @@ -82,6 +82,9 @@ func addOperationUpdateRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,5 +124,8 @@ func addOperationUpdateRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateVirtualGateway.go b/service/appmesh/api_op_UpdateVirtualGateway.go index 7ccef13e904..4c4c99d8a8d 100644 --- a/service/appmesh/api_op_UpdateVirtualGateway.go +++ b/service/appmesh/api_op_UpdateVirtualGateway.go @@ -76,6 +76,9 @@ func addOperationUpdateVirtualGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,5 +118,8 @@ func addOperationUpdateVirtualGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateVirtualNode.go b/service/appmesh/api_op_UpdateVirtualNode.go index c33e40af0db..4f6f13189d4 100644 --- a/service/appmesh/api_op_UpdateVirtualNode.go +++ b/service/appmesh/api_op_UpdateVirtualNode.go @@ -77,6 +77,9 @@ func addOperationUpdateVirtualNodeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,5 +119,8 @@ func addOperationUpdateVirtualNodeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateVirtualRouter.go b/service/appmesh/api_op_UpdateVirtualRouter.go index ea2ee75061d..1aaae8fad58 100644 --- a/service/appmesh/api_op_UpdateVirtualRouter.go +++ b/service/appmesh/api_op_UpdateVirtualRouter.go @@ -78,6 +78,9 @@ func addOperationUpdateVirtualRouterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,5 +120,8 @@ func addOperationUpdateVirtualRouterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/api_op_UpdateVirtualService.go b/service/appmesh/api_op_UpdateVirtualService.go index 5e108cd5edc..78eac2afb63 100644 --- a/service/appmesh/api_op_UpdateVirtualService.go +++ b/service/appmesh/api_op_UpdateVirtualService.go @@ -78,6 +78,9 @@ func addOperationUpdateVirtualServiceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,5 +120,8 @@ func addOperationUpdateVirtualServiceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appmesh/go.mod b/service/appmesh/go.mod index 221be32156e..3cce4c21e01 100644 --- a/service/appmesh/go.mod +++ b/service/appmesh/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/appmesh go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appmesh/go.sum b/service/appmesh/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/appmesh/go.sum +++ b/service/appmesh/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appstream/api_client.go b/service/appstream/api_client.go index 315ff3687d9..15616e59b81 100644 --- a/service/appstream/api_client.go +++ b/service/appstream/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/appstream/api_op_AssociateFleet.go b/service/appstream/api_op_AssociateFleet.go index 9b19993e33a..ce850ef050f 100644 --- a/service/appstream/api_op_AssociateFleet.go +++ b/service/appstream/api_op_AssociateFleet.go @@ -53,6 +53,9 @@ func addOperationAssociateFleetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateFleetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_BatchAssociateUserStack.go b/service/appstream/api_op_BatchAssociateUserStack.go index 5af1aa0beda..205669a31d1 100644 --- a/service/appstream/api_op_BatchAssociateUserStack.go +++ b/service/appstream/api_op_BatchAssociateUserStack.go @@ -55,6 +55,9 @@ func addOperationBatchAssociateUserStackMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationBatchAssociateUserStackMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_BatchDisassociateUserStack.go b/service/appstream/api_op_BatchDisassociateUserStack.go index 9ca5ff26aad..19b2588c89a 100644 --- a/service/appstream/api_op_BatchDisassociateUserStack.go +++ b/service/appstream/api_op_BatchDisassociateUserStack.go @@ -53,6 +53,9 @@ func addOperationBatchDisassociateUserStackMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationBatchDisassociateUserStackMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CopyImage.go b/service/appstream/api_op_CopyImage.go index d9fe8496b20..3a12e69df07 100644 --- a/service/appstream/api_op_CopyImage.go +++ b/service/appstream/api_op_CopyImage.go @@ -67,6 +67,9 @@ func addOperationCopyImageMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCopyImageMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateDirectoryConfig.go b/service/appstream/api_op_CreateDirectoryConfig.go index 963d8707451..a6bd46ff9b6 100644 --- a/service/appstream/api_op_CreateDirectoryConfig.go +++ b/service/appstream/api_op_CreateDirectoryConfig.go @@ -64,6 +64,9 @@ func addOperationCreateDirectoryConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateDirectoryConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateFleet.go b/service/appstream/api_op_CreateFleet.go index 1ec2e587f70..f1194d9b80a 100644 --- a/service/appstream/api_op_CreateFleet.go +++ b/service/appstream/api_op_CreateFleet.go @@ -234,6 +234,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -276,6 +279,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateImageBuilder.go b/service/appstream/api_op_CreateImageBuilder.go index 600987989b3..c5a8c0f736b 100644 --- a/service/appstream/api_op_CreateImageBuilder.go +++ b/service/appstream/api_op_CreateImageBuilder.go @@ -191,6 +191,9 @@ func addOperationCreateImageBuilderMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -233,6 +236,9 @@ func addOperationCreateImageBuilderMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateImageBuilderStreamingURL.go b/service/appstream/api_op_CreateImageBuilderStreamingURL.go index 45cf2288b92..05e61046869 100644 --- a/service/appstream/api_op_CreateImageBuilderStreamingURL.go +++ b/service/appstream/api_op_CreateImageBuilderStreamingURL.go @@ -60,6 +60,9 @@ func addOperationCreateImageBuilderStreamingURLMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateImageBuilderStreamingURLMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateStack.go b/service/appstream/api_op_CreateStack.go index 2687e4798f6..9d9ca8086c8 100644 --- a/service/appstream/api_op_CreateStack.go +++ b/service/appstream/api_op_CreateStack.go @@ -98,6 +98,9 @@ func addOperationCreateStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateStreamingURL.go b/service/appstream/api_op_CreateStreamingURL.go index 0fbb82a47cc..50fc91e239d 100644 --- a/service/appstream/api_op_CreateStreamingURL.go +++ b/service/appstream/api_op_CreateStreamingURL.go @@ -81,6 +81,9 @@ func addOperationCreateStreamingURLMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateStreamingURLMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateUsageReportSubscription.go b/service/appstream/api_op_CreateUsageReportSubscription.go index 2d20019b1fe..0ed924315ad 100644 --- a/service/appstream/api_op_CreateUsageReportSubscription.go +++ b/service/appstream/api_op_CreateUsageReportSubscription.go @@ -57,6 +57,9 @@ func addOperationCreateUsageReportSubscriptionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationCreateUsageReportSubscriptionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_CreateUser.go b/service/appstream/api_op_CreateUser.go index 99afb0a6d94..c26afbb0d3c 100644 --- a/service/appstream/api_op_CreateUser.go +++ b/service/appstream/api_op_CreateUser.go @@ -71,6 +71,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteDirectoryConfig.go b/service/appstream/api_op_DeleteDirectoryConfig.go index f4666dcbbb3..087c934e36d 100644 --- a/service/appstream/api_op_DeleteDirectoryConfig.go +++ b/service/appstream/api_op_DeleteDirectoryConfig.go @@ -50,6 +50,9 @@ func addOperationDeleteDirectoryConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteDirectoryConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteFleet.go b/service/appstream/api_op_DeleteFleet.go index e26a25e19c3..654e5a2094d 100644 --- a/service/appstream/api_op_DeleteFleet.go +++ b/service/appstream/api_op_DeleteFleet.go @@ -48,6 +48,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteImage.go b/service/appstream/api_op_DeleteImage.go index 981f42dcc77..80cef8d3656 100644 --- a/service/appstream/api_op_DeleteImage.go +++ b/service/appstream/api_op_DeleteImage.go @@ -54,6 +54,9 @@ func addOperationDeleteImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteImageBuilder.go b/service/appstream/api_op_DeleteImageBuilder.go index 84ae30ef925..f8849bae7ad 100644 --- a/service/appstream/api_op_DeleteImageBuilder.go +++ b/service/appstream/api_op_DeleteImageBuilder.go @@ -53,6 +53,9 @@ func addOperationDeleteImageBuilderMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteImageBuilderMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteImagePermissions.go b/service/appstream/api_op_DeleteImagePermissions.go index 229ccf87d63..8d54439f43e 100644 --- a/service/appstream/api_op_DeleteImagePermissions.go +++ b/service/appstream/api_op_DeleteImagePermissions.go @@ -56,6 +56,9 @@ func addOperationDeleteImagePermissionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteImagePermissionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteStack.go b/service/appstream/api_op_DeleteStack.go index d7970191d32..dd508f4f2b4 100644 --- a/service/appstream/api_op_DeleteStack.go +++ b/service/appstream/api_op_DeleteStack.go @@ -51,6 +51,9 @@ func addOperationDeleteStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteUsageReportSubscription.go b/service/appstream/api_op_DeleteUsageReportSubscription.go index 5f2fee85787..ab05d56e385 100644 --- a/service/appstream/api_op_DeleteUsageReportSubscription.go +++ b/service/appstream/api_op_DeleteUsageReportSubscription.go @@ -43,6 +43,9 @@ func addOperationDeleteUsageReportSubscriptionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationDeleteUsageReportSubscriptionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DeleteUser.go b/service/appstream/api_op_DeleteUser.go index 1dd7e111afd..36c5245b924 100644 --- a/service/appstream/api_op_DeleteUser.go +++ b/service/appstream/api_op_DeleteUser.go @@ -54,6 +54,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeDirectoryConfigs.go b/service/appstream/api_op_DescribeDirectoryConfigs.go index a92a4cbc7bf..ec75cc6a624 100644 --- a/service/appstream/api_op_DescribeDirectoryConfigs.go +++ b/service/appstream/api_op_DescribeDirectoryConfigs.go @@ -70,6 +70,9 @@ func addOperationDescribeDirectoryConfigsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeDirectoryConfigsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeFleets.go b/service/appstream/api_op_DescribeFleets.go index c8ea3cb9a9b..14d82dbb0d9 100644 --- a/service/appstream/api_op_DescribeFleets.go +++ b/service/appstream/api_op_DescribeFleets.go @@ -60,6 +60,9 @@ func addOperationDescribeFleetsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeFleetsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeImageBuilders.go b/service/appstream/api_op_DescribeImageBuilders.go index 746232cf75b..96cb8be23fb 100644 --- a/service/appstream/api_op_DescribeImageBuilders.go +++ b/service/appstream/api_op_DescribeImageBuilders.go @@ -64,6 +64,9 @@ func addOperationDescribeImageBuildersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeImageBuildersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeImagePermissions.go b/service/appstream/api_op_DescribeImagePermissions.go index 9641bd2d4d4..b154f4e21a2 100644 --- a/service/appstream/api_op_DescribeImagePermissions.go +++ b/service/appstream/api_op_DescribeImagePermissions.go @@ -73,6 +73,9 @@ func addOperationDescribeImagePermissionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeImagePermissionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeImages.go b/service/appstream/api_op_DescribeImages.go index ad010e67866..f75084dff55 100644 --- a/service/appstream/api_op_DescribeImages.go +++ b/service/appstream/api_op_DescribeImages.go @@ -69,6 +69,9 @@ func addOperationDescribeImagesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeImagesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeSessions.go b/service/appstream/api_op_DescribeSessions.go index e26b55b308a..0ac621b64f9 100644 --- a/service/appstream/api_op_DescribeSessions.go +++ b/service/appstream/api_op_DescribeSessions.go @@ -82,6 +82,9 @@ func addOperationDescribeSessionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeSessionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeStacks.go b/service/appstream/api_op_DescribeStacks.go index e1676847491..ae4bebdcfa5 100644 --- a/service/appstream/api_op_DescribeStacks.go +++ b/service/appstream/api_op_DescribeStacks.go @@ -60,6 +60,9 @@ func addOperationDescribeStacksMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeStacksMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeUsageReportSubscriptions.go b/service/appstream/api_op_DescribeUsageReportSubscriptions.go index 3eca9e346cb..4c56a86d45f 100644 --- a/service/appstream/api_op_DescribeUsageReportSubscriptions.go +++ b/service/appstream/api_op_DescribeUsageReportSubscriptions.go @@ -59,6 +59,9 @@ func addOperationDescribeUsageReportSubscriptionsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeUsageReportSubscriptionsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeUserStackAssociations.go b/service/appstream/api_op_DescribeUserStackAssociations.go index 8830886a3c9..f50f784115c 100644 --- a/service/appstream/api_op_DescribeUserStackAssociations.go +++ b/service/appstream/api_op_DescribeUserStackAssociations.go @@ -77,6 +77,9 @@ func addOperationDescribeUserStackAssociationsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeUserStackAssociationsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DescribeUsers.go b/service/appstream/api_op_DescribeUsers.go index fdf720d20a7..88f1dacefcd 100644 --- a/service/appstream/api_op_DescribeUsers.go +++ b/service/appstream/api_op_DescribeUsers.go @@ -65,6 +65,9 @@ func addOperationDescribeUsersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeUsersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DisableUser.go b/service/appstream/api_op_DisableUser.go index 9cb4cd208c0..5a965a06ee4 100644 --- a/service/appstream/api_op_DisableUser.go +++ b/service/appstream/api_op_DisableUser.go @@ -55,6 +55,9 @@ func addOperationDisableUserMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisableUserMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_DisassociateFleet.go b/service/appstream/api_op_DisassociateFleet.go index 276b18db4c2..835e03a1329 100644 --- a/service/appstream/api_op_DisassociateFleet.go +++ b/service/appstream/api_op_DisassociateFleet.go @@ -53,6 +53,9 @@ func addOperationDisassociateFleetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDisassociateFleetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_EnableUser.go b/service/appstream/api_op_EnableUser.go index 9f5b7d027a8..dc56132071b 100644 --- a/service/appstream/api_op_EnableUser.go +++ b/service/appstream/api_op_EnableUser.go @@ -58,6 +58,9 @@ func addOperationEnableUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationEnableUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_ExpireSession.go b/service/appstream/api_op_ExpireSession.go index f1ec019ced1..9a1860d16f4 100644 --- a/service/appstream/api_op_ExpireSession.go +++ b/service/appstream/api_op_ExpireSession.go @@ -48,6 +48,9 @@ func addOperationExpireSessionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationExpireSessionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_ListAssociatedFleets.go b/service/appstream/api_op_ListAssociatedFleets.go index 3d79deef437..28ef8b9e562 100644 --- a/service/appstream/api_op_ListAssociatedFleets.go +++ b/service/appstream/api_op_ListAssociatedFleets.go @@ -60,6 +60,9 @@ func addOperationListAssociatedFleetsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListAssociatedFleetsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_ListAssociatedStacks.go b/service/appstream/api_op_ListAssociatedStacks.go index 56b70d72a38..f02f3e17030 100644 --- a/service/appstream/api_op_ListAssociatedStacks.go +++ b/service/appstream/api_op_ListAssociatedStacks.go @@ -60,6 +60,9 @@ func addOperationListAssociatedStacksMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListAssociatedStacksMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_ListTagsForResource.go b/service/appstream/api_op_ListTagsForResource.go index 6ae5042842b..bc7b4dbbe5d 100644 --- a/service/appstream/api_op_ListTagsForResource.go +++ b/service/appstream/api_op_ListTagsForResource.go @@ -56,6 +56,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_StartFleet.go b/service/appstream/api_op_StartFleet.go index 591460cf4fc..4a0026dc3f7 100644 --- a/service/appstream/api_op_StartFleet.go +++ b/service/appstream/api_op_StartFleet.go @@ -48,6 +48,9 @@ func addOperationStartFleetMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStartFleetMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_StartImageBuilder.go b/service/appstream/api_op_StartImageBuilder.go index 1ffba7f6c8d..ee645bf719c 100644 --- a/service/appstream/api_op_StartImageBuilder.go +++ b/service/appstream/api_op_StartImageBuilder.go @@ -57,6 +57,9 @@ func addOperationStartImageBuilderMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationStartImageBuilderMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_StopFleet.go b/service/appstream/api_op_StopFleet.go index 79a0d7d6b97..cb919d5bde3 100644 --- a/service/appstream/api_op_StopFleet.go +++ b/service/appstream/api_op_StopFleet.go @@ -48,6 +48,9 @@ func addOperationStopFleetMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopFleetMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_StopImageBuilder.go b/service/appstream/api_op_StopImageBuilder.go index 305a2ef66ae..540d34c3044 100644 --- a/service/appstream/api_op_StopImageBuilder.go +++ b/service/appstream/api_op_StopImageBuilder.go @@ -53,6 +53,9 @@ func addOperationStopImageBuilderMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopImageBuilderMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_TagResource.go b/service/appstream/api_op_TagResource.go index f9515c1d957..c2d6f36166d 100644 --- a/service/appstream/api_op_TagResource.go +++ b/service/appstream/api_op_TagResource.go @@ -65,6 +65,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_UntagResource.go b/service/appstream/api_op_UntagResource.go index 32f41a432a9..45ebf1a04e9 100644 --- a/service/appstream/api_op_UntagResource.go +++ b/service/appstream/api_op_UntagResource.go @@ -57,6 +57,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_UpdateDirectoryConfig.go b/service/appstream/api_op_UpdateDirectoryConfig.go index ac76e307c4d..a94271ade6a 100644 --- a/service/appstream/api_op_UpdateDirectoryConfig.go +++ b/service/appstream/api_op_UpdateDirectoryConfig.go @@ -62,6 +62,9 @@ func addOperationUpdateDirectoryConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateDirectoryConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_UpdateFleet.go b/service/appstream/api_op_UpdateFleet.go index b83dba3dc1a..4258ea83cdf 100644 --- a/service/appstream/api_op_UpdateFleet.go +++ b/service/appstream/api_op_UpdateFleet.go @@ -219,6 +219,9 @@ func addOperationUpdateFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -261,6 +264,9 @@ func addOperationUpdateFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_UpdateImagePermissions.go b/service/appstream/api_op_UpdateImagePermissions.go index 7d7dbd7b764..f06572bf508 100644 --- a/service/appstream/api_op_UpdateImagePermissions.go +++ b/service/appstream/api_op_UpdateImagePermissions.go @@ -60,6 +60,9 @@ func addOperationUpdateImagePermissionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateImagePermissionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/api_op_UpdateStack.go b/service/appstream/api_op_UpdateStack.go index 23ba8afeaef..2f3079955bf 100644 --- a/service/appstream/api_op_UpdateStack.go +++ b/service/appstream/api_op_UpdateStack.go @@ -93,6 +93,9 @@ func addOperationUpdateStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationUpdateStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appstream/go.mod b/service/appstream/go.mod index b5fd1dc063f..b5be4139798 100644 --- a/service/appstream/go.mod +++ b/service/appstream/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/appstream go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appstream/go.sum b/service/appstream/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/appstream/go.sum +++ b/service/appstream/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appsync/api_client.go b/service/appsync/api_client.go index d21a324cfcf..445c53898f7 100644 --- a/service/appsync/api_client.go +++ b/service/appsync/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/appsync/api_op_CreateApiCache.go b/service/appsync/api_op_CreateApiCache.go index 63f08ac9185..ae3e1e512d4 100644 --- a/service/appsync/api_op_CreateApiCache.go +++ b/service/appsync/api_op_CreateApiCache.go @@ -123,6 +123,9 @@ func addOperationCreateApiCacheMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationCreateApiCacheMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_CreateApiKey.go b/service/appsync/api_op_CreateApiKey.go index 1a266e744ef..bd527ed7e2f 100644 --- a/service/appsync/api_op_CreateApiKey.go +++ b/service/appsync/api_op_CreateApiKey.go @@ -63,6 +63,9 @@ func addOperationCreateApiKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateApiKeyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_CreateDataSource.go b/service/appsync/api_op_CreateDataSource.go index 4e07759168d..439461c42dd 100644 --- a/service/appsync/api_op_CreateDataSource.go +++ b/service/appsync/api_op_CreateDataSource.go @@ -85,6 +85,9 @@ func addOperationCreateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_CreateFunction.go b/service/appsync/api_op_CreateFunction.go index b89cfd50059..503d6d49c39 100644 --- a/service/appsync/api_op_CreateFunction.go +++ b/service/appsync/api_op_CreateFunction.go @@ -80,6 +80,9 @@ func addOperationCreateFunctionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateFunctionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_CreateGraphqlApi.go b/service/appsync/api_op_CreateGraphqlApi.go index 7252c024c4b..5428f33fca1 100644 --- a/service/appsync/api_op_CreateGraphqlApi.go +++ b/service/appsync/api_op_CreateGraphqlApi.go @@ -76,6 +76,9 @@ func addOperationCreateGraphqlApiMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateGraphqlApiMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_CreateResolver.go b/service/appsync/api_op_CreateResolver.go index bd4b3446f90..c30ef8a9448 100644 --- a/service/appsync/api_op_CreateResolver.go +++ b/service/appsync/api_op_CreateResolver.go @@ -99,6 +99,9 @@ func addOperationCreateResolverMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreateResolverMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_CreateType.go b/service/appsync/api_op_CreateType.go index c1ffda21a31..2cbfcd93dd2 100644 --- a/service/appsync/api_op_CreateType.go +++ b/service/appsync/api_op_CreateType.go @@ -65,6 +65,9 @@ func addOperationCreateTypeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateTypeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteApiCache.go b/service/appsync/api_op_DeleteApiCache.go index 72a7507cfda..228ac51ce05 100644 --- a/service/appsync/api_op_DeleteApiCache.go +++ b/service/appsync/api_op_DeleteApiCache.go @@ -50,6 +50,9 @@ func addOperationDeleteApiCacheMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteApiCacheMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteApiKey.go b/service/appsync/api_op_DeleteApiKey.go index 9ab61fb225e..2a4e3f199ea 100644 --- a/service/appsync/api_op_DeleteApiKey.go +++ b/service/appsync/api_op_DeleteApiKey.go @@ -53,6 +53,9 @@ func addOperationDeleteApiKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteApiKeyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteDataSource.go b/service/appsync/api_op_DeleteDataSource.go index 7bb98140ef0..8fd76013a9a 100644 --- a/service/appsync/api_op_DeleteDataSource.go +++ b/service/appsync/api_op_DeleteDataSource.go @@ -53,6 +53,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteFunction.go b/service/appsync/api_op_DeleteFunction.go index a1ec3adbfca..c90f2b22e3b 100644 --- a/service/appsync/api_op_DeleteFunction.go +++ b/service/appsync/api_op_DeleteFunction.go @@ -53,6 +53,9 @@ func addOperationDeleteFunctionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteFunctionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteGraphqlApi.go b/service/appsync/api_op_DeleteGraphqlApi.go index 702f4e193b4..98ff16b4970 100644 --- a/service/appsync/api_op_DeleteGraphqlApi.go +++ b/service/appsync/api_op_DeleteGraphqlApi.go @@ -48,6 +48,9 @@ func addOperationDeleteGraphqlApiMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteGraphqlApiMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteResolver.go b/service/appsync/api_op_DeleteResolver.go index 36221b21e4d..89383c1f6ed 100644 --- a/service/appsync/api_op_DeleteResolver.go +++ b/service/appsync/api_op_DeleteResolver.go @@ -58,6 +58,9 @@ func addOperationDeleteResolverMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteResolverMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_DeleteType.go b/service/appsync/api_op_DeleteType.go index 2baa2af11a4..a9b45200718 100644 --- a/service/appsync/api_op_DeleteType.go +++ b/service/appsync/api_op_DeleteType.go @@ -53,6 +53,9 @@ func addOperationDeleteTypeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteTypeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_FlushApiCache.go b/service/appsync/api_op_FlushApiCache.go index 03a533128ef..7b6f887310f 100644 --- a/service/appsync/api_op_FlushApiCache.go +++ b/service/appsync/api_op_FlushApiCache.go @@ -50,6 +50,9 @@ func addOperationFlushApiCacheMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationFlushApiCacheMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetApiCache.go b/service/appsync/api_op_GetApiCache.go index bba932d7197..4414a452e41 100644 --- a/service/appsync/api_op_GetApiCache.go +++ b/service/appsync/api_op_GetApiCache.go @@ -55,6 +55,9 @@ func addOperationGetApiCacheMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetApiCacheMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetDataSource.go b/service/appsync/api_op_GetDataSource.go index 50803356038..a1b0f092af1 100644 --- a/service/appsync/api_op_GetDataSource.go +++ b/service/appsync/api_op_GetDataSource.go @@ -58,6 +58,9 @@ func addOperationGetDataSourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDataSourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetFunction.go b/service/appsync/api_op_GetFunction.go index 353cc47cdc3..86cec05d877 100644 --- a/service/appsync/api_op_GetFunction.go +++ b/service/appsync/api_op_GetFunction.go @@ -58,6 +58,9 @@ func addOperationGetFunctionMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetFunctionMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetGraphqlApi.go b/service/appsync/api_op_GetGraphqlApi.go index 117cd2f830f..ae32efc3cd5 100644 --- a/service/appsync/api_op_GetGraphqlApi.go +++ b/service/appsync/api_op_GetGraphqlApi.go @@ -53,6 +53,9 @@ func addOperationGetGraphqlApiMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetGraphqlApiMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetIntrospectionSchema.go b/service/appsync/api_op_GetIntrospectionSchema.go index 9f3760fc2e7..0cb812fd78f 100644 --- a/service/appsync/api_op_GetIntrospectionSchema.go +++ b/service/appsync/api_op_GetIntrospectionSchema.go @@ -64,6 +64,9 @@ func addOperationGetIntrospectionSchemaMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetIntrospectionSchemaMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetResolver.go b/service/appsync/api_op_GetResolver.go index 32b2ffa82b6..db4baaa3056 100644 --- a/service/appsync/api_op_GetResolver.go +++ b/service/appsync/api_op_GetResolver.go @@ -63,6 +63,9 @@ func addOperationGetResolverMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetResolverMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetSchemaCreationStatus.go b/service/appsync/api_op_GetSchemaCreationStatus.go index b02c59d947b..7c8c33126eb 100644 --- a/service/appsync/api_op_GetSchemaCreationStatus.go +++ b/service/appsync/api_op_GetSchemaCreationStatus.go @@ -57,6 +57,9 @@ func addOperationGetSchemaCreationStatusMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetSchemaCreationStatusMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_GetType.go b/service/appsync/api_op_GetType.go index c948cbe886f..b5e78bcf1a4 100644 --- a/service/appsync/api_op_GetType.go +++ b/service/appsync/api_op_GetType.go @@ -63,6 +63,9 @@ func addOperationGetTypeMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetTypeMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListApiKeys.go b/service/appsync/api_op_ListApiKeys.go index 37638a14983..3a1a0b7e466 100644 --- a/service/appsync/api_op_ListApiKeys.go +++ b/service/appsync/api_op_ListApiKeys.go @@ -67,6 +67,9 @@ func addOperationListApiKeysMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListApiKeysMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListDataSources.go b/service/appsync/api_op_ListDataSources.go index 5a9b47f3e25..f8d1b9e1153 100644 --- a/service/appsync/api_op_ListDataSources.go +++ b/service/appsync/api_op_ListDataSources.go @@ -64,6 +64,9 @@ func addOperationListDataSourcesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDataSourcesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListFunctions.go b/service/appsync/api_op_ListFunctions.go index a0716954bdd..699ceb1693a 100644 --- a/service/appsync/api_op_ListFunctions.go +++ b/service/appsync/api_op_ListFunctions.go @@ -64,6 +64,9 @@ func addOperationListFunctionsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListFunctionsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListGraphqlApis.go b/service/appsync/api_op_ListGraphqlApis.go index 04aa47f9812..eccefd8ebc5 100644 --- a/service/appsync/api_op_ListGraphqlApis.go +++ b/service/appsync/api_op_ListGraphqlApis.go @@ -59,6 +59,9 @@ func addOperationListGraphqlApisMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListGraphqlApisMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListResolvers.go b/service/appsync/api_op_ListResolvers.go index ed932744630..8819ce3a96f 100644 --- a/service/appsync/api_op_ListResolvers.go +++ b/service/appsync/api_op_ListResolvers.go @@ -69,6 +69,9 @@ func addOperationListResolversMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListResolversMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListResolversByFunction.go b/service/appsync/api_op_ListResolversByFunction.go index d3ce21d82a8..ee971326dfd 100644 --- a/service/appsync/api_op_ListResolversByFunction.go +++ b/service/appsync/api_op_ListResolversByFunction.go @@ -68,6 +68,9 @@ func addOperationListResolversByFunctionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListResolversByFunctionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListTagsForResource.go b/service/appsync/api_op_ListTagsForResource.go index 87c22f80a34..2ee7ae21bec 100644 --- a/service/appsync/api_op_ListTagsForResource.go +++ b/service/appsync/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_ListTypes.go b/service/appsync/api_op_ListTypes.go index 4a4ed310ee4..626f0663a23 100644 --- a/service/appsync/api_op_ListTypes.go +++ b/service/appsync/api_op_ListTypes.go @@ -69,6 +69,9 @@ func addOperationListTypesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListTypesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_StartSchemaCreation.go b/service/appsync/api_op_StartSchemaCreation.go index b8148bb398d..d26eac8d66c 100644 --- a/service/appsync/api_op_StartSchemaCreation.go +++ b/service/appsync/api_op_StartSchemaCreation.go @@ -60,6 +60,9 @@ func addOperationStartSchemaCreationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationStartSchemaCreationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_TagResource.go b/service/appsync/api_op_TagResource.go index 3dc22a8bb13..049e48c8808 100644 --- a/service/appsync/api_op_TagResource.go +++ b/service/appsync/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UntagResource.go b/service/appsync/api_op_UntagResource.go index cf736d6d9de..32da25eaf77 100644 --- a/service/appsync/api_op_UntagResource.go +++ b/service/appsync/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateApiCache.go b/service/appsync/api_op_UpdateApiCache.go index a22990e3586..e626940b92c 100644 --- a/service/appsync/api_op_UpdateApiCache.go +++ b/service/appsync/api_op_UpdateApiCache.go @@ -115,6 +115,9 @@ func addOperationUpdateApiCacheMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateApiCacheMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateApiKey.go b/service/appsync/api_op_UpdateApiKey.go index 4ab051575bd..4591ca0e0ac 100644 --- a/service/appsync/api_op_UpdateApiKey.go +++ b/service/appsync/api_op_UpdateApiKey.go @@ -65,6 +65,9 @@ func addOperationUpdateApiKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateApiKeyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateDataSource.go b/service/appsync/api_op_UpdateDataSource.go index e1b1eaff1ca..cfb16a454ed 100644 --- a/service/appsync/api_op_UpdateDataSource.go +++ b/service/appsync/api_op_UpdateDataSource.go @@ -84,6 +84,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateFunction.go b/service/appsync/api_op_UpdateFunction.go index 41211148d84..2abc33595a1 100644 --- a/service/appsync/api_op_UpdateFunction.go +++ b/service/appsync/api_op_UpdateFunction.go @@ -84,6 +84,9 @@ func addOperationUpdateFunctionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateFunctionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateGraphqlApi.go b/service/appsync/api_op_UpdateGraphqlApi.go index c448d0b8e5c..0f1c1aa6121 100644 --- a/service/appsync/api_op_UpdateGraphqlApi.go +++ b/service/appsync/api_op_UpdateGraphqlApi.go @@ -76,6 +76,9 @@ func addOperationUpdateGraphqlApiMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateGraphqlApiMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateResolver.go b/service/appsync/api_op_UpdateResolver.go index 8f14224a983..59f51d23c98 100644 --- a/service/appsync/api_op_UpdateResolver.go +++ b/service/appsync/api_op_UpdateResolver.go @@ -96,6 +96,9 @@ func addOperationUpdateResolverMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationUpdateResolverMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/api_op_UpdateType.go b/service/appsync/api_op_UpdateType.go index 2cdbfe8ddb5..5817f20428f 100644 --- a/service/appsync/api_op_UpdateType.go +++ b/service/appsync/api_op_UpdateType.go @@ -66,6 +66,9 @@ func addOperationUpdateTypeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateTypeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/appsync/go.mod b/service/appsync/go.mod index ea1e9a291b4..ebaa7c04025 100644 --- a/service/appsync/go.mod +++ b/service/appsync/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/appsync go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appsync/go.sum b/service/appsync/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/appsync/go.sum +++ b/service/appsync/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/athena/api_client.go b/service/athena/api_client.go index a0f77ede416..58ae96fa33a 100644 --- a/service/athena/api_client.go +++ b/service/athena/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/athena/api_op_BatchGetNamedQuery.go b/service/athena/api_op_BatchGetNamedQuery.go index 6b72a3079f6..fdcd04e1675 100644 --- a/service/athena/api_op_BatchGetNamedQuery.go +++ b/service/athena/api_op_BatchGetNamedQuery.go @@ -63,6 +63,9 @@ func addOperationBatchGetNamedQueryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationBatchGetNamedQueryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_BatchGetQueryExecution.go b/service/athena/api_op_BatchGetQueryExecution.go index b8e28aa7021..8e7e4f96245 100644 --- a/service/athena/api_op_BatchGetQueryExecution.go +++ b/service/athena/api_op_BatchGetQueryExecution.go @@ -61,6 +61,9 @@ func addOperationBatchGetQueryExecutionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationBatchGetQueryExecutionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_CreateDataCatalog.go b/service/athena/api_op_CreateDataCatalog.go index 1ad6deabad4..ffe6a3be507 100644 --- a/service/athena/api_op_CreateDataCatalog.go +++ b/service/athena/api_op_CreateDataCatalog.go @@ -88,6 +88,9 @@ func addOperationCreateDataCatalogMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateDataCatalogMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_CreateNamedQuery.go b/service/athena/api_op_CreateNamedQuery.go index 539636a89a6..4393babeebc 100644 --- a/service/athena/api_op_CreateNamedQuery.go +++ b/service/athena/api_op_CreateNamedQuery.go @@ -81,6 +81,9 @@ func addOperationCreateNamedQueryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateNamedQueryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_CreateWorkGroup.go b/service/athena/api_op_CreateWorkGroup.go index ea019cbdaac..8212526ab43 100644 --- a/service/athena/api_op_CreateWorkGroup.go +++ b/service/athena/api_op_CreateWorkGroup.go @@ -64,6 +64,9 @@ func addOperationCreateWorkGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateWorkGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_DeleteDataCatalog.go b/service/athena/api_op_DeleteDataCatalog.go index 4384581a17b..02ca13724cd 100644 --- a/service/athena/api_op_DeleteDataCatalog.go +++ b/service/athena/api_op_DeleteDataCatalog.go @@ -48,6 +48,9 @@ func addOperationDeleteDataCatalogMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDataCatalogMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_DeleteNamedQuery.go b/service/athena/api_op_DeleteNamedQuery.go index 397da00f6f6..76acee0ee36 100644 --- a/service/athena/api_op_DeleteNamedQuery.go +++ b/service/athena/api_op_DeleteNamedQuery.go @@ -52,6 +52,9 @@ func addOperationDeleteNamedQueryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteNamedQueryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_DeleteWorkGroup.go b/service/athena/api_op_DeleteWorkGroup.go index 58ec8399cca..c312fe27ad6 100644 --- a/service/athena/api_op_DeleteWorkGroup.go +++ b/service/athena/api_op_DeleteWorkGroup.go @@ -53,6 +53,9 @@ func addOperationDeleteWorkGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteWorkGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetDataCatalog.go b/service/athena/api_op_GetDataCatalog.go index 8beebbd8794..09bfd423d14 100644 --- a/service/athena/api_op_GetDataCatalog.go +++ b/service/athena/api_op_GetDataCatalog.go @@ -53,6 +53,9 @@ func addOperationGetDataCatalogMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetDataCatalogMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetDatabase.go b/service/athena/api_op_GetDatabase.go index 37bb13714f9..1050793077d 100644 --- a/service/athena/api_op_GetDatabase.go +++ b/service/athena/api_op_GetDatabase.go @@ -58,6 +58,9 @@ func addOperationGetDatabaseMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDatabaseMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetNamedQuery.go b/service/athena/api_op_GetNamedQuery.go index a0a58d012ab..58392d154e3 100644 --- a/service/athena/api_op_GetNamedQuery.go +++ b/service/athena/api_op_GetNamedQuery.go @@ -54,6 +54,9 @@ func addOperationGetNamedQueryMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetNamedQueryMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetQueryExecution.go b/service/athena/api_op_GetQueryExecution.go index 6b3225821b5..820da51ce90 100644 --- a/service/athena/api_op_GetQueryExecution.go +++ b/service/athena/api_op_GetQueryExecution.go @@ -55,6 +55,9 @@ func addOperationGetQueryExecutionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetQueryExecutionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetQueryResults.go b/service/athena/api_op_GetQueryResults.go index f9524f662fa..7ce9a9af21d 100644 --- a/service/athena/api_op_GetQueryResults.go +++ b/service/athena/api_op_GetQueryResults.go @@ -80,6 +80,9 @@ func addOperationGetQueryResultsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetQueryResultsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetTableMetadata.go b/service/athena/api_op_GetTableMetadata.go index 9d31f3177e7..c41a0e1c994 100644 --- a/service/athena/api_op_GetTableMetadata.go +++ b/service/athena/api_op_GetTableMetadata.go @@ -64,6 +64,9 @@ func addOperationGetTableMetadataMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetTableMetadataMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_GetWorkGroup.go b/service/athena/api_op_GetWorkGroup.go index 5a0df77e831..776ff04274e 100644 --- a/service/athena/api_op_GetWorkGroup.go +++ b/service/athena/api_op_GetWorkGroup.go @@ -53,6 +53,9 @@ func addOperationGetWorkGroupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetWorkGroupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListDataCatalogs.go b/service/athena/api_op_ListDataCatalogs.go index 264039f37e3..3d61da89b84 100644 --- a/service/athena/api_op_ListDataCatalogs.go +++ b/service/athena/api_op_ListDataCatalogs.go @@ -61,6 +61,9 @@ func addOperationListDataCatalogsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListDataCatalogsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListDatabases.go b/service/athena/api_op_ListDatabases.go index b228331f67e..08b7bf21fab 100644 --- a/service/athena/api_op_ListDatabases.go +++ b/service/athena/api_op_ListDatabases.go @@ -66,6 +66,9 @@ func addOperationListDatabasesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListDatabasesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListNamedQueries.go b/service/athena/api_op_ListNamedQueries.go index 8fcb47d335d..9a75898cc31 100644 --- a/service/athena/api_op_ListNamedQueries.go +++ b/service/athena/api_op_ListNamedQueries.go @@ -70,6 +70,9 @@ func addOperationListNamedQueriesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListNamedQueriesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListQueryExecutions.go b/service/athena/api_op_ListQueryExecutions.go index ccd1e8e735f..8ee63c604b2 100644 --- a/service/athena/api_op_ListQueryExecutions.go +++ b/service/athena/api_op_ListQueryExecutions.go @@ -69,6 +69,9 @@ func addOperationListQueryExecutionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListQueryExecutionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListTableMetadata.go b/service/athena/api_op_ListTableMetadata.go index 2531f8e2bb1..d00d035220b 100644 --- a/service/athena/api_op_ListTableMetadata.go +++ b/service/athena/api_op_ListTableMetadata.go @@ -75,6 +75,9 @@ func addOperationListTableMetadataMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListTableMetadataMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListTagsForResource.go b/service/athena/api_op_ListTagsForResource.go index 963f640526d..ba20bb1f75c 100644 --- a/service/athena/api_op_ListTagsForResource.go +++ b/service/athena/api_op_ListTagsForResource.go @@ -65,6 +65,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_ListWorkGroups.go b/service/athena/api_op_ListWorkGroups.go index 2a5bd6a0195..4e6224581ed 100644 --- a/service/athena/api_op_ListWorkGroups.go +++ b/service/athena/api_op_ListWorkGroups.go @@ -62,6 +62,9 @@ func addOperationListWorkGroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListWorkGroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_StartQueryExecution.go b/service/athena/api_op_StartQueryExecution.go index 52077b5bf59..65d4553cc75 100644 --- a/service/athena/api_op_StartQueryExecution.go +++ b/service/athena/api_op_StartQueryExecution.go @@ -82,6 +82,9 @@ func addOperationStartQueryExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationStartQueryExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_StopQueryExecution.go b/service/athena/api_op_StopQueryExecution.go index ecbf3b15b3e..3fa1c72b3c3 100644 --- a/service/athena/api_op_StopQueryExecution.go +++ b/service/athena/api_op_StopQueryExecution.go @@ -52,6 +52,9 @@ func addOperationStopQueryExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStopQueryExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_TagResource.go b/service/athena/api_op_TagResource.go index 0243b895c8d..f5f62c52cd7 100644 --- a/service/athena/api_op_TagResource.go +++ b/service/athena/api_op_TagResource.go @@ -68,6 +68,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_UntagResource.go b/service/athena/api_op_UntagResource.go index 64cd29988c6..44a34ae646e 100644 --- a/service/athena/api_op_UntagResource.go +++ b/service/athena/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_UpdateDataCatalog.go b/service/athena/api_op_UpdateDataCatalog.go index 1b72d9bb561..a4322a0a69a 100644 --- a/service/athena/api_op_UpdateDataCatalog.go +++ b/service/athena/api_op_UpdateDataCatalog.go @@ -84,6 +84,9 @@ func addOperationUpdateDataCatalogMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateDataCatalogMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/api_op_UpdateWorkGroup.go b/service/athena/api_op_UpdateWorkGroup.go index 87079e07e68..3783f5ce458 100644 --- a/service/athena/api_op_UpdateWorkGroup.go +++ b/service/athena/api_op_UpdateWorkGroup.go @@ -59,6 +59,9 @@ func addOperationUpdateWorkGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateWorkGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/athena/go.mod b/service/athena/go.mod index 9355ac21d0f..2e109321bf1 100644 --- a/service/athena/go.mod +++ b/service/athena/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/athena go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/athena/go.sum b/service/athena/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/athena/go.sum +++ b/service/athena/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/autoscaling/api_client.go b/service/autoscaling/api_client.go index 57c8ba5b8e8..16a1e06c087 100644 --- a/service/autoscaling/api_client.go +++ b/service/autoscaling/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/autoscaling/api_op_AttachInstances.go b/service/autoscaling/api_op_AttachInstances.go index e69d0a0b2e5..84b5de065ed 100644 --- a/service/autoscaling/api_op_AttachInstances.go +++ b/service/autoscaling/api_op_AttachInstances.go @@ -61,6 +61,9 @@ func addOperationAttachInstancesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAttachInstancesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go b/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go index 3706fee0426..36ffaa20ca3 100644 --- a/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go +++ b/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go @@ -63,6 +63,9 @@ func addOperationAttachLoadBalancerTargetGroupsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAttachLoadBalancerTargetGroupsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_AttachLoadBalancers.go b/service/autoscaling/api_op_AttachLoadBalancers.go index b8827a24dd6..b1ec463eda3 100644 --- a/service/autoscaling/api_op_AttachLoadBalancers.go +++ b/service/autoscaling/api_op_AttachLoadBalancers.go @@ -62,6 +62,9 @@ func addOperationAttachLoadBalancersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAttachLoadBalancersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_BatchDeleteScheduledAction.go b/service/autoscaling/api_op_BatchDeleteScheduledAction.go index 9802181a075..6167679871f 100644 --- a/service/autoscaling/api_op_BatchDeleteScheduledAction.go +++ b/service/autoscaling/api_op_BatchDeleteScheduledAction.go @@ -59,6 +59,9 @@ func addOperationBatchDeleteScheduledActionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationBatchDeleteScheduledActionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go b/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go index d4d2376877a..10cb702eee9 100644 --- a/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go +++ b/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go @@ -61,6 +61,9 @@ func addOperationBatchPutScheduledUpdateGroupActionMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationBatchPutScheduledUpdateGroupActionMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_CancelInstanceRefresh.go b/service/autoscaling/api_op_CancelInstanceRefresh.go index 7e87934df40..6f907ca08fb 100644 --- a/service/autoscaling/api_op_CancelInstanceRefresh.go +++ b/service/autoscaling/api_op_CancelInstanceRefresh.go @@ -56,6 +56,9 @@ func addOperationCancelInstanceRefreshMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCancelInstanceRefreshMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_CompleteLifecycleAction.go b/service/autoscaling/api_op_CompleteLifecycleAction.go index ed4beb00848..aeaa863a834 100644 --- a/service/autoscaling/api_op_CompleteLifecycleAction.go +++ b/service/autoscaling/api_op_CompleteLifecycleAction.go @@ -93,6 +93,9 @@ func addOperationCompleteLifecycleActionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCompleteLifecycleActionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_CreateAutoScalingGroup.go b/service/autoscaling/api_op_CreateAutoScalingGroup.go index 7f0459e1519..3724e2709c4 100644 --- a/service/autoscaling/api_op_CreateAutoScalingGroup.go +++ b/service/autoscaling/api_op_CreateAutoScalingGroup.go @@ -245,6 +245,9 @@ func addOperationCreateAutoScalingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -287,6 +290,9 @@ func addOperationCreateAutoScalingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_CreateLaunchConfiguration.go b/service/autoscaling/api_op_CreateLaunchConfiguration.go index 36a084882c6..b4244384f58 100644 --- a/service/autoscaling/api_op_CreateLaunchConfiguration.go +++ b/service/autoscaling/api_op_CreateLaunchConfiguration.go @@ -209,6 +209,9 @@ func addOperationCreateLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -251,6 +254,9 @@ func addOperationCreateLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_CreateOrUpdateTags.go b/service/autoscaling/api_op_CreateOrUpdateTags.go index 55f27deb6ba..ce638a332e3 100644 --- a/service/autoscaling/api_op_CreateOrUpdateTags.go +++ b/service/autoscaling/api_op_CreateOrUpdateTags.go @@ -54,6 +54,9 @@ func addOperationCreateOrUpdateTagsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationCreateOrUpdateTagsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeleteAutoScalingGroup.go b/service/autoscaling/api_op_DeleteAutoScalingGroup.go index 0becf139dc9..2a76349dafb 100644 --- a/service/autoscaling/api_op_DeleteAutoScalingGroup.go +++ b/service/autoscaling/api_op_DeleteAutoScalingGroup.go @@ -62,6 +62,9 @@ func addOperationDeleteAutoScalingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteAutoScalingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeleteLaunchConfiguration.go b/service/autoscaling/api_op_DeleteLaunchConfiguration.go index ee7c25858ab..7496272d3c3 100644 --- a/service/autoscaling/api_op_DeleteLaunchConfiguration.go +++ b/service/autoscaling/api_op_DeleteLaunchConfiguration.go @@ -50,6 +50,9 @@ func addOperationDeleteLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeleteLifecycleHook.go b/service/autoscaling/api_op_DeleteLifecycleHook.go index 837719b086d..c1571462c9b 100644 --- a/service/autoscaling/api_op_DeleteLifecycleHook.go +++ b/service/autoscaling/api_op_DeleteLifecycleHook.go @@ -55,6 +55,9 @@ func addOperationDeleteLifecycleHookMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteLifecycleHookMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeleteNotificationConfiguration.go b/service/autoscaling/api_op_DeleteNotificationConfiguration.go index 65ff3e343aa..81b2fa3540a 100644 --- a/service/autoscaling/api_op_DeleteNotificationConfiguration.go +++ b/service/autoscaling/api_op_DeleteNotificationConfiguration.go @@ -54,6 +54,9 @@ func addOperationDeleteNotificationConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteNotificationConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeletePolicy.go b/service/autoscaling/api_op_DeletePolicy.go index faa3ea7b541..482994219ae 100644 --- a/service/autoscaling/api_op_DeletePolicy.go +++ b/service/autoscaling/api_op_DeletePolicy.go @@ -56,6 +56,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeleteScheduledAction.go b/service/autoscaling/api_op_DeleteScheduledAction.go index 3b11b0c2785..3e016111296 100644 --- a/service/autoscaling/api_op_DeleteScheduledAction.go +++ b/service/autoscaling/api_op_DeleteScheduledAction.go @@ -53,6 +53,9 @@ func addOperationDeleteScheduledActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteScheduledActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DeleteTags.go b/service/autoscaling/api_op_DeleteTags.go index c6dd9d78954..ee79c90e043 100644 --- a/service/autoscaling/api_op_DeleteTags.go +++ b/service/autoscaling/api_op_DeleteTags.go @@ -49,6 +49,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeAccountLimits.go b/service/autoscaling/api_op_DescribeAccountLimits.go index 25d3d78338e..d679cd56f52 100644 --- a/service/autoscaling/api_op_DescribeAccountLimits.go +++ b/service/autoscaling/api_op_DescribeAccountLimits.go @@ -62,6 +62,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeAdjustmentTypes.go b/service/autoscaling/api_op_DescribeAdjustmentTypes.go index dae688a7075..47c2c690219 100644 --- a/service/autoscaling/api_op_DescribeAdjustmentTypes.go +++ b/service/autoscaling/api_op_DescribeAdjustmentTypes.go @@ -58,6 +58,9 @@ func addOperationDescribeAdjustmentTypesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeAdjustmentTypesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeAutoScalingGroups.go b/service/autoscaling/api_op_DescribeAutoScalingGroups.go index 617d1631e74..c5b526450e6 100644 --- a/service/autoscaling/api_op_DescribeAutoScalingGroups.go +++ b/service/autoscaling/api_op_DescribeAutoScalingGroups.go @@ -70,6 +70,9 @@ func addOperationDescribeAutoScalingGroupsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeAutoScalingGroupsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeAutoScalingInstances.go b/service/autoscaling/api_op_DescribeAutoScalingInstances.go index 13868948909..3b4238605d0 100644 --- a/service/autoscaling/api_op_DescribeAutoScalingInstances.go +++ b/service/autoscaling/api_op_DescribeAutoScalingInstances.go @@ -67,6 +67,9 @@ func addOperationDescribeAutoScalingInstancesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeAutoScalingInstancesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go b/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go index a05070160fe..ed35d4e76db 100644 --- a/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go +++ b/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go @@ -47,6 +47,9 @@ func addOperationDescribeAutoScalingNotificationTypesMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationDescribeAutoScalingNotificationTypesMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeInstanceRefreshes.go b/service/autoscaling/api_op_DescribeInstanceRefreshes.go index 065e1df34d2..d7523e43c3d 100644 --- a/service/autoscaling/api_op_DescribeInstanceRefreshes.go +++ b/service/autoscaling/api_op_DescribeInstanceRefreshes.go @@ -95,6 +95,9 @@ func addOperationDescribeInstanceRefreshesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeInstanceRefreshesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeLaunchConfigurations.go b/service/autoscaling/api_op_DescribeLaunchConfigurations.go index 337987e9ecc..dc5206ff8f3 100644 --- a/service/autoscaling/api_op_DescribeLaunchConfigurations.go +++ b/service/autoscaling/api_op_DescribeLaunchConfigurations.go @@ -68,6 +68,9 @@ func addOperationDescribeLaunchConfigurationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeLaunchConfigurationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeLifecycleHookTypes.go b/service/autoscaling/api_op_DescribeLifecycleHookTypes.go index 28182b5529d..c3d1717402f 100644 --- a/service/autoscaling/api_op_DescribeLifecycleHookTypes.go +++ b/service/autoscaling/api_op_DescribeLifecycleHookTypes.go @@ -53,6 +53,9 @@ func addOperationDescribeLifecycleHookTypesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDescribeLifecycleHookTypesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeLifecycleHooks.go b/service/autoscaling/api_op_DescribeLifecycleHooks.go index 50005598e38..c00c6b51a27 100644 --- a/service/autoscaling/api_op_DescribeLifecycleHooks.go +++ b/service/autoscaling/api_op_DescribeLifecycleHooks.go @@ -57,6 +57,9 @@ func addOperationDescribeLifecycleHooksMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeLifecycleHooksMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go b/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go index 36cb607117a..45153672183 100644 --- a/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go +++ b/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go @@ -67,6 +67,9 @@ func addOperationDescribeLoadBalancerTargetGroupsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeLoadBalancerTargetGroupsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeLoadBalancers.go b/service/autoscaling/api_op_DescribeLoadBalancers.go index d6940c8b40a..85390528a3e 100644 --- a/service/autoscaling/api_op_DescribeLoadBalancers.go +++ b/service/autoscaling/api_op_DescribeLoadBalancers.go @@ -70,6 +70,9 @@ func addOperationDescribeLoadBalancersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeLoadBalancersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeMetricCollectionTypes.go b/service/autoscaling/api_op_DescribeMetricCollectionTypes.go index 7ad379eb6b4..98de265c553 100644 --- a/service/autoscaling/api_op_DescribeMetricCollectionTypes.go +++ b/service/autoscaling/api_op_DescribeMetricCollectionTypes.go @@ -53,6 +53,9 @@ func addOperationDescribeMetricCollectionTypesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDescribeMetricCollectionTypesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeNotificationConfigurations.go b/service/autoscaling/api_op_DescribeNotificationConfigurations.go index c4d7d7218a9..a64d429effe 100644 --- a/service/autoscaling/api_op_DescribeNotificationConfigurations.go +++ b/service/autoscaling/api_op_DescribeNotificationConfigurations.go @@ -68,6 +68,9 @@ func addOperationDescribeNotificationConfigurationsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeNotificationConfigurationsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribePolicies.go b/service/autoscaling/api_op_DescribePolicies.go index f2a4a288d9a..1f723d77c05 100644 --- a/service/autoscaling/api_op_DescribePolicies.go +++ b/service/autoscaling/api_op_DescribePolicies.go @@ -75,6 +75,9 @@ func addOperationDescribePoliciesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribePoliciesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeScalingActivities.go b/service/autoscaling/api_op_DescribeScalingActivities.go index 5631512ca9b..82281d483a4 100644 --- a/service/autoscaling/api_op_DescribeScalingActivities.go +++ b/service/autoscaling/api_op_DescribeScalingActivities.go @@ -74,6 +74,9 @@ func addOperationDescribeScalingActivitiesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeScalingActivitiesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeScalingProcessTypes.go b/service/autoscaling/api_op_DescribeScalingProcessTypes.go index f01d3765b87..bda9d6c897e 100644 --- a/service/autoscaling/api_op_DescribeScalingProcessTypes.go +++ b/service/autoscaling/api_op_DescribeScalingProcessTypes.go @@ -49,6 +49,9 @@ func addOperationDescribeScalingProcessTypesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationDescribeScalingProcessTypesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeScheduledActions.go b/service/autoscaling/api_op_DescribeScheduledActions.go index 09a69fe1d5b..f010a6e928f 100644 --- a/service/autoscaling/api_op_DescribeScheduledActions.go +++ b/service/autoscaling/api_op_DescribeScheduledActions.go @@ -81,6 +81,9 @@ func addOperationDescribeScheduledActionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeScheduledActionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeTags.go b/service/autoscaling/api_op_DescribeTags.go index 7dfa540cac6..2bd3647a55e 100644 --- a/service/autoscaling/api_op_DescribeTags.go +++ b/service/autoscaling/api_op_DescribeTags.go @@ -74,6 +74,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go b/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go index 526ed2e3593..599ad4240ad 100644 --- a/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go +++ b/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go @@ -53,6 +53,9 @@ func addOperationDescribeTerminationPolicyTypesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDescribeTerminationPolicyTypesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DetachInstances.go b/service/autoscaling/api_op_DetachInstances.go index 58f342d3679..b371b2aa3b5 100644 --- a/service/autoscaling/api_op_DetachInstances.go +++ b/service/autoscaling/api_op_DetachInstances.go @@ -72,6 +72,9 @@ func addOperationDetachInstancesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDetachInstancesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go b/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go index c0e2ff9f6d7..d6abc89cf5a 100644 --- a/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go +++ b/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go @@ -54,6 +54,9 @@ func addOperationDetachLoadBalancerTargetGroupsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDetachLoadBalancerTargetGroupsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DetachLoadBalancers.go b/service/autoscaling/api_op_DetachLoadBalancers.go index b2d1fb7377a..43820271adc 100644 --- a/service/autoscaling/api_op_DetachLoadBalancers.go +++ b/service/autoscaling/api_op_DetachLoadBalancers.go @@ -59,6 +59,9 @@ func addOperationDetachLoadBalancersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDetachLoadBalancersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_DisableMetricsCollection.go b/service/autoscaling/api_op_DisableMetricsCollection.go index 874d6266403..80f2109cb2f 100644 --- a/service/autoscaling/api_op_DisableMetricsCollection.go +++ b/service/autoscaling/api_op_DisableMetricsCollection.go @@ -84,6 +84,9 @@ func addOperationDisableMetricsCollectionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDisableMetricsCollectionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_EnableMetricsCollection.go b/service/autoscaling/api_op_EnableMetricsCollection.go index b4846473967..a70b27a0fc2 100644 --- a/service/autoscaling/api_op_EnableMetricsCollection.go +++ b/service/autoscaling/api_op_EnableMetricsCollection.go @@ -97,6 +97,9 @@ func addOperationEnableMetricsCollectionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationEnableMetricsCollectionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_EnterStandby.go b/service/autoscaling/api_op_EnterStandby.go index 90dfed50a77..5128829a36c 100644 --- a/service/autoscaling/api_op_EnterStandby.go +++ b/service/autoscaling/api_op_EnterStandby.go @@ -71,6 +71,9 @@ func addOperationEnterStandbyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationEnterStandbyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_ExecutePolicy.go b/service/autoscaling/api_op_ExecutePolicy.go index 07b7b8003c0..ccc4cca5faf 100644 --- a/service/autoscaling/api_op_ExecutePolicy.go +++ b/service/autoscaling/api_op_ExecutePolicy.go @@ -72,6 +72,9 @@ func addOperationExecutePolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationExecutePolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_ExitStandby.go b/service/autoscaling/api_op_ExitStandby.go index 8827e9bbb94..7054902ec28 100644 --- a/service/autoscaling/api_op_ExitStandby.go +++ b/service/autoscaling/api_op_ExitStandby.go @@ -60,6 +60,9 @@ func addOperationExitStandbyMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationExitStandbyMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_PutLifecycleHook.go b/service/autoscaling/api_op_PutLifecycleHook.go index 5900118bd58..b98e00ea10a 100644 --- a/service/autoscaling/api_op_PutLifecycleHook.go +++ b/service/autoscaling/api_op_PutLifecycleHook.go @@ -132,6 +132,9 @@ func addOperationPutLifecycleHookMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationPutLifecycleHookMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_PutNotificationConfiguration.go b/service/autoscaling/api_op_PutNotificationConfiguration.go index 2c659647854..a3ed5858eba 100644 --- a/service/autoscaling/api_op_PutNotificationConfiguration.go +++ b/service/autoscaling/api_op_PutNotificationConfiguration.go @@ -67,6 +67,9 @@ func addOperationPutNotificationConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationPutNotificationConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_PutScalingPolicy.go b/service/autoscaling/api_op_PutScalingPolicy.go index 93a1ae4aa0b..8d64ba749e4 100644 --- a/service/autoscaling/api_op_PutScalingPolicy.go +++ b/service/autoscaling/api_op_PutScalingPolicy.go @@ -163,6 +163,9 @@ func addOperationPutScalingPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -205,6 +208,9 @@ func addOperationPutScalingPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go b/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go index 8473147f13b..0d0fdf30682 100644 --- a/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go +++ b/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go @@ -93,6 +93,9 @@ func addOperationPutScheduledUpdateGroupActionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationPutScheduledUpdateGroupActionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go b/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go index 7870143b9e9..95252d59654 100644 --- a/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go +++ b/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go @@ -87,6 +87,9 @@ func addOperationRecordLifecycleActionHeartbeatMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationRecordLifecycleActionHeartbeatMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_ResumeProcesses.go b/service/autoscaling/api_op_ResumeProcesses.go index 0aca7bb1aa1..db1d99a3bec 100644 --- a/service/autoscaling/api_op_ResumeProcesses.go +++ b/service/autoscaling/api_op_ResumeProcesses.go @@ -78,6 +78,9 @@ func addOperationResumeProcessesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationResumeProcessesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_SetDesiredCapacity.go b/service/autoscaling/api_op_SetDesiredCapacity.go index e8928a44f4f..f4f34796c30 100644 --- a/service/autoscaling/api_op_SetDesiredCapacity.go +++ b/service/autoscaling/api_op_SetDesiredCapacity.go @@ -65,6 +65,9 @@ func addOperationSetDesiredCapacityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSetDesiredCapacityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_SetInstanceHealth.go b/service/autoscaling/api_op_SetInstanceHealth.go index b29edf03fa5..d6bb83629fc 100644 --- a/service/autoscaling/api_op_SetInstanceHealth.go +++ b/service/autoscaling/api_op_SetInstanceHealth.go @@ -67,6 +67,9 @@ func addOperationSetInstanceHealthMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationSetInstanceHealthMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_SetInstanceProtection.go b/service/autoscaling/api_op_SetInstanceProtection.go index ab01d32e8ba..344ad7b6acf 100644 --- a/service/autoscaling/api_op_SetInstanceProtection.go +++ b/service/autoscaling/api_op_SetInstanceProtection.go @@ -63,6 +63,9 @@ func addOperationSetInstanceProtectionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationSetInstanceProtectionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_StartInstanceRefresh.go b/service/autoscaling/api_op_StartInstanceRefresh.go index b271c53a489..9a7ef1fcf71 100644 --- a/service/autoscaling/api_op_StartInstanceRefresh.go +++ b/service/autoscaling/api_op_StartInstanceRefresh.go @@ -78,6 +78,9 @@ func addOperationStartInstanceRefreshMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationStartInstanceRefreshMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_SuspendProcesses.go b/service/autoscaling/api_op_SuspendProcesses.go index e5cd160a62b..2ff29f89d15 100644 --- a/service/autoscaling/api_op_SuspendProcesses.go +++ b/service/autoscaling/api_op_SuspendProcesses.go @@ -80,6 +80,9 @@ func addOperationSuspendProcessesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationSuspendProcessesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go b/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go index ca3613a1473..8bc0afd89d0 100644 --- a/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go +++ b/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go @@ -71,6 +71,9 @@ func addOperationTerminateInstanceInAutoScalingGroupMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationTerminateInstanceInAutoScalingGroupMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/api_op_UpdateAutoScalingGroup.go b/service/autoscaling/api_op_UpdateAutoScalingGroup.go index 4682a4bb4e7..8fe65fd3ff1 100644 --- a/service/autoscaling/api_op_UpdateAutoScalingGroup.go +++ b/service/autoscaling/api_op_UpdateAutoScalingGroup.go @@ -193,6 +193,9 @@ func addOperationUpdateAutoScalingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -235,6 +238,9 @@ func addOperationUpdateAutoScalingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscaling/go.mod b/service/autoscaling/go.mod index 779c4d5b26b..a08279c044a 100644 --- a/service/autoscaling/go.mod +++ b/service/autoscaling/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/autoscaling go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/autoscaling/go.sum b/service/autoscaling/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/autoscaling/go.sum +++ b/service/autoscaling/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/autoscalingplans/api_client.go b/service/autoscalingplans/api_client.go index 512ed93a413..ea8f9d2a1e1 100644 --- a/service/autoscalingplans/api_client.go +++ b/service/autoscalingplans/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/autoscalingplans/api_op_CreateScalingPlan.go b/service/autoscalingplans/api_op_CreateScalingPlan.go index b325c7d81fe..fb7689c2d1c 100644 --- a/service/autoscalingplans/api_op_CreateScalingPlan.go +++ b/service/autoscalingplans/api_op_CreateScalingPlan.go @@ -68,6 +68,9 @@ func addOperationCreateScalingPlanMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateScalingPlanMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscalingplans/api_op_DeleteScalingPlan.go b/service/autoscalingplans/api_op_DeleteScalingPlan.go index 93c691762d8..f5449504b42 100644 --- a/service/autoscalingplans/api_op_DeleteScalingPlan.go +++ b/service/autoscalingplans/api_op_DeleteScalingPlan.go @@ -56,6 +56,9 @@ func addOperationDeleteScalingPlanMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteScalingPlanMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscalingplans/api_op_DescribeScalingPlanResources.go b/service/autoscalingplans/api_op_DescribeScalingPlanResources.go index 99b4dd87da9..2863b106417 100644 --- a/service/autoscalingplans/api_op_DescribeScalingPlanResources.go +++ b/service/autoscalingplans/api_op_DescribeScalingPlanResources.go @@ -69,6 +69,9 @@ func addOperationDescribeScalingPlanResourcesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeScalingPlanResourcesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscalingplans/api_op_DescribeScalingPlans.go b/service/autoscalingplans/api_op_DescribeScalingPlans.go index 2568c0d2981..53095894db0 100644 --- a/service/autoscalingplans/api_op_DescribeScalingPlans.go +++ b/service/autoscalingplans/api_op_DescribeScalingPlans.go @@ -71,6 +71,9 @@ func addOperationDescribeScalingPlansMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeScalingPlansMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go b/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go index 4a9ac616ea2..dffe4172869 100644 --- a/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go +++ b/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go @@ -138,6 +138,9 @@ func addOperationGetScalingPlanResourceForecastDataMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationGetScalingPlanResourceForecastDataMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscalingplans/api_op_UpdateScalingPlan.go b/service/autoscalingplans/api_op_UpdateScalingPlan.go index 76d52dda367..efc4376c465 100644 --- a/service/autoscalingplans/api_op_UpdateScalingPlan.go +++ b/service/autoscalingplans/api_op_UpdateScalingPlan.go @@ -61,6 +61,9 @@ func addOperationUpdateScalingPlanMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateScalingPlanMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/autoscalingplans/go.mod b/service/autoscalingplans/go.mod index 3df9864fd82..1f618ff649e 100644 --- a/service/autoscalingplans/go.mod +++ b/service/autoscalingplans/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/autoscalingplans go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/autoscalingplans/go.sum b/service/autoscalingplans/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/autoscalingplans/go.sum +++ b/service/autoscalingplans/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/backup/api_client.go b/service/backup/api_client.go index 5165281a550..1105f352f85 100644 --- a/service/backup/api_client.go +++ b/service/backup/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/backup/api_op_CreateBackupPlan.go b/service/backup/api_op_CreateBackupPlan.go index b86752fb049..f86ab2e6f1a 100644 --- a/service/backup/api_op_CreateBackupPlan.go +++ b/service/backup/api_op_CreateBackupPlan.go @@ -88,6 +88,9 @@ func addOperationCreateBackupPlanMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateBackupPlanMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_CreateBackupSelection.go b/service/backup/api_op_CreateBackupSelection.go index a2bd544baed..dc8ba077341 100644 --- a/service/backup/api_op_CreateBackupSelection.go +++ b/service/backup/api_op_CreateBackupSelection.go @@ -94,6 +94,9 @@ func addOperationCreateBackupSelectionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateBackupSelectionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_CreateBackupVault.go b/service/backup/api_op_CreateBackupVault.go index ad2ad826837..4b9fa6bf20d 100644 --- a/service/backup/api_op_CreateBackupVault.go +++ b/service/backup/api_op_CreateBackupVault.go @@ -85,6 +85,9 @@ func addOperationCreateBackupVaultMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateBackupVaultMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DeleteBackupPlan.go b/service/backup/api_op_DeleteBackupPlan.go index d585e694de7..ba42ce522f2 100644 --- a/service/backup/api_op_DeleteBackupPlan.go +++ b/service/backup/api_op_DeleteBackupPlan.go @@ -70,6 +70,9 @@ func addOperationDeleteBackupPlanMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteBackupPlanMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DeleteBackupSelection.go b/service/backup/api_op_DeleteBackupSelection.go index b14f2ae2bb6..5e9ae5ade44 100644 --- a/service/backup/api_op_DeleteBackupSelection.go +++ b/service/backup/api_op_DeleteBackupSelection.go @@ -55,6 +55,9 @@ func addOperationDeleteBackupSelectionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteBackupSelectionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DeleteBackupVault.go b/service/backup/api_op_DeleteBackupVault.go index b0dccf6b66f..f64de43820e 100644 --- a/service/backup/api_op_DeleteBackupVault.go +++ b/service/backup/api_op_DeleteBackupVault.go @@ -52,6 +52,9 @@ func addOperationDeleteBackupVaultMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteBackupVaultMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DeleteBackupVaultAccessPolicy.go b/service/backup/api_op_DeleteBackupVaultAccessPolicy.go index 541c483d7d2..4fbb6b6bc7b 100644 --- a/service/backup/api_op_DeleteBackupVaultAccessPolicy.go +++ b/service/backup/api_op_DeleteBackupVaultAccessPolicy.go @@ -51,6 +51,9 @@ func addOperationDeleteBackupVaultAccessPolicyMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteBackupVaultAccessPolicyMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DeleteBackupVaultNotifications.go b/service/backup/api_op_DeleteBackupVaultNotifications.go index fdf32a02cdf..5b71e7fd8ad 100644 --- a/service/backup/api_op_DeleteBackupVaultNotifications.go +++ b/service/backup/api_op_DeleteBackupVaultNotifications.go @@ -51,6 +51,9 @@ func addOperationDeleteBackupVaultNotificationsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteBackupVaultNotificationsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DeleteRecoveryPoint.go b/service/backup/api_op_DeleteRecoveryPoint.go index 258e648b0f0..2744ec537b9 100644 --- a/service/backup/api_op_DeleteRecoveryPoint.go +++ b/service/backup/api_op_DeleteRecoveryPoint.go @@ -58,6 +58,9 @@ func addOperationDeleteRecoveryPointMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteRecoveryPointMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeBackupJob.go b/service/backup/api_op_DescribeBackupJob.go index 41ffed3334c..3ad24f4c01c 100644 --- a/service/backup/api_op_DescribeBackupJob.go +++ b/service/backup/api_op_DescribeBackupJob.go @@ -141,6 +141,9 @@ func addOperationDescribeBackupJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationDescribeBackupJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeBackupVault.go b/service/backup/api_op_DescribeBackupVault.go index f1c7c51478a..52ce5e5cb52 100644 --- a/service/backup/api_op_DescribeBackupVault.go +++ b/service/backup/api_op_DescribeBackupVault.go @@ -81,6 +81,9 @@ func addOperationDescribeBackupVaultMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeBackupVaultMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeCopyJob.go b/service/backup/api_op_DescribeCopyJob.go index 1b96a5a0f77..a59730d3642 100644 --- a/service/backup/api_op_DescribeCopyJob.go +++ b/service/backup/api_op_DescribeCopyJob.go @@ -53,6 +53,9 @@ func addOperationDescribeCopyJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeCopyJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeProtectedResource.go b/service/backup/api_op_DescribeProtectedResource.go index b7c0bf5fd39..7b142723490 100644 --- a/service/backup/api_op_DescribeProtectedResource.go +++ b/service/backup/api_op_DescribeProtectedResource.go @@ -67,6 +67,9 @@ func addOperationDescribeProtectedResourceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeProtectedResourceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeRecoveryPoint.go b/service/backup/api_op_DescribeRecoveryPoint.go index 715dc14a8d2..f8781350546 100644 --- a/service/backup/api_op_DescribeRecoveryPoint.go +++ b/service/backup/api_op_DescribeRecoveryPoint.go @@ -145,6 +145,9 @@ func addOperationDescribeRecoveryPointMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationDescribeRecoveryPointMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeRegionSettings.go b/service/backup/api_op_DescribeRegionSettings.go index e6e09e95e4e..4f612deb98f 100644 --- a/service/backup/api_op_DescribeRegionSettings.go +++ b/service/backup/api_op_DescribeRegionSettings.go @@ -51,6 +51,9 @@ func addOperationDescribeRegionSettingsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDescribeRegionSettingsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_DescribeRestoreJob.go b/service/backup/api_op_DescribeRestoreJob.go index 2ec8989e440..6b0455c864b 100644 --- a/service/backup/api_op_DescribeRestoreJob.go +++ b/service/backup/api_op_DescribeRestoreJob.go @@ -103,6 +103,9 @@ func addOperationDescribeRestoreJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeRestoreJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ExportBackupPlanTemplate.go b/service/backup/api_op_ExportBackupPlanTemplate.go index db90db59086..df61eb410b5 100644 --- a/service/backup/api_op_ExportBackupPlanTemplate.go +++ b/service/backup/api_op_ExportBackupPlanTemplate.go @@ -53,6 +53,9 @@ func addOperationExportBackupPlanTemplateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationExportBackupPlanTemplateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetBackupPlan.go b/service/backup/api_op_GetBackupPlan.go index 5bc911b4898..ad38a4b3a28 100644 --- a/service/backup/api_op_GetBackupPlan.go +++ b/service/backup/api_op_GetBackupPlan.go @@ -98,6 +98,9 @@ func addOperationGetBackupPlanMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationGetBackupPlanMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetBackupPlanFromJSON.go b/service/backup/api_op_GetBackupPlanFromJSON.go index f23bc08bf3c..b7679d85b0a 100644 --- a/service/backup/api_op_GetBackupPlanFromJSON.go +++ b/service/backup/api_op_GetBackupPlanFromJSON.go @@ -54,6 +54,9 @@ func addOperationGetBackupPlanFromJSONMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetBackupPlanFromJSONMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetBackupPlanFromTemplate.go b/service/backup/api_op_GetBackupPlanFromTemplate.go index 6383358146e..5902b6fedef 100644 --- a/service/backup/api_op_GetBackupPlanFromTemplate.go +++ b/service/backup/api_op_GetBackupPlanFromTemplate.go @@ -54,6 +54,9 @@ func addOperationGetBackupPlanFromTemplateMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetBackupPlanFromTemplateMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetBackupSelection.go b/service/backup/api_op_GetBackupSelection.go index e166c1627dc..bc722c1e3f5 100644 --- a/service/backup/api_op_GetBackupSelection.go +++ b/service/backup/api_op_GetBackupSelection.go @@ -78,6 +78,9 @@ func addOperationGetBackupSelectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetBackupSelectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetBackupVaultAccessPolicy.go b/service/backup/api_op_GetBackupVaultAccessPolicy.go index 7698fe6b621..ac1eb34d6cb 100644 --- a/service/backup/api_op_GetBackupVaultAccessPolicy.go +++ b/service/backup/api_op_GetBackupVaultAccessPolicy.go @@ -66,6 +66,9 @@ func addOperationGetBackupVaultAccessPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetBackupVaultAccessPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetBackupVaultNotifications.go b/service/backup/api_op_GetBackupVaultNotifications.go index a5b7367ea84..0dae13f0a54 100644 --- a/service/backup/api_op_GetBackupVaultNotifications.go +++ b/service/backup/api_op_GetBackupVaultNotifications.go @@ -71,6 +71,9 @@ func addOperationGetBackupVaultNotificationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetBackupVaultNotificationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetRecoveryPointRestoreMetadata.go b/service/backup/api_op_GetRecoveryPointRestoreMetadata.go index f22f314a1cd..5a818f7f947 100644 --- a/service/backup/api_op_GetRecoveryPointRestoreMetadata.go +++ b/service/backup/api_op_GetRecoveryPointRestoreMetadata.go @@ -72,6 +72,9 @@ func addOperationGetRecoveryPointRestoreMetadataMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetRecoveryPointRestoreMetadataMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_GetSupportedResourceTypes.go b/service/backup/api_op_GetSupportedResourceTypes.go index 23b07915990..51a43655f10 100644 --- a/service/backup/api_op_GetSupportedResourceTypes.go +++ b/service/backup/api_op_GetSupportedResourceTypes.go @@ -62,6 +62,9 @@ func addOperationGetSupportedResourceTypesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetSupportedResourceTypesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListBackupJobs.go b/service/backup/api_op_ListBackupJobs.go index cd002284f29..e0337469f08 100644 --- a/service/backup/api_op_ListBackupJobs.go +++ b/service/backup/api_op_ListBackupJobs.go @@ -106,6 +106,9 @@ func addOperationListBackupJobsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationListBackupJobsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListBackupPlanTemplates.go b/service/backup/api_op_ListBackupPlanTemplates.go index f2c68e69af5..35ec9efd30d 100644 --- a/service/backup/api_op_ListBackupPlanTemplates.go +++ b/service/backup/api_op_ListBackupPlanTemplates.go @@ -64,6 +64,9 @@ func addOperationListBackupPlanTemplatesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListBackupPlanTemplatesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListBackupPlanVersions.go b/service/backup/api_op_ListBackupPlanVersions.go index dabd83d7b77..af18cbc00d4 100644 --- a/service/backup/api_op_ListBackupPlanVersions.go +++ b/service/backup/api_op_ListBackupPlanVersions.go @@ -70,6 +70,9 @@ func addOperationListBackupPlanVersionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListBackupPlanVersionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListBackupPlans.go b/service/backup/api_op_ListBackupPlans.go index 44cb9f7b069..3f677159091 100644 --- a/service/backup/api_op_ListBackupPlans.go +++ b/service/backup/api_op_ListBackupPlans.go @@ -71,6 +71,9 @@ func addOperationListBackupPlansMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListBackupPlansMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListBackupSelections.go b/service/backup/api_op_ListBackupSelections.go index 20befcb9d99..fa632d107ee 100644 --- a/service/backup/api_op_ListBackupSelections.go +++ b/service/backup/api_op_ListBackupSelections.go @@ -70,6 +70,9 @@ func addOperationListBackupSelectionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListBackupSelectionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListBackupVaults.go b/service/backup/api_op_ListBackupVaults.go index fb8b1858e78..07ac38e1949 100644 --- a/service/backup/api_op_ListBackupVaults.go +++ b/service/backup/api_op_ListBackupVaults.go @@ -67,6 +67,9 @@ func addOperationListBackupVaultsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListBackupVaultsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListCopyJobs.go b/service/backup/api_op_ListCopyJobs.go index f63f146f6e0..70c096c62f5 100644 --- a/service/backup/api_op_ListCopyJobs.go +++ b/service/backup/api_op_ListCopyJobs.go @@ -105,6 +105,9 @@ func addOperationListCopyJobsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationListCopyJobsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListProtectedResources.go b/service/backup/api_op_ListProtectedResources.go index 499089a8f9f..d3f30f099f9 100644 --- a/service/backup/api_op_ListProtectedResources.go +++ b/service/backup/api_op_ListProtectedResources.go @@ -67,6 +67,9 @@ func addOperationListProtectedResourcesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListProtectedResourcesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListRecoveryPointsByBackupVault.go b/service/backup/api_op_ListRecoveryPointsByBackupVault.go index cff505968c4..7132338c193 100644 --- a/service/backup/api_op_ListRecoveryPointsByBackupVault.go +++ b/service/backup/api_op_ListRecoveryPointsByBackupVault.go @@ -89,6 +89,9 @@ func addOperationListRecoveryPointsByBackupVaultMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListRecoveryPointsByBackupVaultMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListRecoveryPointsByResource.go b/service/backup/api_op_ListRecoveryPointsByResource.go index 8bc9880e604..66d7ae80cd7 100644 --- a/service/backup/api_op_ListRecoveryPointsByResource.go +++ b/service/backup/api_op_ListRecoveryPointsByResource.go @@ -71,6 +71,9 @@ func addOperationListRecoveryPointsByResourceMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListRecoveryPointsByResourceMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListRestoreJobs.go b/service/backup/api_op_ListRestoreJobs.go index db35443f691..5865da450cf 100644 --- a/service/backup/api_op_ListRestoreJobs.go +++ b/service/backup/api_op_ListRestoreJobs.go @@ -79,6 +79,9 @@ func addOperationListRestoreJobsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListRestoreJobsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_ListTags.go b/service/backup/api_op_ListTags.go index 9f448f742cd..ed4dd314b6c 100644 --- a/service/backup/api_op_ListTags.go +++ b/service/backup/api_op_ListTags.go @@ -72,6 +72,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_PutBackupVaultAccessPolicy.go b/service/backup/api_op_PutBackupVaultAccessPolicy.go index b948b61dc1a..4c66ed9731f 100644 --- a/service/backup/api_op_PutBackupVaultAccessPolicy.go +++ b/service/backup/api_op_PutBackupVaultAccessPolicy.go @@ -56,6 +56,9 @@ func addOperationPutBackupVaultAccessPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPutBackupVaultAccessPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_PutBackupVaultNotifications.go b/service/backup/api_op_PutBackupVaultNotifications.go index 7c4b6808d38..48e26bee35d 100644 --- a/service/backup/api_op_PutBackupVaultNotifications.go +++ b/service/backup/api_op_PutBackupVaultNotifications.go @@ -64,6 +64,9 @@ func addOperationPutBackupVaultNotificationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationPutBackupVaultNotificationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_StartBackupJob.go b/service/backup/api_op_StartBackupJob.go index b7b230039aa..5bad57189a3 100644 --- a/service/backup/api_op_StartBackupJob.go +++ b/service/backup/api_op_StartBackupJob.go @@ -111,6 +111,9 @@ func addOperationStartBackupJobMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationStartBackupJobMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_StartCopyJob.go b/service/backup/api_op_StartCopyJob.go index 02ef966ea5a..122d7238da7 100644 --- a/service/backup/api_op_StartCopyJob.go +++ b/service/backup/api_op_StartCopyJob.go @@ -96,6 +96,9 @@ func addOperationStartCopyJobMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationStartCopyJobMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_StartRestoreJob.go b/service/backup/api_op_StartRestoreJob.go index 1dff3a6daeb..9df4521d2b4 100644 --- a/service/backup/api_op_StartRestoreJob.go +++ b/service/backup/api_op_StartRestoreJob.go @@ -120,6 +120,9 @@ func addOperationStartRestoreJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationStartRestoreJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_StopBackupJob.go b/service/backup/api_op_StopBackupJob.go index 979008e254a..b84b02350e8 100644 --- a/service/backup/api_op_StopBackupJob.go +++ b/service/backup/api_op_StopBackupJob.go @@ -48,6 +48,9 @@ func addOperationStopBackupJobMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopBackupJobMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_TagResource.go b/service/backup/api_op_TagResource.go index 2f05a1189fd..7d91dd06c87 100644 --- a/service/backup/api_op_TagResource.go +++ b/service/backup/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_UntagResource.go b/service/backup/api_op_UntagResource.go index c8d6d498c50..538b6ed76cc 100644 --- a/service/backup/api_op_UntagResource.go +++ b/service/backup/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_UpdateBackupPlan.go b/service/backup/api_op_UpdateBackupPlan.go index 8c10d8f3f7b..bd621d41084 100644 --- a/service/backup/api_op_UpdateBackupPlan.go +++ b/service/backup/api_op_UpdateBackupPlan.go @@ -79,6 +79,9 @@ func addOperationUpdateBackupPlanMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateBackupPlanMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_UpdateRecoveryPointLifecycle.go b/service/backup/api_op_UpdateRecoveryPointLifecycle.go index 13cee2e7410..52e735e698f 100644 --- a/service/backup/api_op_UpdateRecoveryPointLifecycle.go +++ b/service/backup/api_op_UpdateRecoveryPointLifecycle.go @@ -98,6 +98,9 @@ func addOperationUpdateRecoveryPointLifecycleMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationUpdateRecoveryPointLifecycleMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/api_op_UpdateRegionSettings.go b/service/backup/api_op_UpdateRegionSettings.go index 0ededbfdef2..172248a519a 100644 --- a/service/backup/api_op_UpdateRegionSettings.go +++ b/service/backup/api_op_UpdateRegionSettings.go @@ -50,6 +50,9 @@ func addOperationUpdateRegionSettingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationUpdateRegionSettingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/backup/go.mod b/service/backup/go.mod index d907b9279af..537103d349d 100644 --- a/service/backup/go.mod +++ b/service/backup/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/backup go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/backup/go.sum b/service/backup/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/backup/go.sum +++ b/service/backup/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/batch/api_client.go b/service/batch/api_client.go index 319d998e149..5f52376dc7a 100644 --- a/service/batch/api_client.go +++ b/service/batch/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/batch/api_op_CancelJob.go b/service/batch/api_op_CancelJob.go index bc44c5df652..c04041ff395 100644 --- a/service/batch/api_op_CancelJob.go +++ b/service/batch/api_op_CancelJob.go @@ -59,6 +59,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_CreateComputeEnvironment.go b/service/batch/api_op_CreateComputeEnvironment.go index db13ac120f3..6cbaeb0aee6 100644 --- a/service/batch/api_op_CreateComputeEnvironment.go +++ b/service/batch/api_op_CreateComputeEnvironment.go @@ -139,6 +139,9 @@ func addOperationCreateComputeEnvironmentMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationCreateComputeEnvironmentMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_CreateJobQueue.go b/service/batch/api_op_CreateJobQueue.go index bc611da0205..b34d7c2b28c 100644 --- a/service/batch/api_op_CreateJobQueue.go +++ b/service/batch/api_op_CreateJobQueue.go @@ -96,6 +96,9 @@ func addOperationCreateJobQueueMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateJobQueueMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DeleteComputeEnvironment.go b/service/batch/api_op_DeleteComputeEnvironment.go index 374e35aefd7..1cd14bbc9b1 100644 --- a/service/batch/api_op_DeleteComputeEnvironment.go +++ b/service/batch/api_op_DeleteComputeEnvironment.go @@ -51,6 +51,9 @@ func addOperationDeleteComputeEnvironmentMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteComputeEnvironmentMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DeleteJobQueue.go b/service/batch/api_op_DeleteJobQueue.go index 3d964093390..72f084dfafa 100644 --- a/service/batch/api_op_DeleteJobQueue.go +++ b/service/batch/api_op_DeleteJobQueue.go @@ -51,6 +51,9 @@ func addOperationDeleteJobQueueMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteJobQueueMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DeregisterJobDefinition.go b/service/batch/api_op_DeregisterJobDefinition.go index b3d4a3de22e..92da97f4693 100644 --- a/service/batch/api_op_DeregisterJobDefinition.go +++ b/service/batch/api_op_DeregisterJobDefinition.go @@ -50,6 +50,9 @@ func addOperationDeregisterJobDefinitionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeregisterJobDefinitionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DescribeComputeEnvironments.go b/service/batch/api_op_DescribeComputeEnvironments.go index ad17b4fc7ee..d08be2955e1 100644 --- a/service/batch/api_op_DescribeComputeEnvironments.go +++ b/service/batch/api_op_DescribeComputeEnvironments.go @@ -80,6 +80,9 @@ func addOperationDescribeComputeEnvironmentsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeComputeEnvironmentsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DescribeJobDefinitions.go b/service/batch/api_op_DescribeJobDefinitions.go index a92d4e72680..5220e490f32 100644 --- a/service/batch/api_op_DescribeJobDefinitions.go +++ b/service/batch/api_op_DescribeJobDefinitions.go @@ -83,6 +83,9 @@ func addOperationDescribeJobDefinitionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeJobDefinitionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DescribeJobQueues.go b/service/batch/api_op_DescribeJobQueues.go index 2879f8456cc..4cd3b1d8e39 100644 --- a/service/batch/api_op_DescribeJobQueues.go +++ b/service/batch/api_op_DescribeJobQueues.go @@ -75,6 +75,9 @@ func addOperationDescribeJobQueuesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeJobQueuesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_DescribeJobs.go b/service/batch/api_op_DescribeJobs.go index 864993c3d42..8ecdc3024fe 100644 --- a/service/batch/api_op_DescribeJobs.go +++ b/service/batch/api_op_DescribeJobs.go @@ -53,6 +53,9 @@ func addOperationDescribeJobsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeJobsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_ListJobs.go b/service/batch/api_op_ListJobs.go index 578eb1568d7..6d531908b5e 100644 --- a/service/batch/api_op_ListJobs.go +++ b/service/batch/api_op_ListJobs.go @@ -103,6 +103,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_ListTagsForResource.go b/service/batch/api_op_ListTagsForResource.go index abd4ee3b843..a61652351cc 100644 --- a/service/batch/api_op_ListTagsForResource.go +++ b/service/batch/api_op_ListTagsForResource.go @@ -57,6 +57,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_RegisterJobDefinition.go b/service/batch/api_op_RegisterJobDefinition.go index 5ac2931f504..247c959cdf0 100644 --- a/service/batch/api_op_RegisterJobDefinition.go +++ b/service/batch/api_op_RegisterJobDefinition.go @@ -112,6 +112,9 @@ func addOperationRegisterJobDefinitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationRegisterJobDefinitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_SubmitJob.go b/service/batch/api_op_SubmitJob.go index 47a0deea06e..1c4015c32fb 100644 --- a/service/batch/api_op_SubmitJob.go +++ b/service/batch/api_op_SubmitJob.go @@ -136,6 +136,9 @@ func addOperationSubmitJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationSubmitJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_TagResource.go b/service/batch/api_op_TagResource.go index 86a9f83678d..5a944f95000 100644 --- a/service/batch/api_op_TagResource.go +++ b/service/batch/api_op_TagResource.go @@ -65,6 +65,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_TerminateJob.go b/service/batch/api_op_TerminateJob.go index ecf4b0b229d..d234e4fe052 100644 --- a/service/batch/api_op_TerminateJob.go +++ b/service/batch/api_op_TerminateJob.go @@ -57,6 +57,9 @@ func addOperationTerminateJobMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTerminateJobMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_UntagResource.go b/service/batch/api_op_UntagResource.go index e4161c683a0..f8cedf3b9d0 100644 --- a/service/batch/api_op_UntagResource.go +++ b/service/batch/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_UpdateComputeEnvironment.go b/service/batch/api_op_UpdateComputeEnvironment.go index 58765e3e92a..c45f2e1e0b5 100644 --- a/service/batch/api_op_UpdateComputeEnvironment.go +++ b/service/batch/api_op_UpdateComputeEnvironment.go @@ -77,6 +77,9 @@ func addOperationUpdateComputeEnvironmentMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateComputeEnvironmentMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/api_op_UpdateJobQueue.go b/service/batch/api_op_UpdateJobQueue.go index fa032d5cd46..c5980015215 100644 --- a/service/batch/api_op_UpdateJobQueue.go +++ b/service/batch/api_op_UpdateJobQueue.go @@ -73,6 +73,9 @@ func addOperationUpdateJobQueueMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateJobQueueMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/batch/go.mod b/service/batch/go.mod index a10b702a104..7c9b1a4ae76 100644 --- a/service/batch/go.mod +++ b/service/batch/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/batch go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/batch/go.sum b/service/batch/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/batch/go.sum +++ b/service/batch/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/braket/api_client.go b/service/braket/api_client.go index e34d11d47c4..687699d04bf 100644 --- a/service/braket/api_client.go +++ b/service/braket/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/braket/api_op_CancelQuantumTask.go b/service/braket/api_op_CancelQuantumTask.go index 3aceed2dd14..eedc16daef5 100644 --- a/service/braket/api_op_CancelQuantumTask.go +++ b/service/braket/api_op_CancelQuantumTask.go @@ -65,6 +65,9 @@ func addOperationCancelQuantumTaskMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,5 +107,8 @@ func addOperationCancelQuantumTaskMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/braket/api_op_CreateQuantumTask.go b/service/braket/api_op_CreateQuantumTask.go index ec6f6bc3546..bf7fbe4b34e 100644 --- a/service/braket/api_op_CreateQuantumTask.go +++ b/service/braket/api_op_CreateQuantumTask.go @@ -84,6 +84,9 @@ func addOperationCreateQuantumTaskMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,5 +126,8 @@ func addOperationCreateQuantumTaskMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/braket/api_op_GetDevice.go b/service/braket/api_op_GetDevice.go index b6b05aa5e47..092ed840344 100644 --- a/service/braket/api_op_GetDevice.go +++ b/service/braket/api_op_GetDevice.go @@ -81,6 +81,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,5 +123,8 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/braket/api_op_GetQuantumTask.go b/service/braket/api_op_GetQuantumTask.go index 50b767e6292..fbd30d0854b 100644 --- a/service/braket/api_op_GetQuantumTask.go +++ b/service/braket/api_op_GetQuantumTask.go @@ -98,6 +98,9 @@ func addOperationGetQuantumTaskMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,5 +140,8 @@ func addOperationGetQuantumTaskMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/braket/api_op_SearchDevices.go b/service/braket/api_op_SearchDevices.go index dacf87be2c4..57aa73b2905 100644 --- a/service/braket/api_op_SearchDevices.go +++ b/service/braket/api_op_SearchDevices.go @@ -69,6 +69,9 @@ func addOperationSearchDevicesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,5 +111,8 @@ func addOperationSearchDevicesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/braket/api_op_SearchQuantumTasks.go b/service/braket/api_op_SearchQuantumTasks.go index 6ef1333d340..dd3779cac62 100644 --- a/service/braket/api_op_SearchQuantumTasks.go +++ b/service/braket/api_op_SearchQuantumTasks.go @@ -69,6 +69,9 @@ func addOperationSearchQuantumTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,5 +111,8 @@ func addOperationSearchQuantumTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/braket/go.mod b/service/braket/go.mod index 1117d0ce809..6ddcc5c1bf6 100644 --- a/service/braket/go.mod +++ b/service/braket/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/braket go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/braket/go.sum b/service/braket/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/braket/go.sum +++ b/service/braket/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/budgets/api_client.go b/service/budgets/api_client.go index 97bad6314d8..ba4dc45061d 100644 --- a/service/budgets/api_client.go +++ b/service/budgets/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/budgets/api_op_CreateBudget.go b/service/budgets/api_op_CreateBudget.go index c91038a9da1..e98227d93f6 100644 --- a/service/budgets/api_op_CreateBudget.go +++ b/service/budgets/api_op_CreateBudget.go @@ -67,6 +67,9 @@ func addOperationCreateBudgetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateBudgetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_CreateBudgetAction.go b/service/budgets/api_op_CreateBudgetAction.go index f2ad1ba4aa4..755e7982197 100644 --- a/service/budgets/api_op_CreateBudgetAction.go +++ b/service/budgets/api_op_CreateBudgetAction.go @@ -109,6 +109,9 @@ func addOperationCreateBudgetActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateBudgetActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_CreateNotification.go b/service/budgets/api_op_CreateNotification.go index 3b9505022fc..ba8f92765d3 100644 --- a/service/budgets/api_op_CreateNotification.go +++ b/service/budgets/api_op_CreateNotification.go @@ -70,6 +70,9 @@ func addOperationCreateNotificationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateNotificationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_CreateSubscriber.go b/service/budgets/api_op_CreateSubscriber.go index 1a9930754c6..26678b83bf9 100644 --- a/service/budgets/api_op_CreateSubscriber.go +++ b/service/budgets/api_op_CreateSubscriber.go @@ -69,6 +69,9 @@ func addOperationCreateSubscriberMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateSubscriberMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DeleteBudget.go b/service/budgets/api_op_DeleteBudget.go index 00bb3c656b1..eadeabdcf92 100644 --- a/service/budgets/api_op_DeleteBudget.go +++ b/service/budgets/api_op_DeleteBudget.go @@ -56,6 +56,9 @@ func addOperationDeleteBudgetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteBudgetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DeleteBudgetAction.go b/service/budgets/api_op_DeleteBudgetAction.go index 55abf5ef7ac..958857c3db8 100644 --- a/service/budgets/api_op_DeleteBudgetAction.go +++ b/service/budgets/api_op_DeleteBudgetAction.go @@ -77,6 +77,9 @@ func addOperationDeleteBudgetActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDeleteBudgetActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DeleteNotification.go b/service/budgets/api_op_DeleteNotification.go index ba65b383033..04be5de13f3 100644 --- a/service/budgets/api_op_DeleteNotification.go +++ b/service/budgets/api_op_DeleteNotification.go @@ -63,6 +63,9 @@ func addOperationDeleteNotificationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteNotificationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DeleteSubscriber.go b/service/budgets/api_op_DeleteSubscriber.go index e87b0655a65..ad3163c4bac 100644 --- a/service/budgets/api_op_DeleteSubscriber.go +++ b/service/budgets/api_op_DeleteSubscriber.go @@ -68,6 +68,9 @@ func addOperationDeleteSubscriberMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteSubscriberMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudget.go b/service/budgets/api_op_DescribeBudget.go index 73b4bdb214c..42284a637c3 100644 --- a/service/budgets/api_op_DescribeBudget.go +++ b/service/budgets/api_op_DescribeBudget.go @@ -63,6 +63,9 @@ func addOperationDescribeBudgetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeBudgetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudgetAction.go b/service/budgets/api_op_DescribeBudgetAction.go index 543afda8692..dec80f3c697 100644 --- a/service/budgets/api_op_DescribeBudgetAction.go +++ b/service/budgets/api_op_DescribeBudgetAction.go @@ -77,6 +77,9 @@ func addOperationDescribeBudgetActionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeBudgetActionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudgetActionHistories.go b/service/budgets/api_op_DescribeBudgetActionHistories.go index db45eb5106d..133b02a785a 100644 --- a/service/budgets/api_op_DescribeBudgetActionHistories.go +++ b/service/budgets/api_op_DescribeBudgetActionHistories.go @@ -81,6 +81,9 @@ func addOperationDescribeBudgetActionHistoriesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeBudgetActionHistoriesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudgetActionsForAccount.go b/service/budgets/api_op_DescribeBudgetActionsForAccount.go index 53273f94cc0..8f3b3bbd061 100644 --- a/service/budgets/api_op_DescribeBudgetActionsForAccount.go +++ b/service/budgets/api_op_DescribeBudgetActionsForAccount.go @@ -65,6 +65,9 @@ func addOperationDescribeBudgetActionsForAccountMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeBudgetActionsForAccountMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudgetActionsForBudget.go b/service/budgets/api_op_DescribeBudgetActionsForBudget.go index d27d15198d5..49d2fa5124e 100644 --- a/service/budgets/api_op_DescribeBudgetActionsForBudget.go +++ b/service/budgets/api_op_DescribeBudgetActionsForBudget.go @@ -71,6 +71,9 @@ func addOperationDescribeBudgetActionsForBudgetMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeBudgetActionsForBudgetMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudgetPerformanceHistory.go b/service/budgets/api_op_DescribeBudgetPerformanceHistory.go index a819d909f4a..fe9659957fb 100644 --- a/service/budgets/api_op_DescribeBudgetPerformanceHistory.go +++ b/service/budgets/api_op_DescribeBudgetPerformanceHistory.go @@ -78,6 +78,9 @@ func addOperationDescribeBudgetPerformanceHistoryMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeBudgetPerformanceHistoryMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeBudgets.go b/service/budgets/api_op_DescribeBudgets.go index ca1ed3c1180..3a687b19e7f 100644 --- a/service/budgets/api_op_DescribeBudgets.go +++ b/service/budgets/api_op_DescribeBudgets.go @@ -70,6 +70,9 @@ func addOperationDescribeBudgetsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeBudgetsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeNotificationsForBudget.go b/service/budgets/api_op_DescribeNotificationsForBudget.go index 69d87ceae34..c1426bbc4b8 100644 --- a/service/budgets/api_op_DescribeNotificationsForBudget.go +++ b/service/budgets/api_op_DescribeNotificationsForBudget.go @@ -73,6 +73,9 @@ func addOperationDescribeNotificationsForBudgetMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeNotificationsForBudgetMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_DescribeSubscribersForNotification.go b/service/budgets/api_op_DescribeSubscribersForNotification.go index 263333e7013..94349f5abb0 100644 --- a/service/budgets/api_op_DescribeSubscribersForNotification.go +++ b/service/budgets/api_op_DescribeSubscribersForNotification.go @@ -78,6 +78,9 @@ func addOperationDescribeSubscribersForNotificationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeSubscribersForNotificationMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_ExecuteBudgetAction.go b/service/budgets/api_op_ExecuteBudgetAction.go index 36334a8ac97..054406123bc 100644 --- a/service/budgets/api_op_ExecuteBudgetAction.go +++ b/service/budgets/api_op_ExecuteBudgetAction.go @@ -87,6 +87,9 @@ func addOperationExecuteBudgetActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationExecuteBudgetActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_UpdateBudget.go b/service/budgets/api_op_UpdateBudget.go index 660b8a179a4..4a434536143 100644 --- a/service/budgets/api_op_UpdateBudget.go +++ b/service/budgets/api_op_UpdateBudget.go @@ -64,6 +64,9 @@ func addOperationUpdateBudgetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateBudgetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_UpdateBudgetAction.go b/service/budgets/api_op_UpdateBudgetAction.go index b7cc596f64f..c465ce895e7 100644 --- a/service/budgets/api_op_UpdateBudgetAction.go +++ b/service/budgets/api_op_UpdateBudgetAction.go @@ -101,6 +101,9 @@ func addOperationUpdateBudgetActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationUpdateBudgetActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_UpdateNotification.go b/service/budgets/api_op_UpdateNotification.go index 7e435724423..050b4e0015d 100644 --- a/service/budgets/api_op_UpdateNotification.go +++ b/service/budgets/api_op_UpdateNotification.go @@ -67,6 +67,9 @@ func addOperationUpdateNotificationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateNotificationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/api_op_UpdateSubscriber.go b/service/budgets/api_op_UpdateSubscriber.go index e4134f0ac92..7deceb4a3de 100644 --- a/service/budgets/api_op_UpdateSubscriber.go +++ b/service/budgets/api_op_UpdateSubscriber.go @@ -72,6 +72,9 @@ func addOperationUpdateSubscriberMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateSubscriberMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/budgets/go.mod b/service/budgets/go.mod index 040a8a4368d..81e7d2c948b 100644 --- a/service/budgets/go.mod +++ b/service/budgets/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/budgets go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/budgets/go.sum b/service/budgets/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/budgets/go.sum +++ b/service/budgets/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/chime/api_client.go b/service/chime/api_client.go index c1911370137..6d7d3b77cbe 100644 --- a/service/chime/api_client.go +++ b/service/chime/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/chime/api_op_AssociatePhoneNumberWithUser.go b/service/chime/api_op_AssociatePhoneNumberWithUser.go index ce32151ce32..836eeb38cb0 100644 --- a/service/chime/api_op_AssociatePhoneNumberWithUser.go +++ b/service/chime/api_op_AssociatePhoneNumberWithUser.go @@ -58,6 +58,9 @@ func addOperationAssociatePhoneNumberWithUserMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAssociatePhoneNumberWithUserMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go index 0814070a931..551f78baacf 100644 --- a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go +++ b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go @@ -64,6 +64,9 @@ func addOperationAssociatePhoneNumbersWithVoiceConnectorMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationAssociatePhoneNumbersWithVoiceConnectorMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go index a335580dd81..741d865b49d 100644 --- a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go +++ b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go @@ -65,6 +65,9 @@ func addOperationAssociatePhoneNumbersWithVoiceConnectorGroupMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAssociatePhoneNumbersWithVoiceConnectorGroupMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go b/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go index b3d6d92c7d5..064c7278279 100644 --- a/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go +++ b/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go @@ -55,6 +55,9 @@ func addOperationAssociateSigninDelegateGroupsWithAccountMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAssociateSigninDelegateGroupsWithAccountMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchCreateAttendee.go b/service/chime/api_op_BatchCreateAttendee.go index 929e186deee..371c34d13e0 100644 --- a/service/chime/api_op_BatchCreateAttendee.go +++ b/service/chime/api_op_BatchCreateAttendee.go @@ -65,6 +65,9 @@ func addOperationBatchCreateAttendeeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationBatchCreateAttendeeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchCreateRoomMembership.go b/service/chime/api_op_BatchCreateRoomMembership.go index 5955e2225d8..8bb79781702 100644 --- a/service/chime/api_op_BatchCreateRoomMembership.go +++ b/service/chime/api_op_BatchCreateRoomMembership.go @@ -66,6 +66,9 @@ func addOperationBatchCreateRoomMembershipMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationBatchCreateRoomMembershipMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchDeletePhoneNumber.go b/service/chime/api_op_BatchDeletePhoneNumber.go index 905c9fe0d34..79510f6ab47 100644 --- a/service/chime/api_op_BatchDeletePhoneNumber.go +++ b/service/chime/api_op_BatchDeletePhoneNumber.go @@ -57,6 +57,9 @@ func addOperationBatchDeletePhoneNumberMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchDeletePhoneNumberMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchSuspendUser.go b/service/chime/api_op_BatchSuspendUser.go index 21164131e16..32bb6b47c67 100644 --- a/service/chime/api_op_BatchSuspendUser.go +++ b/service/chime/api_op_BatchSuspendUser.go @@ -70,6 +70,9 @@ func addOperationBatchSuspendUserMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationBatchSuspendUserMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchUnsuspendUser.go b/service/chime/api_op_BatchUnsuspendUser.go index 0deb79643ec..324ae5d6b46 100644 --- a/service/chime/api_op_BatchUnsuspendUser.go +++ b/service/chime/api_op_BatchUnsuspendUser.go @@ -67,6 +67,9 @@ func addOperationBatchUnsuspendUserMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationBatchUnsuspendUserMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchUpdatePhoneNumber.go b/service/chime/api_op_BatchUpdatePhoneNumber.go index 31f3d55d8b5..93cd4270b0a 100644 --- a/service/chime/api_op_BatchUpdatePhoneNumber.go +++ b/service/chime/api_op_BatchUpdatePhoneNumber.go @@ -62,6 +62,9 @@ func addOperationBatchUpdatePhoneNumberMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationBatchUpdatePhoneNumberMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_BatchUpdateUser.go b/service/chime/api_op_BatchUpdateUser.go index 4b676cc4ce6..5d0ff351c63 100644 --- a/service/chime/api_op_BatchUpdateUser.go +++ b/service/chime/api_op_BatchUpdateUser.go @@ -62,6 +62,9 @@ func addOperationBatchUpdateUserMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationBatchUpdateUserMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateAccount.go b/service/chime/api_op_CreateAccount.go index 7e7e8022fcd..a7e88915478 100644 --- a/service/chime/api_op_CreateAccount.go +++ b/service/chime/api_op_CreateAccount.go @@ -57,6 +57,9 @@ func addOperationCreateAccountMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateAccountMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateAttendee.go b/service/chime/api_op_CreateAttendee.go index 4e9210ee533..0d919d03d7c 100644 --- a/service/chime/api_op_CreateAttendee.go +++ b/service/chime/api_op_CreateAttendee.go @@ -65,6 +65,9 @@ func addOperationCreateAttendeeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateAttendeeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateBot.go b/service/chime/api_op_CreateBot.go index 22c91692885..248647e15c7 100644 --- a/service/chime/api_op_CreateBot.go +++ b/service/chime/api_op_CreateBot.go @@ -61,6 +61,9 @@ func addOperationCreateBotMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateBotMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateMeeting.go b/service/chime/api_op_CreateMeeting.go index 02881ff0e0f..9cc4693867f 100644 --- a/service/chime/api_op_CreateMeeting.go +++ b/service/chime/api_op_CreateMeeting.go @@ -81,6 +81,9 @@ func addOperationCreateMeetingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateMeetingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateMeetingWithAttendees.go b/service/chime/api_op_CreateMeetingWithAttendees.go index 3f6ec7fc9ea..7cd2ebaae39 100644 --- a/service/chime/api_op_CreateMeetingWithAttendees.go +++ b/service/chime/api_op_CreateMeetingWithAttendees.go @@ -92,6 +92,9 @@ func addOperationCreateMeetingWithAttendeesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateMeetingWithAttendeesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreatePhoneNumberOrder.go b/service/chime/api_op_CreatePhoneNumberOrder.go index 50c863c56ca..21e5725ff83 100644 --- a/service/chime/api_op_CreatePhoneNumberOrder.go +++ b/service/chime/api_op_CreatePhoneNumberOrder.go @@ -60,6 +60,9 @@ func addOperationCreatePhoneNumberOrderMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreatePhoneNumberOrderMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateProxySession.go b/service/chime/api_op_CreateProxySession.go index d1eec93b25f..7ea54795e9c 100644 --- a/service/chime/api_op_CreateProxySession.go +++ b/service/chime/api_op_CreateProxySession.go @@ -81,6 +81,9 @@ func addOperationCreateProxySessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateProxySessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateRoom.go b/service/chime/api_op_CreateRoom.go index 6169f2a6be8..e6f6feddf1e 100644 --- a/service/chime/api_op_CreateRoom.go +++ b/service/chime/api_op_CreateRoom.go @@ -62,6 +62,9 @@ func addOperationCreateRoomMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateRoomMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateRoomMembership.go b/service/chime/api_op_CreateRoomMembership.go index 1156f2ac00f..4ed3ae3e3ed 100644 --- a/service/chime/api_op_CreateRoomMembership.go +++ b/service/chime/api_op_CreateRoomMembership.go @@ -68,6 +68,9 @@ func addOperationCreateRoomMembershipMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateRoomMembershipMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateUser.go b/service/chime/api_op_CreateUser.go index 8ad1092fa82..31b2e7d4dcc 100644 --- a/service/chime/api_op_CreateUser.go +++ b/service/chime/api_op_CreateUser.go @@ -62,6 +62,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateVoiceConnector.go b/service/chime/api_op_CreateVoiceConnector.go index 41e7d2ff473..902e2316e7d 100644 --- a/service/chime/api_op_CreateVoiceConnector.go +++ b/service/chime/api_op_CreateVoiceConnector.go @@ -67,6 +67,9 @@ func addOperationCreateVoiceConnectorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateVoiceConnectorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_CreateVoiceConnectorGroup.go b/service/chime/api_op_CreateVoiceConnectorGroup.go index 5683bf01122..6c606ce283e 100644 --- a/service/chime/api_op_CreateVoiceConnectorGroup.go +++ b/service/chime/api_op_CreateVoiceConnectorGroup.go @@ -61,6 +61,9 @@ func addOperationCreateVoiceConnectorGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateVoiceConnectorGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteAccount.go b/service/chime/api_op_DeleteAccount.go index 096a1c9da67..64f4fa440e0 100644 --- a/service/chime/api_op_DeleteAccount.go +++ b/service/chime/api_op_DeleteAccount.go @@ -55,6 +55,9 @@ func addOperationDeleteAccountMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteAccountMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteAttendee.go b/service/chime/api_op_DeleteAttendee.go index 38cede0253a..32e34077c96 100644 --- a/service/chime/api_op_DeleteAttendee.go +++ b/service/chime/api_op_DeleteAttendee.go @@ -58,6 +58,9 @@ func addOperationDeleteAttendeeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteAttendeeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteEventsConfiguration.go b/service/chime/api_op_DeleteEventsConfiguration.go index e5678dbc91d..9d48cb637e7 100644 --- a/service/chime/api_op_DeleteEventsConfiguration.go +++ b/service/chime/api_op_DeleteEventsConfiguration.go @@ -53,6 +53,9 @@ func addOperationDeleteEventsConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteEventsConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteMeeting.go b/service/chime/api_op_DeleteMeeting.go index 0612748914f..c262ceaaea8 100644 --- a/service/chime/api_op_DeleteMeeting.go +++ b/service/chime/api_op_DeleteMeeting.go @@ -52,6 +52,9 @@ func addOperationDeleteMeetingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteMeetingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeletePhoneNumber.go b/service/chime/api_op_DeletePhoneNumber.go index 933c53fdef1..74b7188ded7 100644 --- a/service/chime/api_op_DeletePhoneNumber.go +++ b/service/chime/api_op_DeletePhoneNumber.go @@ -51,6 +51,9 @@ func addOperationDeletePhoneNumberMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeletePhoneNumberMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteProxySession.go b/service/chime/api_op_DeleteProxySession.go index 22b8923dc1e..22e52d3c171 100644 --- a/service/chime/api_op_DeleteProxySession.go +++ b/service/chime/api_op_DeleteProxySession.go @@ -54,6 +54,9 @@ func addOperationDeleteProxySessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteProxySessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteRoom.go b/service/chime/api_op_DeleteRoom.go index 845a707efbc..b20ba1b03f2 100644 --- a/service/chime/api_op_DeleteRoom.go +++ b/service/chime/api_op_DeleteRoom.go @@ -53,6 +53,9 @@ func addOperationDeleteRoomMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteRoomMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteRoomMembership.go b/service/chime/api_op_DeleteRoomMembership.go index 7bda373058b..597d4e55160 100644 --- a/service/chime/api_op_DeleteRoomMembership.go +++ b/service/chime/api_op_DeleteRoomMembership.go @@ -58,6 +58,9 @@ func addOperationDeleteRoomMembershipMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteRoomMembershipMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnector.go b/service/chime/api_op_DeleteVoiceConnector.go index aed72794cb8..95b75b9f7df 100644 --- a/service/chime/api_op_DeleteVoiceConnector.go +++ b/service/chime/api_op_DeleteVoiceConnector.go @@ -50,6 +50,9 @@ func addOperationDeleteVoiceConnectorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteVoiceConnectorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go b/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go index 3dc8450c500..1532c7d523e 100644 --- a/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go +++ b/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go @@ -49,6 +49,9 @@ func addOperationDeleteVoiceConnectorEmergencyCallingConfigurationMiddlewares(st if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteVoiceConnectorEmergencyCallingConfigurationMiddlewares(st if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorGroup.go b/service/chime/api_op_DeleteVoiceConnectorGroup.go index e94c916b642..6bbebe9a0c0 100644 --- a/service/chime/api_op_DeleteVoiceConnectorGroup.go +++ b/service/chime/api_op_DeleteVoiceConnectorGroup.go @@ -50,6 +50,9 @@ func addOperationDeleteVoiceConnectorGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteVoiceConnectorGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorOrigination.go b/service/chime/api_op_DeleteVoiceConnectorOrigination.go index b2e64d009f0..8fe9817133f 100644 --- a/service/chime/api_op_DeleteVoiceConnectorOrigination.go +++ b/service/chime/api_op_DeleteVoiceConnectorOrigination.go @@ -50,6 +50,9 @@ func addOperationDeleteVoiceConnectorOriginationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteVoiceConnectorOriginationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorProxy.go b/service/chime/api_op_DeleteVoiceConnectorProxy.go index 2ce6ebaba43..3307950db9c 100644 --- a/service/chime/api_op_DeleteVoiceConnectorProxy.go +++ b/service/chime/api_op_DeleteVoiceConnectorProxy.go @@ -48,6 +48,9 @@ func addOperationDeleteVoiceConnectorProxyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteVoiceConnectorProxyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go b/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go index 63dc892023c..718b246483c 100644 --- a/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go +++ b/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go @@ -49,6 +49,9 @@ func addOperationDeleteVoiceConnectorStreamingConfigurationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteVoiceConnectorStreamingConfigurationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorTermination.go b/service/chime/api_op_DeleteVoiceConnectorTermination.go index 202a3c8f546..6ea2961f78f 100644 --- a/service/chime/api_op_DeleteVoiceConnectorTermination.go +++ b/service/chime/api_op_DeleteVoiceConnectorTermination.go @@ -50,6 +50,9 @@ func addOperationDeleteVoiceConnectorTerminationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteVoiceConnectorTerminationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go b/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go index dfacfe7d21d..63f34e44d1e 100644 --- a/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go +++ b/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go @@ -55,6 +55,9 @@ func addOperationDeleteVoiceConnectorTerminationCredentialsMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteVoiceConnectorTerminationCredentialsMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DisassociatePhoneNumberFromUser.go b/service/chime/api_op_DisassociatePhoneNumberFromUser.go index 28c3ec0a031..1c8c390cff0 100644 --- a/service/chime/api_op_DisassociatePhoneNumberFromUser.go +++ b/service/chime/api_op_DisassociatePhoneNumberFromUser.go @@ -54,6 +54,9 @@ func addOperationDisassociatePhoneNumberFromUserMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociatePhoneNumberFromUserMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go index bfcf06f4b77..3cdbb145eb6 100644 --- a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go +++ b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go @@ -60,6 +60,9 @@ func addOperationDisassociatePhoneNumbersFromVoiceConnectorMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisassociatePhoneNumbersFromVoiceConnectorMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go index b4ba07d423e..470866b7b04 100644 --- a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go +++ b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go @@ -60,6 +60,9 @@ func addOperationDisassociatePhoneNumbersFromVoiceConnectorGroupMiddlewares(stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisassociatePhoneNumbersFromVoiceConnectorGroupMiddlewares(stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go b/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go index 077a5c2e070..c0f2778fdcb 100644 --- a/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go +++ b/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go @@ -54,6 +54,9 @@ func addOperationDisassociateSigninDelegateGroupsFromAccountMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateSigninDelegateGroupsFromAccountMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetAccount.go b/service/chime/api_op_GetAccount.go index f4addd88598..7afb7ad2767 100644 --- a/service/chime/api_op_GetAccount.go +++ b/service/chime/api_op_GetAccount.go @@ -54,6 +54,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetAccountSettings.go b/service/chime/api_op_GetAccountSettings.go index bd510b047de..8c7a70458cf 100644 --- a/service/chime/api_op_GetAccountSettings.go +++ b/service/chime/api_op_GetAccountSettings.go @@ -57,6 +57,9 @@ func addOperationGetAccountSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetAccountSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetAttendee.go b/service/chime/api_op_GetAttendee.go index 300dd8ba629..8ff3bf60638 100644 --- a/service/chime/api_op_GetAttendee.go +++ b/service/chime/api_op_GetAttendee.go @@ -61,6 +61,9 @@ func addOperationGetAttendeeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetAttendeeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetBot.go b/service/chime/api_op_GetBot.go index 09fb55d8fa7..e46f7f54495 100644 --- a/service/chime/api_op_GetBot.go +++ b/service/chime/api_op_GetBot.go @@ -59,6 +59,9 @@ func addOperationGetBotMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetBotMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetEventsConfiguration.go b/service/chime/api_op_GetEventsConfiguration.go index 391ef27d70b..e935451be08 100644 --- a/service/chime/api_op_GetEventsConfiguration.go +++ b/service/chime/api_op_GetEventsConfiguration.go @@ -59,6 +59,9 @@ func addOperationGetEventsConfigurationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetEventsConfigurationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetGlobalSettings.go b/service/chime/api_op_GetGlobalSettings.go index 86d89b867f7..4ff23064fc6 100644 --- a/service/chime/api_op_GetGlobalSettings.go +++ b/service/chime/api_op_GetGlobalSettings.go @@ -52,6 +52,9 @@ func addOperationGetGlobalSettingsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationGetGlobalSettingsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetMeeting.go b/service/chime/api_op_GetMeeting.go index b6eec1ebecc..852514e41f9 100644 --- a/service/chime/api_op_GetMeeting.go +++ b/service/chime/api_op_GetMeeting.go @@ -56,6 +56,9 @@ func addOperationGetMeetingMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetMeetingMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetPhoneNumber.go b/service/chime/api_op_GetPhoneNumber.go index e2f0f02cc41..dda4d4f1e6a 100644 --- a/service/chime/api_op_GetPhoneNumber.go +++ b/service/chime/api_op_GetPhoneNumber.go @@ -54,6 +54,9 @@ func addOperationGetPhoneNumberMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetPhoneNumberMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetPhoneNumberOrder.go b/service/chime/api_op_GetPhoneNumberOrder.go index b1f0ab38aad..d53e5d49fd9 100644 --- a/service/chime/api_op_GetPhoneNumberOrder.go +++ b/service/chime/api_op_GetPhoneNumberOrder.go @@ -54,6 +54,9 @@ func addOperationGetPhoneNumberOrderMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetPhoneNumberOrderMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetPhoneNumberSettings.go b/service/chime/api_op_GetPhoneNumberSettings.go index d708709409f..ebc54447b32 100644 --- a/service/chime/api_op_GetPhoneNumberSettings.go +++ b/service/chime/api_op_GetPhoneNumberSettings.go @@ -52,6 +52,9 @@ func addOperationGetPhoneNumberSettingsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationGetPhoneNumberSettingsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetProxySession.go b/service/chime/api_op_GetProxySession.go index 79f4736b996..a98497fa40c 100644 --- a/service/chime/api_op_GetProxySession.go +++ b/service/chime/api_op_GetProxySession.go @@ -59,6 +59,9 @@ func addOperationGetProxySessionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetProxySessionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetRetentionSettings.go b/service/chime/api_op_GetRetentionSettings.go index a6a421a1145..a31b9d8d6e5 100644 --- a/service/chime/api_op_GetRetentionSettings.go +++ b/service/chime/api_op_GetRetentionSettings.go @@ -61,6 +61,9 @@ func addOperationGetRetentionSettingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetRetentionSettingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetRoom.go b/service/chime/api_op_GetRoom.go index 057c71711fd..170c6dfbb81 100644 --- a/service/chime/api_op_GetRoom.go +++ b/service/chime/api_op_GetRoom.go @@ -59,6 +59,9 @@ func addOperationGetRoomMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetRoomMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetUser.go b/service/chime/api_op_GetUser.go index 0947e64bdd3..ed9c6b6b566 100644 --- a/service/chime/api_op_GetUser.go +++ b/service/chime/api_op_GetUser.go @@ -61,6 +61,9 @@ func addOperationGetUserMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetUserMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetUserSettings.go b/service/chime/api_op_GetUserSettings.go index a40b42be2f0..692a459b395 100644 --- a/service/chime/api_op_GetUserSettings.go +++ b/service/chime/api_op_GetUserSettings.go @@ -59,6 +59,9 @@ func addOperationGetUserSettingsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetUserSettingsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnector.go b/service/chime/api_op_GetVoiceConnector.go index 3eea95e9b0e..065f5bfe5df 100644 --- a/service/chime/api_op_GetVoiceConnector.go +++ b/service/chime/api_op_GetVoiceConnector.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go b/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go index a9bc28cdb65..159dcd13ad2 100644 --- a/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go +++ b/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorGroup.go b/service/chime/api_op_GetVoiceConnectorGroup.go index 7c0b77f2dfa..49012cb41f7 100644 --- a/service/chime/api_op_GetVoiceConnectorGroup.go +++ b/service/chime/api_op_GetVoiceConnectorGroup.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go b/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go index 450434946f1..6a9ab1cbcdf 100644 --- a/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go +++ b/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go @@ -55,6 +55,9 @@ func addOperationGetVoiceConnectorLoggingConfigurationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetVoiceConnectorLoggingConfigurationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorOrigination.go b/service/chime/api_op_GetVoiceConnectorOrigination.go index 7d9a17ee96f..4d18483d13a 100644 --- a/service/chime/api_op_GetVoiceConnectorOrigination.go +++ b/service/chime/api_op_GetVoiceConnectorOrigination.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorOriginationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorOriginationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorProxy.go b/service/chime/api_op_GetVoiceConnectorProxy.go index d03a18747f2..8abff10b080 100644 --- a/service/chime/api_op_GetVoiceConnectorProxy.go +++ b/service/chime/api_op_GetVoiceConnectorProxy.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorProxyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorProxyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go b/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go index bd9592067af..aed7d1c3227 100644 --- a/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go +++ b/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go @@ -56,6 +56,9 @@ func addOperationGetVoiceConnectorStreamingConfigurationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetVoiceConnectorStreamingConfigurationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorTermination.go b/service/chime/api_op_GetVoiceConnectorTermination.go index 821321b4120..0a23bf60b6a 100644 --- a/service/chime/api_op_GetVoiceConnectorTermination.go +++ b/service/chime/api_op_GetVoiceConnectorTermination.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorTerminationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorTerminationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_GetVoiceConnectorTerminationHealth.go b/service/chime/api_op_GetVoiceConnectorTerminationHealth.go index 9e776278fec..a001f98b80e 100644 --- a/service/chime/api_op_GetVoiceConnectorTerminationHealth.go +++ b/service/chime/api_op_GetVoiceConnectorTerminationHealth.go @@ -54,6 +54,9 @@ func addOperationGetVoiceConnectorTerminationHealthMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetVoiceConnectorTerminationHealthMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_InviteUsers.go b/service/chime/api_op_InviteUsers.go index 046abc90420..7b73ac1cf71 100644 --- a/service/chime/api_op_InviteUsers.go +++ b/service/chime/api_op_InviteUsers.go @@ -63,6 +63,9 @@ func addOperationInviteUsersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationInviteUsersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListAccounts.go b/service/chime/api_op_ListAccounts.go index f580d0c5b4d..8fbece0e1b4 100644 --- a/service/chime/api_op_ListAccounts.go +++ b/service/chime/api_op_ListAccounts.go @@ -66,6 +66,9 @@ func addOperationListAccountsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListAccountsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListAttendeeTags.go b/service/chime/api_op_ListAttendeeTags.go index e9794f82c0d..594b4f28333 100644 --- a/service/chime/api_op_ListAttendeeTags.go +++ b/service/chime/api_op_ListAttendeeTags.go @@ -58,6 +58,9 @@ func addOperationListAttendeeTagsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListAttendeeTagsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListAttendees.go b/service/chime/api_op_ListAttendees.go index 4b5110128f1..222d3b04a7f 100644 --- a/service/chime/api_op_ListAttendees.go +++ b/service/chime/api_op_ListAttendees.go @@ -65,6 +65,9 @@ func addOperationListAttendeesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAttendeesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListBots.go b/service/chime/api_op_ListBots.go index 29b8c8de460..cad80284924 100644 --- a/service/chime/api_op_ListBots.go +++ b/service/chime/api_op_ListBots.go @@ -63,6 +63,9 @@ func addOperationListBotsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListBotsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListMeetingTags.go b/service/chime/api_op_ListMeetingTags.go index 422baf5faf0..560de3bfd64 100644 --- a/service/chime/api_op_ListMeetingTags.go +++ b/service/chime/api_op_ListMeetingTags.go @@ -53,6 +53,9 @@ func addOperationListMeetingTagsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListMeetingTagsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListMeetings.go b/service/chime/api_op_ListMeetings.go index ca2b28eb4af..7fc36ed390b 100644 --- a/service/chime/api_op_ListMeetings.go +++ b/service/chime/api_op_ListMeetings.go @@ -60,6 +60,9 @@ func addOperationListMeetingsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListMeetingsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListPhoneNumberOrders.go b/service/chime/api_op_ListPhoneNumberOrders.go index 422e8ac76cb..6bcb3851730 100644 --- a/service/chime/api_op_ListPhoneNumberOrders.go +++ b/service/chime/api_op_ListPhoneNumberOrders.go @@ -57,6 +57,9 @@ func addOperationListPhoneNumberOrdersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListPhoneNumberOrdersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListPhoneNumbers.go b/service/chime/api_op_ListPhoneNumbers.go index 30eaf07c5d2..c69c9fc8f42 100644 --- a/service/chime/api_op_ListPhoneNumbers.go +++ b/service/chime/api_op_ListPhoneNumbers.go @@ -70,6 +70,9 @@ func addOperationListPhoneNumbersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListPhoneNumbersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListProxySessions.go b/service/chime/api_op_ListProxySessions.go index 8abf7fb2df2..e30d4ac98e0 100644 --- a/service/chime/api_op_ListProxySessions.go +++ b/service/chime/api_op_ListProxySessions.go @@ -65,6 +65,9 @@ func addOperationListProxySessionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListProxySessionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListRoomMemberships.go b/service/chime/api_op_ListRoomMemberships.go index 7353911cc15..00f4ffa9f1c 100644 --- a/service/chime/api_op_ListRoomMemberships.go +++ b/service/chime/api_op_ListRoomMemberships.go @@ -68,6 +68,9 @@ func addOperationListRoomMembershipsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListRoomMembershipsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListRooms.go b/service/chime/api_op_ListRooms.go index 8a7e33b75f8..3c499c1d18b 100644 --- a/service/chime/api_op_ListRooms.go +++ b/service/chime/api_op_ListRooms.go @@ -67,6 +67,9 @@ func addOperationListRoomsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListRoomsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListTagsForResource.go b/service/chime/api_op_ListTagsForResource.go index 315209eba02..c62503a32fb 100644 --- a/service/chime/api_op_ListTagsForResource.go +++ b/service/chime/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListUsers.go b/service/chime/api_op_ListUsers.go index 5b87981c675..3eede25fa73 100644 --- a/service/chime/api_op_ListUsers.go +++ b/service/chime/api_op_ListUsers.go @@ -70,6 +70,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListVoiceConnectorGroups.go b/service/chime/api_op_ListVoiceConnectorGroups.go index bdd50a86ff7..4906cac91c2 100644 --- a/service/chime/api_op_ListVoiceConnectorGroups.go +++ b/service/chime/api_op_ListVoiceConnectorGroups.go @@ -58,6 +58,9 @@ func addOperationListVoiceConnectorGroupsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListVoiceConnectorGroupsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go b/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go index 18a5690294c..f8aaa939163 100644 --- a/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go +++ b/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go @@ -52,6 +52,9 @@ func addOperationListVoiceConnectorTerminationCredentialsMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListVoiceConnectorTerminationCredentialsMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ListVoiceConnectors.go b/service/chime/api_op_ListVoiceConnectors.go index e4f81f927df..e5bf7955b3a 100644 --- a/service/chime/api_op_ListVoiceConnectors.go +++ b/service/chime/api_op_ListVoiceConnectors.go @@ -57,6 +57,9 @@ func addOperationListVoiceConnectorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListVoiceConnectorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_LogoutUser.go b/service/chime/api_op_LogoutUser.go index b7f40d95275..69de6c884c4 100644 --- a/service/chime/api_op_LogoutUser.go +++ b/service/chime/api_op_LogoutUser.go @@ -54,6 +54,9 @@ func addOperationLogoutUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationLogoutUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutEventsConfiguration.go b/service/chime/api_op_PutEventsConfiguration.go index 35856cb71b7..87cc26be3d5 100644 --- a/service/chime/api_op_PutEventsConfiguration.go +++ b/service/chime/api_op_PutEventsConfiguration.go @@ -67,6 +67,9 @@ func addOperationPutEventsConfigurationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationPutEventsConfigurationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutRetentionSettings.go b/service/chime/api_op_PutRetentionSettings.go index eb7b5910c28..6519b5d3368 100644 --- a/service/chime/api_op_PutRetentionSettings.go +++ b/service/chime/api_op_PutRetentionSettings.go @@ -72,6 +72,9 @@ func addOperationPutRetentionSettingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutRetentionSettingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go b/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go index eb13e123825..03ebd3d5463 100644 --- a/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go +++ b/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go @@ -61,6 +61,9 @@ func addOperationPutVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationPutVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go b/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go index c236a8f6aa6..5bfdb0c4df3 100644 --- a/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go +++ b/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go @@ -60,6 +60,9 @@ func addOperationPutVoiceConnectorLoggingConfigurationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutVoiceConnectorLoggingConfigurationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorOrigination.go b/service/chime/api_op_PutVoiceConnectorOrigination.go index 12c59ae616b..4845f7d734f 100644 --- a/service/chime/api_op_PutVoiceConnectorOrigination.go +++ b/service/chime/api_op_PutVoiceConnectorOrigination.go @@ -60,6 +60,9 @@ func addOperationPutVoiceConnectorOriginationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutVoiceConnectorOriginationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorProxy.go b/service/chime/api_op_PutVoiceConnectorProxy.go index f2178f42064..1ffdc1ec48f 100644 --- a/service/chime/api_op_PutVoiceConnectorProxy.go +++ b/service/chime/api_op_PutVoiceConnectorProxy.go @@ -71,6 +71,9 @@ func addOperationPutVoiceConnectorProxyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationPutVoiceConnectorProxyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go b/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go index b7f8da2b0be..1e030070541 100644 --- a/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go +++ b/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go @@ -61,6 +61,9 @@ func addOperationPutVoiceConnectorStreamingConfigurationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationPutVoiceConnectorStreamingConfigurationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorTermination.go b/service/chime/api_op_PutVoiceConnectorTermination.go index 0618a9e870f..04162e04982 100644 --- a/service/chime/api_op_PutVoiceConnectorTermination.go +++ b/service/chime/api_op_PutVoiceConnectorTermination.go @@ -60,6 +60,9 @@ func addOperationPutVoiceConnectorTerminationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutVoiceConnectorTerminationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go b/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go index 2c531df2a96..d2df703d42a 100644 --- a/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go +++ b/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go @@ -52,6 +52,9 @@ func addOperationPutVoiceConnectorTerminationCredentialsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationPutVoiceConnectorTerminationCredentialsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_RedactConversationMessage.go b/service/chime/api_op_RedactConversationMessage.go index ae3b08a3485..0f4b65b7f4b 100644 --- a/service/chime/api_op_RedactConversationMessage.go +++ b/service/chime/api_op_RedactConversationMessage.go @@ -58,6 +58,9 @@ func addOperationRedactConversationMessageMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRedactConversationMessageMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_RedactRoomMessage.go b/service/chime/api_op_RedactRoomMessage.go index 1331c2f1b50..eb3c636eea8 100644 --- a/service/chime/api_op_RedactRoomMessage.go +++ b/service/chime/api_op_RedactRoomMessage.go @@ -58,6 +58,9 @@ func addOperationRedactRoomMessageMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRedactRoomMessageMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_RegenerateSecurityToken.go b/service/chime/api_op_RegenerateSecurityToken.go index 1aed15a0425..3dbb71caf02 100644 --- a/service/chime/api_op_RegenerateSecurityToken.go +++ b/service/chime/api_op_RegenerateSecurityToken.go @@ -59,6 +59,9 @@ func addOperationRegenerateSecurityTokenMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRegenerateSecurityTokenMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_ResetPersonalPIN.go b/service/chime/api_op_ResetPersonalPIN.go index 28a2f1c9406..856cc32af14 100644 --- a/service/chime/api_op_ResetPersonalPIN.go +++ b/service/chime/api_op_ResetPersonalPIN.go @@ -59,6 +59,9 @@ func addOperationResetPersonalPINMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationResetPersonalPINMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_RestorePhoneNumber.go b/service/chime/api_op_RestorePhoneNumber.go index 97a1417cc34..30a721f62f0 100644 --- a/service/chime/api_op_RestorePhoneNumber.go +++ b/service/chime/api_op_RestorePhoneNumber.go @@ -54,6 +54,9 @@ func addOperationRestorePhoneNumberMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationRestorePhoneNumberMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_SearchAvailablePhoneNumbers.go b/service/chime/api_op_SearchAvailablePhoneNumbers.go index e6cac5f2ae4..c2f7b85004f 100644 --- a/service/chime/api_op_SearchAvailablePhoneNumbers.go +++ b/service/chime/api_op_SearchAvailablePhoneNumbers.go @@ -68,6 +68,9 @@ func addOperationSearchAvailablePhoneNumbersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSearchAvailablePhoneNumbersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_TagAttendee.go b/service/chime/api_op_TagAttendee.go index 209bb1ae649..fa0f7f5ca30 100644 --- a/service/chime/api_op_TagAttendee.go +++ b/service/chime/api_op_TagAttendee.go @@ -59,6 +59,9 @@ func addOperationTagAttendeeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagAttendeeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_TagMeeting.go b/service/chime/api_op_TagMeeting.go index 0c49826419c..44576dceb90 100644 --- a/service/chime/api_op_TagMeeting.go +++ b/service/chime/api_op_TagMeeting.go @@ -54,6 +54,9 @@ func addOperationTagMeetingMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagMeetingMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_TagResource.go b/service/chime/api_op_TagResource.go index 958e2e71817..d16dde26395 100644 --- a/service/chime/api_op_TagResource.go +++ b/service/chime/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UntagAttendee.go b/service/chime/api_op_UntagAttendee.go index 8d4f984f6cf..4ea945173cb 100644 --- a/service/chime/api_op_UntagAttendee.go +++ b/service/chime/api_op_UntagAttendee.go @@ -58,6 +58,9 @@ func addOperationUntagAttendeeMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUntagAttendeeMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UntagMeeting.go b/service/chime/api_op_UntagMeeting.go index fe546f0babb..3a94339ed37 100644 --- a/service/chime/api_op_UntagMeeting.go +++ b/service/chime/api_op_UntagMeeting.go @@ -53,6 +53,9 @@ func addOperationUntagMeetingMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagMeetingMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UntagResource.go b/service/chime/api_op_UntagResource.go index a7f6b75bf68..755a20eda18 100644 --- a/service/chime/api_op_UntagResource.go +++ b/service/chime/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateAccount.go b/service/chime/api_op_UpdateAccount.go index 11845472ddc..c21764c7620 100644 --- a/service/chime/api_op_UpdateAccount.go +++ b/service/chime/api_op_UpdateAccount.go @@ -57,6 +57,9 @@ func addOperationUpdateAccountMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateAccountMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateAccountSettings.go b/service/chime/api_op_UpdateAccountSettings.go index 50f407a49de..ccdbc33859a 100644 --- a/service/chime/api_op_UpdateAccountSettings.go +++ b/service/chime/api_op_UpdateAccountSettings.go @@ -58,6 +58,9 @@ func addOperationUpdateAccountSettingsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateAccountSettingsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateBot.go b/service/chime/api_op_UpdateBot.go index 992132fa21c..76eb9297e3d 100644 --- a/service/chime/api_op_UpdateBot.go +++ b/service/chime/api_op_UpdateBot.go @@ -62,6 +62,9 @@ func addOperationUpdateBotMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateBotMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateGlobalSettings.go b/service/chime/api_op_UpdateGlobalSettings.go index 86ec5a880e9..b14970171b5 100644 --- a/service/chime/api_op_UpdateGlobalSettings.go +++ b/service/chime/api_op_UpdateGlobalSettings.go @@ -55,6 +55,9 @@ func addOperationUpdateGlobalSettingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateGlobalSettingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdatePhoneNumber.go b/service/chime/api_op_UpdatePhoneNumber.go index 56834284531..d2859fe81a4 100644 --- a/service/chime/api_op_UpdatePhoneNumber.go +++ b/service/chime/api_op_UpdatePhoneNumber.go @@ -65,6 +65,9 @@ func addOperationUpdatePhoneNumberMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdatePhoneNumberMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdatePhoneNumberSettings.go b/service/chime/api_op_UpdatePhoneNumberSettings.go index f7f0d746766..337c155fc26 100644 --- a/service/chime/api_op_UpdatePhoneNumberSettings.go +++ b/service/chime/api_op_UpdatePhoneNumberSettings.go @@ -51,6 +51,9 @@ func addOperationUpdatePhoneNumberSettingsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdatePhoneNumberSettingsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateProxySession.go b/service/chime/api_op_UpdateProxySession.go index b1bedb1ef4d..7c424f79297 100644 --- a/service/chime/api_op_UpdateProxySession.go +++ b/service/chime/api_op_UpdateProxySession.go @@ -66,6 +66,9 @@ func addOperationUpdateProxySessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateProxySessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateRoom.go b/service/chime/api_op_UpdateRoom.go index 9e9a4ca60d4..3dc9da4309d 100644 --- a/service/chime/api_op_UpdateRoom.go +++ b/service/chime/api_op_UpdateRoom.go @@ -62,6 +62,9 @@ func addOperationUpdateRoomMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateRoomMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateRoomMembership.go b/service/chime/api_op_UpdateRoomMembership.go index f01ea3c4212..e5b214e1c57 100644 --- a/service/chime/api_op_UpdateRoomMembership.go +++ b/service/chime/api_op_UpdateRoomMembership.go @@ -69,6 +69,9 @@ func addOperationUpdateRoomMembershipMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateRoomMembershipMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateUser.go b/service/chime/api_op_UpdateUser.go index 67a67ea7ab2..db52e7aae94 100644 --- a/service/chime/api_op_UpdateUser.go +++ b/service/chime/api_op_UpdateUser.go @@ -69,6 +69,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateUserSettings.go b/service/chime/api_op_UpdateUserSettings.go index ef01ed487eb..f8a09536595 100644 --- a/service/chime/api_op_UpdateUserSettings.go +++ b/service/chime/api_op_UpdateUserSettings.go @@ -59,6 +59,9 @@ func addOperationUpdateUserSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateUserSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateVoiceConnector.go b/service/chime/api_op_UpdateVoiceConnector.go index 63401299ba6..19d0d24290f 100644 --- a/service/chime/api_op_UpdateVoiceConnector.go +++ b/service/chime/api_op_UpdateVoiceConnector.go @@ -63,6 +63,9 @@ func addOperationUpdateVoiceConnectorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateVoiceConnectorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/api_op_UpdateVoiceConnectorGroup.go b/service/chime/api_op_UpdateVoiceConnectorGroup.go index c336ffd7acf..096bdf0243e 100644 --- a/service/chime/api_op_UpdateVoiceConnectorGroup.go +++ b/service/chime/api_op_UpdateVoiceConnectorGroup.go @@ -64,6 +64,9 @@ func addOperationUpdateVoiceConnectorGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateVoiceConnectorGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/chime/go.mod b/service/chime/go.mod index f9c93c85487..f2b18aec011 100644 --- a/service/chime/go.mod +++ b/service/chime/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/chime go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chime/go.sum b/service/chime/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/chime/go.sum +++ b/service/chime/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloud9/api_client.go b/service/cloud9/api_client.go index d747b6af0e2..d1527562874 100644 --- a/service/cloud9/api_client.go +++ b/service/cloud9/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloud9/api_op_CreateEnvironmentEC2.go b/service/cloud9/api_op_CreateEnvironmentEC2.go index ae41a8a45d9..18054ee05f9 100644 --- a/service/cloud9/api_op_CreateEnvironmentEC2.go +++ b/service/cloud9/api_op_CreateEnvironmentEC2.go @@ -90,6 +90,9 @@ func addOperationCreateEnvironmentEC2Middlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateEnvironmentEC2Middlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_CreateEnvironmentMembership.go b/service/cloud9/api_op_CreateEnvironmentMembership.go index b510ddb1434..cdf7b6e3ed2 100644 --- a/service/cloud9/api_op_CreateEnvironmentMembership.go +++ b/service/cloud9/api_op_CreateEnvironmentMembership.go @@ -69,6 +69,9 @@ func addOperationCreateEnvironmentMembershipMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateEnvironmentMembershipMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_DeleteEnvironment.go b/service/cloud9/api_op_DeleteEnvironment.go index cfad78b27bb..48e63298137 100644 --- a/service/cloud9/api_op_DeleteEnvironment.go +++ b/service/cloud9/api_op_DeleteEnvironment.go @@ -49,6 +49,9 @@ func addOperationDeleteEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_DeleteEnvironmentMembership.go b/service/cloud9/api_op_DeleteEnvironmentMembership.go index 9c474a7b8fc..f36e5c941a9 100644 --- a/service/cloud9/api_op_DeleteEnvironmentMembership.go +++ b/service/cloud9/api_op_DeleteEnvironmentMembership.go @@ -54,6 +54,9 @@ func addOperationDeleteEnvironmentMembershipMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteEnvironmentMembershipMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_DescribeEnvironmentMemberships.go b/service/cloud9/api_op_DescribeEnvironmentMemberships.go index 20c523945bc..93f1af5a06c 100644 --- a/service/cloud9/api_op_DescribeEnvironmentMemberships.go +++ b/service/cloud9/api_op_DescribeEnvironmentMemberships.go @@ -89,6 +89,9 @@ func addOperationDescribeEnvironmentMembershipsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeEnvironmentMembershipsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_DescribeEnvironmentStatus.go b/service/cloud9/api_op_DescribeEnvironmentStatus.go index a17a5256e02..f2f37d56e23 100644 --- a/service/cloud9/api_op_DescribeEnvironmentStatus.go +++ b/service/cloud9/api_op_DescribeEnvironmentStatus.go @@ -74,6 +74,9 @@ func addOperationDescribeEnvironmentStatusMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeEnvironmentStatusMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_DescribeEnvironments.go b/service/cloud9/api_op_DescribeEnvironments.go index 9438d211579..4c0b8a7baa4 100644 --- a/service/cloud9/api_op_DescribeEnvironments.go +++ b/service/cloud9/api_op_DescribeEnvironments.go @@ -53,6 +53,9 @@ func addOperationDescribeEnvironmentsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeEnvironmentsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_ListEnvironments.go b/service/cloud9/api_op_ListEnvironments.go index 2222685b715..40e9c0e521b 100644 --- a/service/cloud9/api_op_ListEnvironments.go +++ b/service/cloud9/api_op_ListEnvironments.go @@ -64,6 +64,9 @@ func addOperationListEnvironmentsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListEnvironmentsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_ListTagsForResource.go b/service/cloud9/api_op_ListTagsForResource.go index b04f69875ec..a1f2e48aacf 100644 --- a/service/cloud9/api_op_ListTagsForResource.go +++ b/service/cloud9/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_TagResource.go b/service/cloud9/api_op_TagResource.go index 5fe2f6e5362..315573e2c96 100644 --- a/service/cloud9/api_op_TagResource.go +++ b/service/cloud9/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_UntagResource.go b/service/cloud9/api_op_UntagResource.go index e2ba80b7eb6..ad8927185b6 100644 --- a/service/cloud9/api_op_UntagResource.go +++ b/service/cloud9/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_UpdateEnvironment.go b/service/cloud9/api_op_UpdateEnvironment.go index c717b2dcd4b..33338f9b7de 100644 --- a/service/cloud9/api_op_UpdateEnvironment.go +++ b/service/cloud9/api_op_UpdateEnvironment.go @@ -54,6 +54,9 @@ func addOperationUpdateEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/api_op_UpdateEnvironmentMembership.go b/service/cloud9/api_op_UpdateEnvironmentMembership.go index 217a08395cf..030a0849653 100644 --- a/service/cloud9/api_op_UpdateEnvironmentMembership.go +++ b/service/cloud9/api_op_UpdateEnvironmentMembership.go @@ -73,6 +73,9 @@ func addOperationUpdateEnvironmentMembershipMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateEnvironmentMembershipMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloud9/go.mod b/service/cloud9/go.mod index 5c07637a0e3..d13e033f74f 100644 --- a/service/cloud9/go.mod +++ b/service/cloud9/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloud9 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloud9/go.sum b/service/cloud9/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloud9/go.sum +++ b/service/cloud9/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/clouddirectory/api_client.go b/service/clouddirectory/api_client.go index f4621d9165d..1e6e1747118 100644 --- a/service/clouddirectory/api_client.go +++ b/service/clouddirectory/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/clouddirectory/api_op_AddFacetToObject.go b/service/clouddirectory/api_op_AddFacetToObject.go index 66badf53ba8..c1ee0b8d855 100644 --- a/service/clouddirectory/api_op_AddFacetToObject.go +++ b/service/clouddirectory/api_op_AddFacetToObject.go @@ -65,6 +65,9 @@ func addOperationAddFacetToObjectMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAddFacetToObjectMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ApplySchema.go b/service/clouddirectory/api_op_ApplySchema.go index 4829b85579a..77ac415c419 100644 --- a/service/clouddirectory/api_op_ApplySchema.go +++ b/service/clouddirectory/api_op_ApplySchema.go @@ -65,6 +65,9 @@ func addOperationApplySchemaMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationApplySchemaMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_AttachObject.go b/service/clouddirectory/api_op_AttachObject.go index b6a34cd99ef..69600f7548e 100644 --- a/service/clouddirectory/api_op_AttachObject.go +++ b/service/clouddirectory/api_op_AttachObject.go @@ -74,6 +74,9 @@ func addOperationAttachObjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationAttachObjectMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_AttachPolicy.go b/service/clouddirectory/api_op_AttachPolicy.go index 2e7726c4b4b..2b9966b8f6e 100644 --- a/service/clouddirectory/api_op_AttachPolicy.go +++ b/service/clouddirectory/api_op_AttachPolicy.go @@ -61,6 +61,9 @@ func addOperationAttachPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAttachPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_AttachToIndex.go b/service/clouddirectory/api_op_AttachToIndex.go index 6e0ccb6eb96..4aa759d8d9d 100644 --- a/service/clouddirectory/api_op_AttachToIndex.go +++ b/service/clouddirectory/api_op_AttachToIndex.go @@ -64,6 +64,9 @@ func addOperationAttachToIndexMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationAttachToIndexMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_AttachTypedLink.go b/service/clouddirectory/api_op_AttachTypedLink.go index cd94ec0c5b5..2845c25de3f 100644 --- a/service/clouddirectory/api_op_AttachTypedLink.go +++ b/service/clouddirectory/api_op_AttachTypedLink.go @@ -76,6 +76,9 @@ func addOperationAttachTypedLinkMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationAttachTypedLinkMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_BatchRead.go b/service/clouddirectory/api_op_BatchRead.go index 752b7c92914..97c64b21ca5 100644 --- a/service/clouddirectory/api_op_BatchRead.go +++ b/service/clouddirectory/api_op_BatchRead.go @@ -63,6 +63,9 @@ func addOperationBatchReadMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationBatchReadMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_BatchWrite.go b/service/clouddirectory/api_op_BatchWrite.go index 730679a054d..44c2ef9dd97 100644 --- a/service/clouddirectory/api_op_BatchWrite.go +++ b/service/clouddirectory/api_op_BatchWrite.go @@ -60,6 +60,9 @@ func addOperationBatchWriteMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchWriteMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_CreateDirectory.go b/service/clouddirectory/api_op_CreateDirectory.go index dd953947fef..d141f19d17a 100644 --- a/service/clouddirectory/api_op_CreateDirectory.go +++ b/service/clouddirectory/api_op_CreateDirectory.go @@ -82,6 +82,9 @@ func addOperationCreateDirectoryMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateDirectoryMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_CreateFacet.go b/service/clouddirectory/api_op_CreateFacet.go index 11624a1fa27..b10356a3491 100644 --- a/service/clouddirectory/api_op_CreateFacet.go +++ b/service/clouddirectory/api_op_CreateFacet.go @@ -81,6 +81,9 @@ func addOperationCreateFacetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateFacetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_CreateIndex.go b/service/clouddirectory/api_op_CreateIndex.go index b3940464ec6..2446a033197 100644 --- a/service/clouddirectory/api_op_CreateIndex.go +++ b/service/clouddirectory/api_op_CreateIndex.go @@ -72,6 +72,9 @@ func addOperationCreateIndexMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateIndexMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_CreateObject.go b/service/clouddirectory/api_op_CreateObject.go index 9f75bf0177d..ddcd5f81830 100644 --- a/service/clouddirectory/api_op_CreateObject.go +++ b/service/clouddirectory/api_op_CreateObject.go @@ -73,6 +73,9 @@ func addOperationCreateObjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateObjectMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_CreateSchema.go b/service/clouddirectory/api_op_CreateSchema.go index 670a5b9596e..8da4a0d98ad 100644 --- a/service/clouddirectory/api_op_CreateSchema.go +++ b/service/clouddirectory/api_op_CreateSchema.go @@ -67,6 +67,9 @@ func addOperationCreateSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_CreateTypedLinkFacet.go b/service/clouddirectory/api_op_CreateTypedLinkFacet.go index ba0f53695ae..27d06f8d46e 100644 --- a/service/clouddirectory/api_op_CreateTypedLinkFacet.go +++ b/service/clouddirectory/api_op_CreateTypedLinkFacet.go @@ -56,6 +56,9 @@ func addOperationCreateTypedLinkFacetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateTypedLinkFacetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DeleteDirectory.go b/service/clouddirectory/api_op_DeleteDirectory.go index 6bc4c918323..71afe48f214 100644 --- a/service/clouddirectory/api_op_DeleteDirectory.go +++ b/service/clouddirectory/api_op_DeleteDirectory.go @@ -55,6 +55,9 @@ func addOperationDeleteDirectoryMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteDirectoryMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DeleteFacet.go b/service/clouddirectory/api_op_DeleteFacet.go index 13d54d94c61..3f5fcac9946 100644 --- a/service/clouddirectory/api_op_DeleteFacet.go +++ b/service/clouddirectory/api_op_DeleteFacet.go @@ -55,6 +55,9 @@ func addOperationDeleteFacetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteFacetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DeleteObject.go b/service/clouddirectory/api_op_DeleteObject.go index a003d6aeb4a..583dbeb60d5 100644 --- a/service/clouddirectory/api_op_DeleteObject.go +++ b/service/clouddirectory/api_op_DeleteObject.go @@ -59,6 +59,9 @@ func addOperationDeleteObjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteObjectMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DeleteSchema.go b/service/clouddirectory/api_op_DeleteSchema.go index 156ee8e4d9d..72c50ebb11f 100644 --- a/service/clouddirectory/api_op_DeleteSchema.go +++ b/service/clouddirectory/api_op_DeleteSchema.go @@ -55,6 +55,9 @@ func addOperationDeleteSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DeleteTypedLinkFacet.go b/service/clouddirectory/api_op_DeleteTypedLinkFacet.go index 3eb6395a834..98c19bb780a 100644 --- a/service/clouddirectory/api_op_DeleteTypedLinkFacet.go +++ b/service/clouddirectory/api_op_DeleteTypedLinkFacet.go @@ -55,6 +55,9 @@ func addOperationDeleteTypedLinkFacetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteTypedLinkFacetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DetachFromIndex.go b/service/clouddirectory/api_op_DetachFromIndex.go index 5c72ebab6d8..dd1c08882a9 100644 --- a/service/clouddirectory/api_op_DetachFromIndex.go +++ b/service/clouddirectory/api_op_DetachFromIndex.go @@ -63,6 +63,9 @@ func addOperationDetachFromIndexMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDetachFromIndexMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DetachObject.go b/service/clouddirectory/api_op_DetachObject.go index 96fcb68392d..d560d16f1ea 100644 --- a/service/clouddirectory/api_op_DetachObject.go +++ b/service/clouddirectory/api_op_DetachObject.go @@ -66,6 +66,9 @@ func addOperationDetachObjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetachObjectMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DetachPolicy.go b/service/clouddirectory/api_op_DetachPolicy.go index 5e68d12b6f7..67e79ff66f1 100644 --- a/service/clouddirectory/api_op_DetachPolicy.go +++ b/service/clouddirectory/api_op_DetachPolicy.go @@ -60,6 +60,9 @@ func addOperationDetachPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDetachPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DetachTypedLink.go b/service/clouddirectory/api_op_DetachTypedLink.go index 9ab9840d57e..33f3f0789df 100644 --- a/service/clouddirectory/api_op_DetachTypedLink.go +++ b/service/clouddirectory/api_op_DetachTypedLink.go @@ -57,6 +57,9 @@ func addOperationDetachTypedLinkMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDetachTypedLinkMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_DisableDirectory.go b/service/clouddirectory/api_op_DisableDirectory.go index 9697877e7ba..335e31017fe 100644 --- a/service/clouddirectory/api_op_DisableDirectory.go +++ b/service/clouddirectory/api_op_DisableDirectory.go @@ -56,6 +56,9 @@ func addOperationDisableDirectoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDisableDirectoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_EnableDirectory.go b/service/clouddirectory/api_op_EnableDirectory.go index 51cdf6b51b8..5b16ecf6dc8 100644 --- a/service/clouddirectory/api_op_EnableDirectory.go +++ b/service/clouddirectory/api_op_EnableDirectory.go @@ -55,6 +55,9 @@ func addOperationEnableDirectoryMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationEnableDirectoryMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetAppliedSchemaVersion.go b/service/clouddirectory/api_op_GetAppliedSchemaVersion.go index 330d80f2caa..56809e6c147 100644 --- a/service/clouddirectory/api_op_GetAppliedSchemaVersion.go +++ b/service/clouddirectory/api_op_GetAppliedSchemaVersion.go @@ -53,6 +53,9 @@ func addOperationGetAppliedSchemaVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetAppliedSchemaVersionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetDirectory.go b/service/clouddirectory/api_op_GetDirectory.go index da315af49fe..3029071220b 100644 --- a/service/clouddirectory/api_op_GetDirectory.go +++ b/service/clouddirectory/api_op_GetDirectory.go @@ -55,6 +55,9 @@ func addOperationGetDirectoryMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetDirectoryMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetFacet.go b/service/clouddirectory/api_op_GetFacet.go index df5ca937f80..fce8adece32 100644 --- a/service/clouddirectory/api_op_GetFacet.go +++ b/service/clouddirectory/api_op_GetFacet.go @@ -61,6 +61,9 @@ func addOperationGetFacetMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetFacetMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetLinkAttributes.go b/service/clouddirectory/api_op_GetLinkAttributes.go index 243a7c814d0..c2691d51546 100644 --- a/service/clouddirectory/api_op_GetLinkAttributes.go +++ b/service/clouddirectory/api_op_GetLinkAttributes.go @@ -68,6 +68,9 @@ func addOperationGetLinkAttributesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetLinkAttributesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetObjectAttributes.go b/service/clouddirectory/api_op_GetObjectAttributes.go index 096cf52969f..87e3827a0ec 100644 --- a/service/clouddirectory/api_op_GetObjectAttributes.go +++ b/service/clouddirectory/api_op_GetObjectAttributes.go @@ -73,6 +73,9 @@ func addOperationGetObjectAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetObjectAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetObjectInformation.go b/service/clouddirectory/api_op_GetObjectInformation.go index deae42d4945..ec429e73d01 100644 --- a/service/clouddirectory/api_op_GetObjectInformation.go +++ b/service/clouddirectory/api_op_GetObjectInformation.go @@ -66,6 +66,9 @@ func addOperationGetObjectInformationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetObjectInformationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetSchemaAsJson.go b/service/clouddirectory/api_op_GetSchemaAsJson.go index 2c886c60f18..15b018cd26c 100644 --- a/service/clouddirectory/api_op_GetSchemaAsJson.go +++ b/service/clouddirectory/api_op_GetSchemaAsJson.go @@ -57,6 +57,9 @@ func addOperationGetSchemaAsJsonMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetSchemaAsJsonMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go b/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go index ecd3354d9d4..34616783f9a 100644 --- a/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go +++ b/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go @@ -68,6 +68,9 @@ func addOperationGetTypedLinkFacetInformationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetTypedLinkFacetInformationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListAppliedSchemaArns.go b/service/clouddirectory/api_op_ListAppliedSchemaArns.go index 8eb3b0a8a2c..0c9c8bb27d3 100644 --- a/service/clouddirectory/api_op_ListAppliedSchemaArns.go +++ b/service/clouddirectory/api_op_ListAppliedSchemaArns.go @@ -66,6 +66,9 @@ func addOperationListAppliedSchemaArnsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListAppliedSchemaArnsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListAttachedIndices.go b/service/clouddirectory/api_op_ListAttachedIndices.go index b86ce24018d..bf16582d117 100644 --- a/service/clouddirectory/api_op_ListAttachedIndices.go +++ b/service/clouddirectory/api_op_ListAttachedIndices.go @@ -70,6 +70,9 @@ func addOperationListAttachedIndicesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListAttachedIndicesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go b/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go index fa413cffba6..249cd7609dd 100644 --- a/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go +++ b/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go @@ -56,6 +56,9 @@ func addOperationListDevelopmentSchemaArnsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListDevelopmentSchemaArnsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListDirectories.go b/service/clouddirectory/api_op_ListDirectories.go index 015e576a01a..08debbb481a 100644 --- a/service/clouddirectory/api_op_ListDirectories.go +++ b/service/clouddirectory/api_op_ListDirectories.go @@ -64,6 +64,9 @@ func addOperationListDirectoriesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListDirectoriesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListFacetAttributes.go b/service/clouddirectory/api_op_ListFacetAttributes.go index 051c63de630..186b0530919 100644 --- a/service/clouddirectory/api_op_ListFacetAttributes.go +++ b/service/clouddirectory/api_op_ListFacetAttributes.go @@ -67,6 +67,9 @@ func addOperationListFacetAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListFacetAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListFacetNames.go b/service/clouddirectory/api_op_ListFacetNames.go index f4dadf9444b..f861f867aa1 100644 --- a/service/clouddirectory/api_op_ListFacetNames.go +++ b/service/clouddirectory/api_op_ListFacetNames.go @@ -61,6 +61,9 @@ func addOperationListFacetNamesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListFacetNamesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListIncomingTypedLinks.go b/service/clouddirectory/api_op_ListIncomingTypedLinks.go index b6f32b1664d..914f7e2057d 100644 --- a/service/clouddirectory/api_op_ListIncomingTypedLinks.go +++ b/service/clouddirectory/api_op_ListIncomingTypedLinks.go @@ -83,6 +83,9 @@ func addOperationListIncomingTypedLinksMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListIncomingTypedLinksMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListIndex.go b/service/clouddirectory/api_op_ListIndex.go index 5aea5b85da2..1966ca79754 100644 --- a/service/clouddirectory/api_op_ListIndex.go +++ b/service/clouddirectory/api_op_ListIndex.go @@ -75,6 +75,9 @@ func addOperationListIndexMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListIndexMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListManagedSchemaArns.go b/service/clouddirectory/api_op_ListManagedSchemaArns.go index f6e77d1bddc..b1b84c528e0 100644 --- a/service/clouddirectory/api_op_ListManagedSchemaArns.go +++ b/service/clouddirectory/api_op_ListManagedSchemaArns.go @@ -62,6 +62,9 @@ func addOperationListManagedSchemaArnsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListManagedSchemaArnsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListObjectAttributes.go b/service/clouddirectory/api_op_ListObjectAttributes.go index c879eddf9de..9626d241804 100644 --- a/service/clouddirectory/api_op_ListObjectAttributes.go +++ b/service/clouddirectory/api_op_ListObjectAttributes.go @@ -78,6 +78,9 @@ func addOperationListObjectAttributesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListObjectAttributesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListObjectChildren.go b/service/clouddirectory/api_op_ListObjectChildren.go index f3c892e4822..3e20f3953fd 100644 --- a/service/clouddirectory/api_op_ListObjectChildren.go +++ b/service/clouddirectory/api_op_ListObjectChildren.go @@ -76,6 +76,9 @@ func addOperationListObjectChildrenMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListObjectChildrenMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListObjectParentPaths.go b/service/clouddirectory/api_op_ListObjectParentPaths.go index 2ada8b3fa6f..f42d953c997 100644 --- a/service/clouddirectory/api_op_ListObjectParentPaths.go +++ b/service/clouddirectory/api_op_ListObjectParentPaths.go @@ -78,6 +78,9 @@ func addOperationListObjectParentPathsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListObjectParentPathsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListObjectParents.go b/service/clouddirectory/api_op_ListObjectParents.go index d7bc6c9001b..24a2071a84a 100644 --- a/service/clouddirectory/api_op_ListObjectParents.go +++ b/service/clouddirectory/api_op_ListObjectParents.go @@ -83,6 +83,9 @@ func addOperationListObjectParentsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListObjectParentsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListObjectPolicies.go b/service/clouddirectory/api_op_ListObjectPolicies.go index af7ecef3646..737fcebf675 100644 --- a/service/clouddirectory/api_op_ListObjectPolicies.go +++ b/service/clouddirectory/api_op_ListObjectPolicies.go @@ -73,6 +73,9 @@ func addOperationListObjectPoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListObjectPoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListOutgoingTypedLinks.go b/service/clouddirectory/api_op_ListOutgoingTypedLinks.go index f645acc1d29..19744a67344 100644 --- a/service/clouddirectory/api_op_ListOutgoingTypedLinks.go +++ b/service/clouddirectory/api_op_ListOutgoingTypedLinks.go @@ -83,6 +83,9 @@ func addOperationListOutgoingTypedLinksMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListOutgoingTypedLinksMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListPolicyAttachments.go b/service/clouddirectory/api_op_ListPolicyAttachments.go index 606b1957214..d1121ec45ee 100644 --- a/service/clouddirectory/api_op_ListPolicyAttachments.go +++ b/service/clouddirectory/api_op_ListPolicyAttachments.go @@ -73,6 +73,9 @@ func addOperationListPolicyAttachmentsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListPolicyAttachmentsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListPublishedSchemaArns.go b/service/clouddirectory/api_op_ListPublishedSchemaArns.go index 4459bca0f25..2bba9911410 100644 --- a/service/clouddirectory/api_op_ListPublishedSchemaArns.go +++ b/service/clouddirectory/api_op_ListPublishedSchemaArns.go @@ -62,6 +62,9 @@ func addOperationListPublishedSchemaArnsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListPublishedSchemaArnsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListTagsForResource.go b/service/clouddirectory/api_op_ListTagsForResource.go index 5967e6ae4af..3bf3a1479b3 100644 --- a/service/clouddirectory/api_op_ListTagsForResource.go +++ b/service/clouddirectory/api_op_ListTagsForResource.go @@ -68,6 +68,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go b/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go index 1e1807a8bd1..509f84a50ca 100644 --- a/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go +++ b/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go @@ -70,6 +70,9 @@ func addOperationListTypedLinkFacetAttributesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListTypedLinkFacetAttributesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_ListTypedLinkFacetNames.go b/service/clouddirectory/api_op_ListTypedLinkFacetNames.go index 0a76cfd3a93..633fff71db7 100644 --- a/service/clouddirectory/api_op_ListTypedLinkFacetNames.go +++ b/service/clouddirectory/api_op_ListTypedLinkFacetNames.go @@ -64,6 +64,9 @@ func addOperationListTypedLinkFacetNamesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListTypedLinkFacetNamesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_LookupPolicy.go b/service/clouddirectory/api_op_LookupPolicy.go index 99a63181028..3f67879871d 100644 --- a/service/clouddirectory/api_op_LookupPolicy.go +++ b/service/clouddirectory/api_op_LookupPolicy.go @@ -77,6 +77,9 @@ func addOperationLookupPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationLookupPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_PublishSchema.go b/service/clouddirectory/api_op_PublishSchema.go index 7b83439c206..c38830ad7b0 100644 --- a/service/clouddirectory/api_op_PublishSchema.go +++ b/service/clouddirectory/api_op_PublishSchema.go @@ -69,6 +69,9 @@ func addOperationPublishSchemaMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationPublishSchemaMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_PutSchemaFromJson.go b/service/clouddirectory/api_op_PutSchemaFromJson.go index 3035c508818..a94ecf49eb3 100644 --- a/service/clouddirectory/api_op_PutSchemaFromJson.go +++ b/service/clouddirectory/api_op_PutSchemaFromJson.go @@ -60,6 +60,9 @@ func addOperationPutSchemaFromJsonMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutSchemaFromJsonMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_RemoveFacetFromObject.go b/service/clouddirectory/api_op_RemoveFacetFromObject.go index 6068dfda4d5..266b09cfe21 100644 --- a/service/clouddirectory/api_op_RemoveFacetFromObject.go +++ b/service/clouddirectory/api_op_RemoveFacetFromObject.go @@ -59,6 +59,9 @@ func addOperationRemoveFacetFromObjectMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRemoveFacetFromObjectMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_TagResource.go b/service/clouddirectory/api_op_TagResource.go index 2758c8ea99d..5eecad0af6b 100644 --- a/service/clouddirectory/api_op_TagResource.go +++ b/service/clouddirectory/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UntagResource.go b/service/clouddirectory/api_op_UntagResource.go index 352ba36447d..9cfd43cef9f 100644 --- a/service/clouddirectory/api_op_UntagResource.go +++ b/service/clouddirectory/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpdateFacet.go b/service/clouddirectory/api_op_UpdateFacet.go index 252c57b18ff..15557ced2e3 100644 --- a/service/clouddirectory/api_op_UpdateFacet.go +++ b/service/clouddirectory/api_op_UpdateFacet.go @@ -72,6 +72,9 @@ func addOperationUpdateFacetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateFacetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpdateLinkAttributes.go b/service/clouddirectory/api_op_UpdateLinkAttributes.go index 4e8babd5327..50fe5bb855c 100644 --- a/service/clouddirectory/api_op_UpdateLinkAttributes.go +++ b/service/clouddirectory/api_op_UpdateLinkAttributes.go @@ -63,6 +63,9 @@ func addOperationUpdateLinkAttributesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateLinkAttributesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpdateObjectAttributes.go b/service/clouddirectory/api_op_UpdateObjectAttributes.go index a932abda681..1bd42329e63 100644 --- a/service/clouddirectory/api_op_UpdateObjectAttributes.go +++ b/service/clouddirectory/api_op_UpdateObjectAttributes.go @@ -64,6 +64,9 @@ func addOperationUpdateObjectAttributesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateObjectAttributesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpdateSchema.go b/service/clouddirectory/api_op_UpdateSchema.go index fba717ed347..a87451dd545 100644 --- a/service/clouddirectory/api_op_UpdateSchema.go +++ b/service/clouddirectory/api_op_UpdateSchema.go @@ -60,6 +60,9 @@ func addOperationUpdateSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpdateTypedLinkFacet.go b/service/clouddirectory/api_op_UpdateTypedLinkFacet.go index d1168ab5dc7..d9e95be6c8a 100644 --- a/service/clouddirectory/api_op_UpdateTypedLinkFacet.go +++ b/service/clouddirectory/api_op_UpdateTypedLinkFacet.go @@ -74,6 +74,9 @@ func addOperationUpdateTypedLinkFacetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateTypedLinkFacetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpgradeAppliedSchema.go b/service/clouddirectory/api_op_UpgradeAppliedSchema.go index 1d143f21844..97c0dbce0f0 100644 --- a/service/clouddirectory/api_op_UpgradeAppliedSchema.go +++ b/service/clouddirectory/api_op_UpgradeAppliedSchema.go @@ -70,6 +70,9 @@ func addOperationUpgradeAppliedSchemaMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpgradeAppliedSchemaMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/api_op_UpgradePublishedSchema.go b/service/clouddirectory/api_op_UpgradePublishedSchema.go index 5c8c938dd7e..3d5887fb7e3 100644 --- a/service/clouddirectory/api_op_UpgradePublishedSchema.go +++ b/service/clouddirectory/api_op_UpgradePublishedSchema.go @@ -70,6 +70,9 @@ func addOperationUpgradePublishedSchemaMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpgradePublishedSchemaMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/clouddirectory/go.mod b/service/clouddirectory/go.mod index 94408796a56..3d2946f3dc3 100644 --- a/service/clouddirectory/go.mod +++ b/service/clouddirectory/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/clouddirectory go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/clouddirectory/go.sum b/service/clouddirectory/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/clouddirectory/go.sum +++ b/service/clouddirectory/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudformation/api_client.go b/service/cloudformation/api_client.go index ca4a2e25604..a76dc50ac1b 100644 --- a/service/cloudformation/api_client.go +++ b/service/cloudformation/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudformation/api_op_CancelUpdateStack.go b/service/cloudformation/api_op_CancelUpdateStack.go index fd796eeabf6..eae12ffed78 100644 --- a/service/cloudformation/api_op_CancelUpdateStack.go +++ b/service/cloudformation/api_op_CancelUpdateStack.go @@ -58,6 +58,9 @@ func addOperationCancelUpdateStackMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCancelUpdateStackMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ContinueUpdateRollback.go b/service/cloudformation/api_op_ContinueUpdateRollback.go index 1ed8830baac..f85323cfb17 100644 --- a/service/cloudformation/api_op_ContinueUpdateRollback.go +++ b/service/cloudformation/api_op_ContinueUpdateRollback.go @@ -114,6 +114,9 @@ func addOperationContinueUpdateRollbackMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationContinueUpdateRollbackMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_CreateChangeSet.go b/service/cloudformation/api_op_CreateChangeSet.go index ef52dc9ee52..1fded4823e7 100644 --- a/service/cloudformation/api_op_CreateChangeSet.go +++ b/service/cloudformation/api_op_CreateChangeSet.go @@ -251,6 +251,9 @@ func addOperationCreateChangeSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -293,6 +296,9 @@ func addOperationCreateChangeSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_CreateStack.go b/service/cloudformation/api_op_CreateStack.go index 1612a63ff14..48ebaee1c59 100644 --- a/service/cloudformation/api_op_CreateStack.go +++ b/service/cloudformation/api_op_CreateStack.go @@ -258,6 +258,9 @@ func addOperationCreateStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -300,6 +303,9 @@ func addOperationCreateStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_CreateStackInstances.go b/service/cloudformation/api_op_CreateStackInstances.go index b7f41e61b43..1b613a39bef 100644 --- a/service/cloudformation/api_op_CreateStackInstances.go +++ b/service/cloudformation/api_op_CreateStackInstances.go @@ -120,6 +120,9 @@ func addOperationCreateStackInstancesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationCreateStackInstancesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_CreateStackSet.go b/service/cloudformation/api_op_CreateStackSet.go index 1a73af7a486..3ad96512e79 100644 --- a/service/cloudformation/api_op_CreateStackSet.go +++ b/service/cloudformation/api_op_CreateStackSet.go @@ -206,6 +206,9 @@ func addOperationCreateStackSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -251,6 +254,9 @@ func addOperationCreateStackSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DeleteChangeSet.go b/service/cloudformation/api_op_DeleteChangeSet.go index b60f3e1bb21..d18c3136a6d 100644 --- a/service/cloudformation/api_op_DeleteChangeSet.go +++ b/service/cloudformation/api_op_DeleteChangeSet.go @@ -57,6 +57,9 @@ func addOperationDeleteChangeSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteChangeSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DeleteStack.go b/service/cloudformation/api_op_DeleteStack.go index affb535182a..e6f547667bc 100644 --- a/service/cloudformation/api_op_DeleteStack.go +++ b/service/cloudformation/api_op_DeleteStack.go @@ -81,6 +81,9 @@ func addOperationDeleteStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DeleteStackInstances.go b/service/cloudformation/api_op_DeleteStackInstances.go index f8ffd14e648..6fb4f97a8b4 100644 --- a/service/cloudformation/api_op_DeleteStackInstances.go +++ b/service/cloudformation/api_op_DeleteStackInstances.go @@ -90,6 +90,9 @@ func addOperationDeleteStackInstancesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDeleteStackInstancesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DeleteStackSet.go b/service/cloudformation/api_op_DeleteStackSet.go index 229768afac7..88f8b81f050 100644 --- a/service/cloudformation/api_op_DeleteStackSet.go +++ b/service/cloudformation/api_op_DeleteStackSet.go @@ -51,6 +51,9 @@ func addOperationDeleteStackSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteStackSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DeregisterType.go b/service/cloudformation/api_op_DeregisterType.go index 7fefaac9799..0631f35e9e7 100644 --- a/service/cloudformation/api_op_DeregisterType.go +++ b/service/cloudformation/api_op_DeregisterType.go @@ -68,6 +68,9 @@ func addOperationDeregisterTypeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeregisterTypeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeAccountLimits.go b/service/cloudformation/api_op_DescribeAccountLimits.go index 4d8506bf655..68c483eac50 100644 --- a/service/cloudformation/api_op_DescribeAccountLimits.go +++ b/service/cloudformation/api_op_DescribeAccountLimits.go @@ -62,6 +62,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeChangeSet.go b/service/cloudformation/api_op_DescribeChangeSet.go index 683a19b6646..50410762673 100644 --- a/service/cloudformation/api_op_DescribeChangeSet.go +++ b/service/cloudformation/api_op_DescribeChangeSet.go @@ -127,6 +127,9 @@ func addOperationDescribeChangeSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationDescribeChangeSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go b/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go index 92bd319b79b..f1aa4164df8 100644 --- a/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go +++ b/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go @@ -129,6 +129,9 @@ func addOperationDescribeStackDriftDetectionStatusMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationDescribeStackDriftDetectionStatusMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackEvents.go b/service/cloudformation/api_op_DescribeStackEvents.go index dddfdb73ef8..7d9a98419a3 100644 --- a/service/cloudformation/api_op_DescribeStackEvents.go +++ b/service/cloudformation/api_op_DescribeStackEvents.go @@ -74,6 +74,9 @@ func addOperationDescribeStackEventsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeStackEventsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackInstance.go b/service/cloudformation/api_op_DescribeStackInstance.go index 7513c152ad5..f80d7c55682 100644 --- a/service/cloudformation/api_op_DescribeStackInstance.go +++ b/service/cloudformation/api_op_DescribeStackInstance.go @@ -66,6 +66,9 @@ func addOperationDescribeStackInstanceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeStackInstanceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackResource.go b/service/cloudformation/api_op_DescribeStackResource.go index 5e00db0e6c4..b53832b0335 100644 --- a/service/cloudformation/api_op_DescribeStackResource.go +++ b/service/cloudformation/api_op_DescribeStackResource.go @@ -73,6 +73,9 @@ func addOperationDescribeStackResourceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeStackResourceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackResourceDrifts.go b/service/cloudformation/api_op_DescribeStackResourceDrifts.go index 2cb5df07e11..a75bf02c826 100644 --- a/service/cloudformation/api_op_DescribeStackResourceDrifts.go +++ b/service/cloudformation/api_op_DescribeStackResourceDrifts.go @@ -104,6 +104,9 @@ func addOperationDescribeStackResourceDriftsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDescribeStackResourceDriftsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackResources.go b/service/cloudformation/api_op_DescribeStackResources.go index e61e7347378..f1a5b6e1eb0 100644 --- a/service/cloudformation/api_op_DescribeStackResources.go +++ b/service/cloudformation/api_op_DescribeStackResources.go @@ -89,6 +89,9 @@ func addOperationDescribeStackResourcesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeStackResourcesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackSet.go b/service/cloudformation/api_op_DescribeStackSet.go index a603b3c6003..4557c458b1d 100644 --- a/service/cloudformation/api_op_DescribeStackSet.go +++ b/service/cloudformation/api_op_DescribeStackSet.go @@ -53,6 +53,9 @@ func addOperationDescribeStackSetMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeStackSetMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStackSetOperation.go b/service/cloudformation/api_op_DescribeStackSetOperation.go index a5b59c8d7c9..5d2f8baf3e2 100644 --- a/service/cloudformation/api_op_DescribeStackSetOperation.go +++ b/service/cloudformation/api_op_DescribeStackSetOperation.go @@ -58,6 +58,9 @@ func addOperationDescribeStackSetOperationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeStackSetOperationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeStacks.go b/service/cloudformation/api_op_DescribeStacks.go index 543538a4452..3b2066f466f 100644 --- a/service/cloudformation/api_op_DescribeStacks.go +++ b/service/cloudformation/api_op_DescribeStacks.go @@ -71,6 +71,9 @@ func addOperationDescribeStacksMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeStacksMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeType.go b/service/cloudformation/api_op_DescribeType.go index ecbc47edc0d..1e1de1c774e 100644 --- a/service/cloudformation/api_op_DescribeType.go +++ b/service/cloudformation/api_op_DescribeType.go @@ -161,6 +161,9 @@ func addOperationDescribeTypeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationDescribeTypeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DescribeTypeRegistration.go b/service/cloudformation/api_op_DescribeTypeRegistration.go index bff4d59fe2a..f1fca3936b4 100644 --- a/service/cloudformation/api_op_DescribeTypeRegistration.go +++ b/service/cloudformation/api_op_DescribeTypeRegistration.go @@ -71,6 +71,9 @@ func addOperationDescribeTypeRegistrationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeTypeRegistrationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DetectStackDrift.go b/service/cloudformation/api_op_DetectStackDrift.go index 911dd138cd9..e1db5336611 100644 --- a/service/cloudformation/api_op_DetectStackDrift.go +++ b/service/cloudformation/api_op_DetectStackDrift.go @@ -81,6 +81,9 @@ func addOperationDetectStackDriftMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDetectStackDriftMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DetectStackResourceDrift.go b/service/cloudformation/api_op_DetectStackResourceDrift.go index 15d05df198b..df2d5fc0868 100644 --- a/service/cloudformation/api_op_DetectStackResourceDrift.go +++ b/service/cloudformation/api_op_DetectStackResourceDrift.go @@ -75,6 +75,9 @@ func addOperationDetectStackResourceDriftMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDetectStackResourceDriftMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_DetectStackSetDrift.go b/service/cloudformation/api_op_DetectStackSetDrift.go index 5933dd0d0a6..019994bc824 100644 --- a/service/cloudformation/api_op_DetectStackSetDrift.go +++ b/service/cloudformation/api_op_DetectStackSetDrift.go @@ -96,6 +96,9 @@ func addOperationDetectStackSetDriftMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDetectStackSetDriftMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_EstimateTemplateCost.go b/service/cloudformation/api_op_EstimateTemplateCost.go index ad37fdca06d..bf5dfbc287b 100644 --- a/service/cloudformation/api_op_EstimateTemplateCost.go +++ b/service/cloudformation/api_op_EstimateTemplateCost.go @@ -71,6 +71,9 @@ func addOperationEstimateTemplateCostMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationEstimateTemplateCostMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ExecuteChangeSet.go b/service/cloudformation/api_op_ExecuteChangeSet.go index c9deb873d93..bcb882a796c 100644 --- a/service/cloudformation/api_op_ExecuteChangeSet.go +++ b/service/cloudformation/api_op_ExecuteChangeSet.go @@ -69,6 +69,9 @@ func addOperationExecuteChangeSetMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationExecuteChangeSetMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_GetStackPolicy.go b/service/cloudformation/api_op_GetStackPolicy.go index a26fe6c7d96..0e36805770a 100644 --- a/service/cloudformation/api_op_GetStackPolicy.go +++ b/service/cloudformation/api_op_GetStackPolicy.go @@ -59,6 +59,9 @@ func addOperationGetStackPolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetStackPolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_GetTemplate.go b/service/cloudformation/api_op_GetTemplate.go index 92725a89409..0649a92be68 100644 --- a/service/cloudformation/api_op_GetTemplate.go +++ b/service/cloudformation/api_op_GetTemplate.go @@ -87,6 +87,9 @@ func addOperationGetTemplateMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetTemplateMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_GetTemplateSummary.go b/service/cloudformation/api_op_GetTemplateSummary.go index bb056457eb6..1bddca8282a 100644 --- a/service/cloudformation/api_op_GetTemplateSummary.go +++ b/service/cloudformation/api_op_GetTemplateSummary.go @@ -122,6 +122,9 @@ func addOperationGetTemplateSummaryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationGetTemplateSummaryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListChangeSets.go b/service/cloudformation/api_op_ListChangeSets.go index 5c43f6b8523..2bbe8ab6e2f 100644 --- a/service/cloudformation/api_op_ListChangeSets.go +++ b/service/cloudformation/api_op_ListChangeSets.go @@ -67,6 +67,9 @@ func addOperationListChangeSetsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListChangeSetsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListExports.go b/service/cloudformation/api_op_ListExports.go index 93dcd8db68e..cc180030e02 100644 --- a/service/cloudformation/api_op_ListExports.go +++ b/service/cloudformation/api_op_ListExports.go @@ -62,6 +62,9 @@ func addOperationListExportsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListExportsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListImports.go b/service/cloudformation/api_op_ListImports.go index 5d62e6350fc..e8474a60d86 100644 --- a/service/cloudformation/api_op_ListImports.go +++ b/service/cloudformation/api_op_ListImports.go @@ -67,6 +67,9 @@ func addOperationListImportsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListImportsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListStackInstances.go b/service/cloudformation/api_op_ListStackInstances.go index ae960d2d2d9..2b6b1c0f7f1 100644 --- a/service/cloudformation/api_op_ListStackInstances.go +++ b/service/cloudformation/api_op_ListStackInstances.go @@ -85,6 +85,9 @@ func addOperationListStackInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListStackInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListStackResources.go b/service/cloudformation/api_op_ListStackResources.go index c325b939b43..4a7c1f5f554 100644 --- a/service/cloudformation/api_op_ListStackResources.go +++ b/service/cloudformation/api_op_ListStackResources.go @@ -74,6 +74,9 @@ func addOperationListStackResourcesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListStackResourcesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListStackSetOperationResults.go b/service/cloudformation/api_op_ListStackSetOperationResults.go index 873c5cdc45e..cc0b8a341ee 100644 --- a/service/cloudformation/api_op_ListStackSetOperationResults.go +++ b/service/cloudformation/api_op_ListStackSetOperationResults.go @@ -80,6 +80,9 @@ func addOperationListStackSetOperationResultsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListStackSetOperationResultsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListStackSetOperations.go b/service/cloudformation/api_op_ListStackSetOperations.go index 739ce68b167..739c989626e 100644 --- a/service/cloudformation/api_op_ListStackSetOperations.go +++ b/service/cloudformation/api_op_ListStackSetOperations.go @@ -74,6 +74,9 @@ func addOperationListStackSetOperationsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListStackSetOperationsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListStackSets.go b/service/cloudformation/api_op_ListStackSets.go index 61f7a82eb27..a282ef38d5a 100644 --- a/service/cloudformation/api_op_ListStackSets.go +++ b/service/cloudformation/api_op_ListStackSets.go @@ -71,6 +71,9 @@ func addOperationListStackSetsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListStackSetsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListStacks.go b/service/cloudformation/api_op_ListStacks.go index e887344a425..f8fbd6b2bba 100644 --- a/service/cloudformation/api_op_ListStacks.go +++ b/service/cloudformation/api_op_ListStacks.go @@ -67,6 +67,9 @@ func addOperationListStacksMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListStacksMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListTypeRegistrations.go b/service/cloudformation/api_op_ListTypeRegistrations.go index 7f55af33f4d..01fb38eb66a 100644 --- a/service/cloudformation/api_op_ListTypeRegistrations.go +++ b/service/cloudformation/api_op_ListTypeRegistrations.go @@ -83,6 +83,9 @@ func addOperationListTypeRegistrationsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListTypeRegistrationsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListTypeVersions.go b/service/cloudformation/api_op_ListTypeVersions.go index a14c06d4294..5834e90949b 100644 --- a/service/cloudformation/api_op_ListTypeVersions.go +++ b/service/cloudformation/api_op_ListTypeVersions.go @@ -94,6 +94,9 @@ func addOperationListTypeVersionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListTypeVersionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ListTypes.go b/service/cloudformation/api_op_ListTypes.go index b0b97c801e8..94890f94bb2 100644 --- a/service/cloudformation/api_op_ListTypes.go +++ b/service/cloudformation/api_op_ListTypes.go @@ -108,6 +108,9 @@ func addOperationListTypesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationListTypesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_RecordHandlerProgress.go b/service/cloudformation/api_op_RecordHandlerProgress.go index 265a96f9d7a..2617957abdc 100644 --- a/service/cloudformation/api_op_RecordHandlerProgress.go +++ b/service/cloudformation/api_op_RecordHandlerProgress.go @@ -79,6 +79,9 @@ func addOperationRecordHandlerProgressMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationRecordHandlerProgressMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_RegisterType.go b/service/cloudformation/api_op_RegisterType.go index 0c170895201..07d8474d570 100644 --- a/service/cloudformation/api_op_RegisterType.go +++ b/service/cloudformation/api_op_RegisterType.go @@ -127,6 +127,9 @@ func addOperationRegisterTypeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationRegisterTypeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_SetStackPolicy.go b/service/cloudformation/api_op_SetStackPolicy.go index 6db40445cad..9be83ce8ea0 100644 --- a/service/cloudformation/api_op_SetStackPolicy.go +++ b/service/cloudformation/api_op_SetStackPolicy.go @@ -62,6 +62,9 @@ func addOperationSetStackPolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationSetStackPolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_SetTypeDefaultVersion.go b/service/cloudformation/api_op_SetTypeDefaultVersion.go index 3d7cc905ea3..c90bd42a563 100644 --- a/service/cloudformation/api_op_SetTypeDefaultVersion.go +++ b/service/cloudformation/api_op_SetTypeDefaultVersion.go @@ -62,6 +62,9 @@ func addOperationSetTypeDefaultVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationSetTypeDefaultVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_SignalResource.go b/service/cloudformation/api_op_SignalResource.go index 34a12018e41..d1e5d26dd6d 100644 --- a/service/cloudformation/api_op_SignalResource.go +++ b/service/cloudformation/api_op_SignalResource.go @@ -76,6 +76,9 @@ func addOperationSignalResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationSignalResourceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_StopStackSetOperation.go b/service/cloudformation/api_op_StopStackSetOperation.go index 4638c365cb7..9133bf7eea3 100644 --- a/service/cloudformation/api_op_StopStackSetOperation.go +++ b/service/cloudformation/api_op_StopStackSetOperation.go @@ -54,6 +54,9 @@ func addOperationStopStackSetOperationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStopStackSetOperationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_UpdateStack.go b/service/cloudformation/api_op_UpdateStack.go index e0b854e4b72..cac68ce0a4a 100644 --- a/service/cloudformation/api_op_UpdateStack.go +++ b/service/cloudformation/api_op_UpdateStack.go @@ -257,6 +257,9 @@ func addOperationUpdateStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -299,6 +302,9 @@ func addOperationUpdateStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_UpdateStackInstances.go b/service/cloudformation/api_op_UpdateStackInstances.go index 1ce284dc2f8..1c9aba2c02e 100644 --- a/service/cloudformation/api_op_UpdateStackInstances.go +++ b/service/cloudformation/api_op_UpdateStackInstances.go @@ -141,6 +141,9 @@ func addOperationUpdateStackInstancesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationUpdateStackInstancesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_UpdateStackSet.go b/service/cloudformation/api_op_UpdateStackSet.go index 0d1f1cf93b0..716d49b9ffd 100644 --- a/service/cloudformation/api_op_UpdateStackSet.go +++ b/service/cloudformation/api_op_UpdateStackSet.go @@ -286,6 +286,9 @@ func addOperationUpdateStackSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -331,6 +334,9 @@ func addOperationUpdateStackSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_UpdateTerminationProtection.go b/service/cloudformation/api_op_UpdateTerminationProtection.go index 7a84b389cc6..cb8d47ade06 100644 --- a/service/cloudformation/api_op_UpdateTerminationProtection.go +++ b/service/cloudformation/api_op_UpdateTerminationProtection.go @@ -66,6 +66,9 @@ func addOperationUpdateTerminationProtectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateTerminationProtectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/api_op_ValidateTemplate.go b/service/cloudformation/api_op_ValidateTemplate.go index f9956860125..d04d5965df1 100644 --- a/service/cloudformation/api_op_ValidateTemplate.go +++ b/service/cloudformation/api_op_ValidateTemplate.go @@ -87,6 +87,9 @@ func addOperationValidateTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationValidateTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudformation/go.mod b/service/cloudformation/go.mod index d4280ea6a5f..fc96c9ac248 100644 --- a/service/cloudformation/go.mod +++ b/service/cloudformation/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudformation go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudformation/go.sum b/service/cloudformation/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudformation/go.sum +++ b/service/cloudformation/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudfront/api_client.go b/service/cloudfront/api_client.go index e4701a47a78..d7fbbb71a87 100644 --- a/service/cloudfront/api_client.go +++ b/service/cloudfront/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudfront/api_op_CreateCachePolicy.go b/service/cloudfront/api_op_CreateCachePolicy.go index acf39aee27a..adb120de0e9 100644 --- a/service/cloudfront/api_op_CreateCachePolicy.go +++ b/service/cloudfront/api_op_CreateCachePolicy.go @@ -79,6 +79,9 @@ func addOperationCreateCachePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateCachePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go index dc550be0ca3..b3b5da01afa 100644 --- a/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go @@ -73,6 +73,9 @@ func addOperationCreateCloudFrontOriginAccessIdentityMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateCloudFrontOriginAccessIdentityMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateDistribution.go b/service/cloudfront/api_op_CreateDistribution.go index f44781973ce..c5b45dbf0e9 100644 --- a/service/cloudfront/api_op_CreateDistribution.go +++ b/service/cloudfront/api_op_CreateDistribution.go @@ -73,6 +73,9 @@ func addOperationCreateDistributionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateDistributionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateDistributionWithTags.go b/service/cloudfront/api_op_CreateDistributionWithTags.go index a109e9b8ffe..1244732bab7 100644 --- a/service/cloudfront/api_op_CreateDistributionWithTags.go +++ b/service/cloudfront/api_op_CreateDistributionWithTags.go @@ -61,6 +61,9 @@ func addOperationCreateDistributionWithTagsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateDistributionWithTagsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go index ab4bded0982..812b81d034c 100644 --- a/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go @@ -60,6 +60,9 @@ func addOperationCreateFieldLevelEncryptionConfigMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateFieldLevelEncryptionConfigMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go index 71b3b669c39..89f9981b473 100644 --- a/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go @@ -60,6 +60,9 @@ func addOperationCreateFieldLevelEncryptionProfileMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateFieldLevelEncryptionProfileMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateInvalidation.go b/service/cloudfront/api_op_CreateInvalidation.go index 1ac0621bbbf..f2a05824362 100644 --- a/service/cloudfront/api_op_CreateInvalidation.go +++ b/service/cloudfront/api_op_CreateInvalidation.go @@ -64,6 +64,9 @@ func addOperationCreateInvalidationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateInvalidationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateKeyGroup.go b/service/cloudfront/api_op_CreateKeyGroup.go index d95eb43a50d..3905b4ea6a4 100644 --- a/service/cloudfront/api_op_CreateKeyGroup.go +++ b/service/cloudfront/api_op_CreateKeyGroup.go @@ -71,6 +71,9 @@ func addOperationCreateKeyGroupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateKeyGroupMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateMonitoringSubscription.go b/service/cloudfront/api_op_CreateMonitoringSubscription.go index c44e254806d..72cd79c126b 100644 --- a/service/cloudfront/api_op_CreateMonitoringSubscription.go +++ b/service/cloudfront/api_op_CreateMonitoringSubscription.go @@ -64,6 +64,9 @@ func addOperationCreateMonitoringSubscriptionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateMonitoringSubscriptionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateOriginRequestPolicy.go b/service/cloudfront/api_op_CreateOriginRequestPolicy.go index bf253a5cbea..b101f17090f 100644 --- a/service/cloudfront/api_op_CreateOriginRequestPolicy.go +++ b/service/cloudfront/api_op_CreateOriginRequestPolicy.go @@ -83,6 +83,9 @@ func addOperationCreateOriginRequestPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateOriginRequestPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreatePublicKey.go b/service/cloudfront/api_op_CreatePublicKey.go index 62e80628393..084c247ffab 100644 --- a/service/cloudfront/api_op_CreatePublicKey.go +++ b/service/cloudfront/api_op_CreatePublicKey.go @@ -63,6 +63,9 @@ func addOperationCreatePublicKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreatePublicKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateRealtimeLogConfig.go b/service/cloudfront/api_op_CreateRealtimeLogConfig.go index f92ebfcbc82..90d78094389 100644 --- a/service/cloudfront/api_op_CreateRealtimeLogConfig.go +++ b/service/cloudfront/api_op_CreateRealtimeLogConfig.go @@ -79,6 +79,9 @@ func addOperationCreateRealtimeLogConfigMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateRealtimeLogConfigMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateStreamingDistribution.go b/service/cloudfront/api_op_CreateStreamingDistribution.go index 3de043d0ea4..44bffc72b7a 100644 --- a/service/cloudfront/api_op_CreateStreamingDistribution.go +++ b/service/cloudfront/api_op_CreateStreamingDistribution.go @@ -83,6 +83,9 @@ func addOperationCreateStreamingDistributionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateStreamingDistributionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go b/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go index 80fa3a6d0dd..4e44c497100 100644 --- a/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go +++ b/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go @@ -61,6 +61,9 @@ func addOperationCreateStreamingDistributionWithTagsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateStreamingDistributionWithTagsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteCachePolicy.go b/service/cloudfront/api_op_DeleteCachePolicy.go index af35e3f90cc..ad599c5fbd6 100644 --- a/service/cloudfront/api_op_DeleteCachePolicy.go +++ b/service/cloudfront/api_op_DeleteCachePolicy.go @@ -58,6 +58,9 @@ func addOperationDeleteCachePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteCachePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go index 40aac3b0ca6..54ca20d62c3 100644 --- a/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go @@ -53,6 +53,9 @@ func addOperationDeleteCloudFrontOriginAccessIdentityMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteCloudFrontOriginAccessIdentityMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteDistribution.go b/service/cloudfront/api_op_DeleteDistribution.go index 635c19af59e..3bad6d16e94 100644 --- a/service/cloudfront/api_op_DeleteDistribution.go +++ b/service/cloudfront/api_op_DeleteDistribution.go @@ -92,6 +92,9 @@ func addOperationDeleteDistributionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDeleteDistributionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go index 6c18b3db849..56ec266e7fc 100644 --- a/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go @@ -52,6 +52,9 @@ func addOperationDeleteFieldLevelEncryptionConfigMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteFieldLevelEncryptionConfigMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go index 0d32554a8fe..82e5597f09a 100644 --- a/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go @@ -52,6 +52,9 @@ func addOperationDeleteFieldLevelEncryptionProfileMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteFieldLevelEncryptionProfileMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteKeyGroup.go b/service/cloudfront/api_op_DeleteKeyGroup.go index 034ae4a6bb1..96d5517277c 100644 --- a/service/cloudfront/api_op_DeleteKeyGroup.go +++ b/service/cloudfront/api_op_DeleteKeyGroup.go @@ -57,6 +57,9 @@ func addOperationDeleteKeyGroupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteKeyGroupMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteMonitoringSubscription.go b/service/cloudfront/api_op_DeleteMonitoringSubscription.go index b879feeea88..0f9a54d8c52 100644 --- a/service/cloudfront/api_op_DeleteMonitoringSubscription.go +++ b/service/cloudfront/api_op_DeleteMonitoringSubscription.go @@ -49,6 +49,9 @@ func addOperationDeleteMonitoringSubscriptionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteMonitoringSubscriptionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteOriginRequestPolicy.go b/service/cloudfront/api_op_DeleteOriginRequestPolicy.go index 437179e5f7c..bf5cd59161a 100644 --- a/service/cloudfront/api_op_DeleteOriginRequestPolicy.go +++ b/service/cloudfront/api_op_DeleteOriginRequestPolicy.go @@ -60,6 +60,9 @@ func addOperationDeleteOriginRequestPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteOriginRequestPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeletePublicKey.go b/service/cloudfront/api_op_DeletePublicKey.go index 3da9d60d349..31885f782fa 100644 --- a/service/cloudfront/api_op_DeletePublicKey.go +++ b/service/cloudfront/api_op_DeletePublicKey.go @@ -52,6 +52,9 @@ func addOperationDeletePublicKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeletePublicKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteRealtimeLogConfig.go b/service/cloudfront/api_op_DeleteRealtimeLogConfig.go index c8b8dd2a62a..97b4e590d43 100644 --- a/service/cloudfront/api_op_DeleteRealtimeLogConfig.go +++ b/service/cloudfront/api_op_DeleteRealtimeLogConfig.go @@ -55,6 +55,9 @@ func addOperationDeleteRealtimeLogConfigMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteRealtimeLogConfigMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_DeleteStreamingDistribution.go b/service/cloudfront/api_op_DeleteStreamingDistribution.go index c48d632ac40..a641b7c4be6 100644 --- a/service/cloudfront/api_op_DeleteStreamingDistribution.go +++ b/service/cloudfront/api_op_DeleteStreamingDistribution.go @@ -93,6 +93,9 @@ func addOperationDeleteStreamingDistributionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDeleteStreamingDistributionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetCachePolicy.go b/service/cloudfront/api_op_GetCachePolicy.go index 3b2a1f9cb28..8d9b00171c7 100644 --- a/service/cloudfront/api_op_GetCachePolicy.go +++ b/service/cloudfront/api_op_GetCachePolicy.go @@ -70,6 +70,9 @@ func addOperationGetCachePolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetCachePolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetCachePolicyConfig.go b/service/cloudfront/api_op_GetCachePolicyConfig.go index 3979bfe62b0..d2c6b212d38 100644 --- a/service/cloudfront/api_op_GetCachePolicyConfig.go +++ b/service/cloudfront/api_op_GetCachePolicyConfig.go @@ -63,6 +63,9 @@ func addOperationGetCachePolicyConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetCachePolicyConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go index f50ea097ddf..a32e5dddc94 100644 --- a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go @@ -59,6 +59,9 @@ func addOperationGetCloudFrontOriginAccessIdentityMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetCloudFrontOriginAccessIdentityMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go index 0e93947be67..e3403593648 100644 --- a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go +++ b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go @@ -60,6 +60,9 @@ func addOperationGetCloudFrontOriginAccessIdentityConfigMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetCloudFrontOriginAccessIdentityConfigMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetDistribution.go b/service/cloudfront/api_op_GetDistribution.go index cafd30435ab..d70403d3f82 100644 --- a/service/cloudfront/api_op_GetDistribution.go +++ b/service/cloudfront/api_op_GetDistribution.go @@ -60,6 +60,9 @@ func addOperationGetDistributionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetDistributionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetDistributionConfig.go b/service/cloudfront/api_op_GetDistributionConfig.go index a79fab03399..c9fd00529fa 100644 --- a/service/cloudfront/api_op_GetDistributionConfig.go +++ b/service/cloudfront/api_op_GetDistributionConfig.go @@ -59,6 +59,9 @@ func addOperationGetDistributionConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetDistributionConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetFieldLevelEncryption.go b/service/cloudfront/api_op_GetFieldLevelEncryption.go index 2972693e1ae..5f9a4c13168 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryption.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryption.go @@ -57,6 +57,9 @@ func addOperationGetFieldLevelEncryptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetFieldLevelEncryptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go index 4ca1813783c..6aecf02e196 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go @@ -57,6 +57,9 @@ func addOperationGetFieldLevelEncryptionConfigMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetFieldLevelEncryptionConfigMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go index a843cb07ded..ff2b4fd0c7d 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go @@ -57,6 +57,9 @@ func addOperationGetFieldLevelEncryptionProfileMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetFieldLevelEncryptionProfileMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go b/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go index 3c5c3c19b9d..504174328ed 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go @@ -57,6 +57,9 @@ func addOperationGetFieldLevelEncryptionProfileConfigMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetFieldLevelEncryptionProfileConfigMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetInvalidation.go b/service/cloudfront/api_op_GetInvalidation.go index 6eb8ac7b09d..d8144ee9634 100644 --- a/service/cloudfront/api_op_GetInvalidation.go +++ b/service/cloudfront/api_op_GetInvalidation.go @@ -62,6 +62,9 @@ func addOperationGetInvalidationMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetInvalidationMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetKeyGroup.go b/service/cloudfront/api_op_GetKeyGroup.go index 0ebc26829a7..597f1686041 100644 --- a/service/cloudfront/api_op_GetKeyGroup.go +++ b/service/cloudfront/api_op_GetKeyGroup.go @@ -62,6 +62,9 @@ func addOperationGetKeyGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetKeyGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetKeyGroupConfig.go b/service/cloudfront/api_op_GetKeyGroupConfig.go index e9f59989f47..d5fd247b715 100644 --- a/service/cloudfront/api_op_GetKeyGroupConfig.go +++ b/service/cloudfront/api_op_GetKeyGroupConfig.go @@ -61,6 +61,9 @@ func addOperationGetKeyGroupConfigMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetKeyGroupConfigMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetMonitoringSubscription.go b/service/cloudfront/api_op_GetMonitoringSubscription.go index dead9ed964e..803c4e99d43 100644 --- a/service/cloudfront/api_op_GetMonitoringSubscription.go +++ b/service/cloudfront/api_op_GetMonitoringSubscription.go @@ -55,6 +55,9 @@ func addOperationGetMonitoringSubscriptionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetMonitoringSubscriptionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetOriginRequestPolicy.go b/service/cloudfront/api_op_GetOriginRequestPolicy.go index 162659dc550..1a3c9ca3ffc 100644 --- a/service/cloudfront/api_op_GetOriginRequestPolicy.go +++ b/service/cloudfront/api_op_GetOriginRequestPolicy.go @@ -72,6 +72,9 @@ func addOperationGetOriginRequestPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetOriginRequestPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go b/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go index ddb0a3a0c70..cd91510d2b4 100644 --- a/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go +++ b/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go @@ -65,6 +65,9 @@ func addOperationGetOriginRequestPolicyConfigMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetOriginRequestPolicyConfigMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetPublicKey.go b/service/cloudfront/api_op_GetPublicKey.go index c50198737ee..6ab66369121 100644 --- a/service/cloudfront/api_op_GetPublicKey.go +++ b/service/cloudfront/api_op_GetPublicKey.go @@ -56,6 +56,9 @@ func addOperationGetPublicKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetPublicKeyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetPublicKeyConfig.go b/service/cloudfront/api_op_GetPublicKeyConfig.go index 45e94be2748..62e1df3b132 100644 --- a/service/cloudfront/api_op_GetPublicKeyConfig.go +++ b/service/cloudfront/api_op_GetPublicKeyConfig.go @@ -56,6 +56,9 @@ func addOperationGetPublicKeyConfigMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetPublicKeyConfigMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetRealtimeLogConfig.go b/service/cloudfront/api_op_GetRealtimeLogConfig.go index a5c48368a3a..e161b664257 100644 --- a/service/cloudfront/api_op_GetRealtimeLogConfig.go +++ b/service/cloudfront/api_op_GetRealtimeLogConfig.go @@ -57,6 +57,9 @@ func addOperationGetRealtimeLogConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetRealtimeLogConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetStreamingDistribution.go b/service/cloudfront/api_op_GetStreamingDistribution.go index 283b1553f52..fc9ca1bc6cd 100644 --- a/service/cloudfront/api_op_GetStreamingDistribution.go +++ b/service/cloudfront/api_op_GetStreamingDistribution.go @@ -60,6 +60,9 @@ func addOperationGetStreamingDistributionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetStreamingDistributionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_GetStreamingDistributionConfig.go b/service/cloudfront/api_op_GetStreamingDistributionConfig.go index a3a5e75dbf2..85793d32e29 100644 --- a/service/cloudfront/api_op_GetStreamingDistributionConfig.go +++ b/service/cloudfront/api_op_GetStreamingDistributionConfig.go @@ -58,6 +58,9 @@ func addOperationGetStreamingDistributionConfigMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetStreamingDistributionConfigMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListCachePolicies.go b/service/cloudfront/api_op_ListCachePolicies.go index 49d88b2aaeb..0b65a9b69dd 100644 --- a/service/cloudfront/api_op_ListCachePolicies.go +++ b/service/cloudfront/api_op_ListCachePolicies.go @@ -72,6 +72,9 @@ func addOperationListCachePoliciesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListCachePoliciesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go b/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go index a0a85856b99..04785f9165a 100644 --- a/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go +++ b/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go @@ -60,6 +60,9 @@ func addOperationListCloudFrontOriginAccessIdentitiesMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListCloudFrontOriginAccessIdentitiesMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListDistributions.go b/service/cloudfront/api_op_ListDistributions.go index 80875ab4f97..0ce95e75b19 100644 --- a/service/cloudfront/api_op_ListDistributions.go +++ b/service/cloudfront/api_op_ListDistributions.go @@ -60,6 +60,9 @@ func addOperationListDistributionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListDistributionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go b/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go index 48fbf898b70..f747e9e50ce 100644 --- a/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go +++ b/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go @@ -68,6 +68,9 @@ func addOperationListDistributionsByCachePolicyIdMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListDistributionsByCachePolicyIdMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListDistributionsByKeyGroup.go b/service/cloudfront/api_op_ListDistributionsByKeyGroup.go index 4ba621da28c..baeef25bdac 100644 --- a/service/cloudfront/api_op_ListDistributionsByKeyGroup.go +++ b/service/cloudfront/api_op_ListDistributionsByKeyGroup.go @@ -68,6 +68,9 @@ func addOperationListDistributionsByKeyGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListDistributionsByKeyGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go b/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go index 78e4104a8fd..247d752f383 100644 --- a/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go +++ b/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go @@ -69,6 +69,9 @@ func addOperationListDistributionsByOriginRequestPolicyIdMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListDistributionsByOriginRequestPolicyIdMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListDistributionsByRealtimeLogConfig.go b/service/cloudfront/api_op_ListDistributionsByRealtimeLogConfig.go index 8dbc70f5518..332fbc69a1e 100644 --- a/service/cloudfront/api_op_ListDistributionsByRealtimeLogConfig.go +++ b/service/cloudfront/api_op_ListDistributionsByRealtimeLogConfig.go @@ -74,6 +74,9 @@ func addOperationListDistributionsByRealtimeLogConfigMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListDistributionsByRealtimeLogConfigMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListDistributionsByWebACLId.go b/service/cloudfront/api_op_ListDistributionsByWebACLId.go index 1aca3a975ff..aa65cc94333 100644 --- a/service/cloudfront/api_op_ListDistributionsByWebACLId.go +++ b/service/cloudfront/api_op_ListDistributionsByWebACLId.go @@ -70,6 +70,9 @@ func addOperationListDistributionsByWebACLIdMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListDistributionsByWebACLIdMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go b/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go index 1bfd9bd9f33..39144612c5e 100644 --- a/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go +++ b/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go @@ -61,6 +61,9 @@ func addOperationListFieldLevelEncryptionConfigsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListFieldLevelEncryptionConfigsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go b/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go index 42c0bba9cbb..58204c46b03 100644 --- a/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go +++ b/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go @@ -61,6 +61,9 @@ func addOperationListFieldLevelEncryptionProfilesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListFieldLevelEncryptionProfilesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListInvalidations.go b/service/cloudfront/api_op_ListInvalidations.go index 258189cbab5..3faf91aa4a6 100644 --- a/service/cloudfront/api_op_ListInvalidations.go +++ b/service/cloudfront/api_op_ListInvalidations.go @@ -67,6 +67,9 @@ func addOperationListInvalidationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListInvalidationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListKeyGroups.go b/service/cloudfront/api_op_ListKeyGroups.go index 04a5c97ba4c..53810d1215c 100644 --- a/service/cloudfront/api_op_ListKeyGroups.go +++ b/service/cloudfront/api_op_ListKeyGroups.go @@ -62,6 +62,9 @@ func addOperationListKeyGroupsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListKeyGroupsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListOriginRequestPolicies.go b/service/cloudfront/api_op_ListOriginRequestPolicies.go index 6297a9da129..8f704a538f1 100644 --- a/service/cloudfront/api_op_ListOriginRequestPolicies.go +++ b/service/cloudfront/api_op_ListOriginRequestPolicies.go @@ -73,6 +73,9 @@ func addOperationListOriginRequestPoliciesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListOriginRequestPoliciesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListPublicKeys.go b/service/cloudfront/api_op_ListPublicKeys.go index 953873f64af..dca7c7cbd4e 100644 --- a/service/cloudfront/api_op_ListPublicKeys.go +++ b/service/cloudfront/api_op_ListPublicKeys.go @@ -59,6 +59,9 @@ func addOperationListPublicKeysMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListPublicKeysMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListRealtimeLogConfigs.go b/service/cloudfront/api_op_ListRealtimeLogConfigs.go index c3a0b5571b1..4a2d5a78320 100644 --- a/service/cloudfront/api_op_ListRealtimeLogConfigs.go +++ b/service/cloudfront/api_op_ListRealtimeLogConfigs.go @@ -64,6 +64,9 @@ func addOperationListRealtimeLogConfigsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListRealtimeLogConfigsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListStreamingDistributions.go b/service/cloudfront/api_op_ListStreamingDistributions.go index 97414abd81a..59fe4c1396d 100644 --- a/service/cloudfront/api_op_ListStreamingDistributions.go +++ b/service/cloudfront/api_op_ListStreamingDistributions.go @@ -56,6 +56,9 @@ func addOperationListStreamingDistributionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListStreamingDistributionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_ListTagsForResource.go b/service/cloudfront/api_op_ListTagsForResource.go index 972c2e3fca7..865e94b3a3a 100644 --- a/service/cloudfront/api_op_ListTagsForResource.go +++ b/service/cloudfront/api_op_ListTagsForResource.go @@ -57,6 +57,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_TagResource.go b/service/cloudfront/api_op_TagResource.go index 46222111290..0d6e3c3dd2e 100644 --- a/service/cloudfront/api_op_TagResource.go +++ b/service/cloudfront/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UntagResource.go b/service/cloudfront/api_op_UntagResource.go index b0c60b85b2d..1bfd489fb62 100644 --- a/service/cloudfront/api_op_UntagResource.go +++ b/service/cloudfront/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateCachePolicy.go b/service/cloudfront/api_op_UpdateCachePolicy.go index 2d32fcd2f55..355bc91c814 100644 --- a/service/cloudfront/api_op_UpdateCachePolicy.go +++ b/service/cloudfront/api_op_UpdateCachePolicy.go @@ -80,6 +80,9 @@ func addOperationUpdateCachePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateCachePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go index c0df24738b8..359053df95a 100644 --- a/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go @@ -67,6 +67,9 @@ func addOperationUpdateCloudFrontOriginAccessIdentityMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateCloudFrontOriginAccessIdentityMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateDistribution.go b/service/cloudfront/api_op_UpdateDistribution.go index c2b6a253865..c28d6725cff 100644 --- a/service/cloudfront/api_op_UpdateDistribution.go +++ b/service/cloudfront/api_op_UpdateDistribution.go @@ -144,6 +144,9 @@ func addOperationUpdateDistributionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationUpdateDistributionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go index de5cee2d6f8..945f0cb6ed1 100644 --- a/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go @@ -66,6 +66,9 @@ func addOperationUpdateFieldLevelEncryptionConfigMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateFieldLevelEncryptionConfigMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go index eead1798826..883cd797c5c 100644 --- a/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go @@ -65,6 +65,9 @@ func addOperationUpdateFieldLevelEncryptionProfileMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateFieldLevelEncryptionProfileMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateKeyGroup.go b/service/cloudfront/api_op_UpdateKeyGroup.go index 77444311e84..d2aff21ee5e 100644 --- a/service/cloudfront/api_op_UpdateKeyGroup.go +++ b/service/cloudfront/api_op_UpdateKeyGroup.go @@ -77,6 +77,9 @@ func addOperationUpdateKeyGroupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateKeyGroupMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateOriginRequestPolicy.go b/service/cloudfront/api_op_UpdateOriginRequestPolicy.go index 677b586823a..345ec53445d 100644 --- a/service/cloudfront/api_op_UpdateOriginRequestPolicy.go +++ b/service/cloudfront/api_op_UpdateOriginRequestPolicy.go @@ -82,6 +82,9 @@ func addOperationUpdateOriginRequestPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateOriginRequestPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdatePublicKey.go b/service/cloudfront/api_op_UpdatePublicKey.go index 3ea6e83bee1..fb4829c92c7 100644 --- a/service/cloudfront/api_op_UpdatePublicKey.go +++ b/service/cloudfront/api_op_UpdatePublicKey.go @@ -66,6 +66,9 @@ func addOperationUpdatePublicKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdatePublicKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateRealtimeLogConfig.go b/service/cloudfront/api_op_UpdateRealtimeLogConfig.go index dcc4e92c2bb..10a5117f32e 100644 --- a/service/cloudfront/api_op_UpdateRealtimeLogConfig.go +++ b/service/cloudfront/api_op_UpdateRealtimeLogConfig.go @@ -85,6 +85,9 @@ func addOperationUpdateRealtimeLogConfigMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationUpdateRealtimeLogConfigMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/api_op_UpdateStreamingDistribution.go b/service/cloudfront/api_op_UpdateStreamingDistribution.go index 9ea3a756033..e28eddd14cb 100644 --- a/service/cloudfront/api_op_UpdateStreamingDistribution.go +++ b/service/cloudfront/api_op_UpdateStreamingDistribution.go @@ -67,6 +67,9 @@ func addOperationUpdateStreamingDistributionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateStreamingDistributionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudfront/go.mod b/service/cloudfront/go.mod index 2067750c195..c5807bdba49 100644 --- a/service/cloudfront/go.mod +++ b/service/cloudfront/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudfront go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudfront/go.sum b/service/cloudfront/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudfront/go.sum +++ b/service/cloudfront/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudhsm/api_client.go b/service/cloudhsm/api_client.go index 97fda7c275c..a64100d23ef 100644 --- a/service/cloudhsm/api_client.go +++ b/service/cloudhsm/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudhsm/api_op_AddTagsToResource.go b/service/cloudhsm/api_op_AddTagsToResource.go index 79c713c8fb8..fb233b1332b 100644 --- a/service/cloudhsm/api_op_AddTagsToResource.go +++ b/service/cloudhsm/api_op_AddTagsToResource.go @@ -71,6 +71,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_CreateHapg.go b/service/cloudhsm/api_op_CreateHapg.go index 9819e09ff2d..299b83d73c2 100644 --- a/service/cloudhsm/api_op_CreateHapg.go +++ b/service/cloudhsm/api_op_CreateHapg.go @@ -65,6 +65,9 @@ func addOperationCreateHapgMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateHapgMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_CreateHsm.go b/service/cloudhsm/api_op_CreateHsm.go index 412848cdf7b..4511ebea911 100644 --- a/service/cloudhsm/api_op_CreateHsm.go +++ b/service/cloudhsm/api_op_CreateHsm.go @@ -110,6 +110,9 @@ func addOperationCreateHsmMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationCreateHsmMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_CreateLunaClient.go b/service/cloudhsm/api_op_CreateLunaClient.go index 3001d5f5efe..ae9c87ff57b 100644 --- a/service/cloudhsm/api_op_CreateLunaClient.go +++ b/service/cloudhsm/api_op_CreateLunaClient.go @@ -68,6 +68,9 @@ func addOperationCreateLunaClientMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateLunaClientMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_DeleteHapg.go b/service/cloudhsm/api_op_DeleteHapg.go index 65445d7b628..b367250876e 100644 --- a/service/cloudhsm/api_op_DeleteHapg.go +++ b/service/cloudhsm/api_op_DeleteHapg.go @@ -66,6 +66,9 @@ func addOperationDeleteHapgMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteHapgMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_DeleteHsm.go b/service/cloudhsm/api_op_DeleteHsm.go index efbc53b5f63..8d527bf120b 100644 --- a/service/cloudhsm/api_op_DeleteHsm.go +++ b/service/cloudhsm/api_op_DeleteHsm.go @@ -67,6 +67,9 @@ func addOperationDeleteHsmMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteHsmMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_DeleteLunaClient.go b/service/cloudhsm/api_op_DeleteLunaClient.go index ac8ee99e003..04eced76cb7 100644 --- a/service/cloudhsm/api_op_DeleteLunaClient.go +++ b/service/cloudhsm/api_op_DeleteLunaClient.go @@ -64,6 +64,9 @@ func addOperationDeleteLunaClientMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteLunaClientMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_DescribeHapg.go b/service/cloudhsm/api_op_DescribeHapg.go index df212a56e8f..10f9b2b5b80 100644 --- a/service/cloudhsm/api_op_DescribeHapg.go +++ b/service/cloudhsm/api_op_DescribeHapg.go @@ -90,6 +90,9 @@ func addOperationDescribeHapgMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeHapgMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_DescribeHsm.go b/service/cloudhsm/api_op_DescribeHsm.go index 8518b696a40..e71220721c1 100644 --- a/service/cloudhsm/api_op_DescribeHsm.go +++ b/service/cloudhsm/api_op_DescribeHsm.go @@ -135,6 +135,9 @@ func addOperationDescribeHsmMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationDescribeHsmMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_DescribeLunaClient.go b/service/cloudhsm/api_op_DescribeLunaClient.go index 73543e25b70..b5862476657 100644 --- a/service/cloudhsm/api_op_DescribeLunaClient.go +++ b/service/cloudhsm/api_op_DescribeLunaClient.go @@ -75,6 +75,9 @@ func addOperationDescribeLunaClientMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeLunaClientMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_GetConfig.go b/service/cloudhsm/api_op_GetConfig.go index 55a3f7af668..732dc1a02d4 100644 --- a/service/cloudhsm/api_op_GetConfig.go +++ b/service/cloudhsm/api_op_GetConfig.go @@ -81,6 +81,9 @@ func addOperationGetConfigMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetConfigMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ListAvailableZones.go b/service/cloudhsm/api_op_ListAvailableZones.go index 69188f3744a..a3e74fc61f7 100644 --- a/service/cloudhsm/api_op_ListAvailableZones.go +++ b/service/cloudhsm/api_op_ListAvailableZones.go @@ -58,6 +58,9 @@ func addOperationListAvailableZonesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListAvailableZonesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ListHapgs.go b/service/cloudhsm/api_op_ListHapgs.go index 53db2e9cda7..a2175a8c50c 100644 --- a/service/cloudhsm/api_op_ListHapgs.go +++ b/service/cloudhsm/api_op_ListHapgs.go @@ -70,6 +70,9 @@ func addOperationListHapgsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListHapgsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ListHsms.go b/service/cloudhsm/api_op_ListHsms.go index 58fd43f4fbc..01c2c14b599 100644 --- a/service/cloudhsm/api_op_ListHsms.go +++ b/service/cloudhsm/api_op_ListHsms.go @@ -70,6 +70,9 @@ func addOperationListHsmsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListHsmsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ListLunaClients.go b/service/cloudhsm/api_op_ListLunaClients.go index 624a351b8ad..745ed836bde 100644 --- a/service/cloudhsm/api_op_ListLunaClients.go +++ b/service/cloudhsm/api_op_ListLunaClients.go @@ -70,6 +70,9 @@ func addOperationListLunaClientsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListLunaClientsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ListTagsForResource.go b/service/cloudhsm/api_op_ListTagsForResource.go index 2fe30a9fa30..3f06809d4a6 100644 --- a/service/cloudhsm/api_op_ListTagsForResource.go +++ b/service/cloudhsm/api_op_ListTagsForResource.go @@ -65,6 +65,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ModifyHapg.go b/service/cloudhsm/api_op_ModifyHapg.go index a65bc1dde82..10018a67f3a 100644 --- a/service/cloudhsm/api_op_ModifyHapg.go +++ b/service/cloudhsm/api_op_ModifyHapg.go @@ -69,6 +69,9 @@ func addOperationModifyHapgMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationModifyHapgMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ModifyHsm.go b/service/cloudhsm/api_op_ModifyHsm.go index 80c754892d6..9a0a28fce56 100644 --- a/service/cloudhsm/api_op_ModifyHsm.go +++ b/service/cloudhsm/api_op_ModifyHsm.go @@ -87,6 +87,9 @@ func addOperationModifyHsmMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationModifyHsmMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_ModifyLunaClient.go b/service/cloudhsm/api_op_ModifyLunaClient.go index 7e2a3b1e0f2..d5a7c2b60d8 100644 --- a/service/cloudhsm/api_op_ModifyLunaClient.go +++ b/service/cloudhsm/api_op_ModifyLunaClient.go @@ -68,6 +68,9 @@ func addOperationModifyLunaClientMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationModifyLunaClientMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/api_op_RemoveTagsFromResource.go b/service/cloudhsm/api_op_RemoveTagsFromResource.go index 7574ed8dfbb..7c9779173ef 100644 --- a/service/cloudhsm/api_op_RemoveTagsFromResource.go +++ b/service/cloudhsm/api_op_RemoveTagsFromResource.go @@ -72,6 +72,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsm/go.mod b/service/cloudhsm/go.mod index 4b19756724b..4b4373130fd 100644 --- a/service/cloudhsm/go.mod +++ b/service/cloudhsm/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudhsm go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudhsm/go.sum b/service/cloudhsm/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudhsm/go.sum +++ b/service/cloudhsm/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudhsmv2/api_client.go b/service/cloudhsmv2/api_client.go index fd1f8b38487..7bddc27cdb5 100644 --- a/service/cloudhsmv2/api_client.go +++ b/service/cloudhsmv2/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudhsmv2/api_op_CopyBackupToRegion.go b/service/cloudhsmv2/api_op_CopyBackupToRegion.go index f6a5dbeb57e..a4c378767d2 100644 --- a/service/cloudhsmv2/api_op_CopyBackupToRegion.go +++ b/service/cloudhsmv2/api_op_CopyBackupToRegion.go @@ -68,6 +68,9 @@ func addOperationCopyBackupToRegionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCopyBackupToRegionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_CreateCluster.go b/service/cloudhsmv2/api_op_CreateCluster.go index 992d1a887b4..83cfeae1342 100644 --- a/service/cloudhsmv2/api_op_CreateCluster.go +++ b/service/cloudhsmv2/api_op_CreateCluster.go @@ -74,6 +74,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_CreateHsm.go b/service/cloudhsmv2/api_op_CreateHsm.go index f6bf4d3b3e9..0d9323941d6 100644 --- a/service/cloudhsmv2/api_op_CreateHsm.go +++ b/service/cloudhsmv2/api_op_CreateHsm.go @@ -66,6 +66,9 @@ func addOperationCreateHsmMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateHsmMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_DeleteBackup.go b/service/cloudhsmv2/api_op_DeleteBackup.go index c15aca52a01..d960fa25019 100644 --- a/service/cloudhsmv2/api_op_DeleteBackup.go +++ b/service/cloudhsmv2/api_op_DeleteBackup.go @@ -56,6 +56,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_DeleteCluster.go b/service/cloudhsmv2/api_op_DeleteCluster.go index ec407707e92..4f76227ff15 100644 --- a/service/cloudhsmv2/api_op_DeleteCluster.go +++ b/service/cloudhsmv2/api_op_DeleteCluster.go @@ -56,6 +56,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_DeleteHsm.go b/service/cloudhsmv2/api_op_DeleteHsm.go index d7ce065e757..8df4e6c4fa7 100644 --- a/service/cloudhsmv2/api_op_DeleteHsm.go +++ b/service/cloudhsmv2/api_op_DeleteHsm.go @@ -66,6 +66,9 @@ func addOperationDeleteHsmMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteHsmMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_DescribeBackups.go b/service/cloudhsmv2/api_op_DescribeBackups.go index a96f4eb69c0..4c639a7aa55 100644 --- a/service/cloudhsmv2/api_op_DescribeBackups.go +++ b/service/cloudhsmv2/api_op_DescribeBackups.go @@ -80,6 +80,9 @@ func addOperationDescribeBackupsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeBackupsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_DescribeClusters.go b/service/cloudhsmv2/api_op_DescribeClusters.go index ce2c5722243..b5b2d1f636d 100644 --- a/service/cloudhsmv2/api_op_DescribeClusters.go +++ b/service/cloudhsmv2/api_op_DescribeClusters.go @@ -74,6 +74,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_InitializeCluster.go b/service/cloudhsmv2/api_op_InitializeCluster.go index 6b2404311a6..a7af4a3c8eb 100644 --- a/service/cloudhsmv2/api_op_InitializeCluster.go +++ b/service/cloudhsmv2/api_op_InitializeCluster.go @@ -76,6 +76,9 @@ func addOperationInitializeClusterMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationInitializeClusterMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_ListTags.go b/service/cloudhsmv2/api_op_ListTags.go index 39000647dae..a2a45801394 100644 --- a/service/cloudhsmv2/api_op_ListTags.go +++ b/service/cloudhsmv2/api_op_ListTags.go @@ -73,6 +73,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_RestoreBackup.go b/service/cloudhsmv2/api_op_RestoreBackup.go index 280436111a2..d578fe51c3e 100644 --- a/service/cloudhsmv2/api_op_RestoreBackup.go +++ b/service/cloudhsmv2/api_op_RestoreBackup.go @@ -55,6 +55,9 @@ func addOperationRestoreBackupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRestoreBackupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_TagResource.go b/service/cloudhsmv2/api_op_TagResource.go index c08facd1fc6..8500811c895 100644 --- a/service/cloudhsmv2/api_op_TagResource.go +++ b/service/cloudhsmv2/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/api_op_UntagResource.go b/service/cloudhsmv2/api_op_UntagResource.go index 3eb992d445d..da7b1e47e61 100644 --- a/service/cloudhsmv2/api_op_UntagResource.go +++ b/service/cloudhsmv2/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudhsmv2/go.mod b/service/cloudhsmv2/go.mod index 10744d80e0a..750f4143ccb 100644 --- a/service/cloudhsmv2/go.mod +++ b/service/cloudhsmv2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudhsmv2/go.sum b/service/cloudhsmv2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudhsmv2/go.sum +++ b/service/cloudhsmv2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudsearch/api_client.go b/service/cloudsearch/api_client.go index ce1897b92c1..17bcafb61e8 100644 --- a/service/cloudsearch/api_client.go +++ b/service/cloudsearch/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudsearch/api_op_BuildSuggesters.go b/service/cloudsearch/api_op_BuildSuggesters.go index a9bfd846481..321e623a18f 100644 --- a/service/cloudsearch/api_op_BuildSuggesters.go +++ b/service/cloudsearch/api_op_BuildSuggesters.go @@ -61,6 +61,9 @@ func addOperationBuildSuggestersMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationBuildSuggestersMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_CreateDomain.go b/service/cloudsearch/api_op_CreateDomain.go index 7e32599f6a8..de34606d77e 100644 --- a/service/cloudsearch/api_op_CreateDomain.go +++ b/service/cloudsearch/api_op_CreateDomain.go @@ -61,6 +61,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DefineAnalysisScheme.go b/service/cloudsearch/api_op_DefineAnalysisScheme.go index 4dc07a30038..933f99450fa 100644 --- a/service/cloudsearch/api_op_DefineAnalysisScheme.go +++ b/service/cloudsearch/api_op_DefineAnalysisScheme.go @@ -74,6 +74,9 @@ func addOperationDefineAnalysisSchemeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDefineAnalysisSchemeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DefineExpression.go b/service/cloudsearch/api_op_DefineExpression.go index 6ae9764cd7d..74a92364cc8 100644 --- a/service/cloudsearch/api_op_DefineExpression.go +++ b/service/cloudsearch/api_op_DefineExpression.go @@ -73,6 +73,9 @@ func addOperationDefineExpressionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDefineExpressionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DefineIndexField.go b/service/cloudsearch/api_op_DefineIndexField.go index 56f91414362..dcf28c99804 100644 --- a/service/cloudsearch/api_op_DefineIndexField.go +++ b/service/cloudsearch/api_op_DefineIndexField.go @@ -75,6 +75,9 @@ func addOperationDefineIndexFieldMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDefineIndexFieldMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DefineSuggester.go b/service/cloudsearch/api_op_DefineSuggester.go index 536de7e8a52..be1ced74fac 100644 --- a/service/cloudsearch/api_op_DefineSuggester.go +++ b/service/cloudsearch/api_op_DefineSuggester.go @@ -75,6 +75,9 @@ func addOperationDefineSuggesterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDefineSuggesterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DeleteAnalysisScheme.go b/service/cloudsearch/api_op_DeleteAnalysisScheme.go index 65aebacdc86..44ac0f9ef43 100644 --- a/service/cloudsearch/api_op_DeleteAnalysisScheme.go +++ b/service/cloudsearch/api_op_DeleteAnalysisScheme.go @@ -71,6 +71,9 @@ func addOperationDeleteAnalysisSchemeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteAnalysisSchemeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DeleteDomain.go b/service/cloudsearch/api_op_DeleteDomain.go index 13b7d47a45e..3ca6732f443 100644 --- a/service/cloudsearch/api_op_DeleteDomain.go +++ b/service/cloudsearch/api_op_DeleteDomain.go @@ -61,6 +61,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DeleteExpression.go b/service/cloudsearch/api_op_DeleteExpression.go index 819c6c06e0b..5b41a2e0090 100644 --- a/service/cloudsearch/api_op_DeleteExpression.go +++ b/service/cloudsearch/api_op_DeleteExpression.go @@ -71,6 +71,9 @@ func addOperationDeleteExpressionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteExpressionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DeleteIndexField.go b/service/cloudsearch/api_op_DeleteIndexField.go index 9d38d061cb5..bea6d957b9c 100644 --- a/service/cloudsearch/api_op_DeleteIndexField.go +++ b/service/cloudsearch/api_op_DeleteIndexField.go @@ -71,6 +71,9 @@ func addOperationDeleteIndexFieldMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteIndexFieldMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DeleteSuggester.go b/service/cloudsearch/api_op_DeleteSuggester.go index 906331d0842..ad1e48ba006 100644 --- a/service/cloudsearch/api_op_DeleteSuggester.go +++ b/service/cloudsearch/api_op_DeleteSuggester.go @@ -70,6 +70,9 @@ func addOperationDeleteSuggesterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteSuggesterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeAnalysisSchemes.go b/service/cloudsearch/api_op_DescribeAnalysisSchemes.go index 51403dcbaff..283723aac34 100644 --- a/service/cloudsearch/api_op_DescribeAnalysisSchemes.go +++ b/service/cloudsearch/api_op_DescribeAnalysisSchemes.go @@ -76,6 +76,9 @@ func addOperationDescribeAnalysisSchemesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeAnalysisSchemesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeAvailabilityOptions.go b/service/cloudsearch/api_op_DescribeAvailabilityOptions.go index 72f136fa4fa..b965f446124 100644 --- a/service/cloudsearch/api_op_DescribeAvailabilityOptions.go +++ b/service/cloudsearch/api_op_DescribeAvailabilityOptions.go @@ -68,6 +68,9 @@ func addOperationDescribeAvailabilityOptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeAvailabilityOptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go b/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go index 5888d044bd4..70a5d5c21da 100644 --- a/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go +++ b/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go @@ -66,6 +66,9 @@ func addOperationDescribeDomainEndpointOptionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeDomainEndpointOptionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeDomains.go b/service/cloudsearch/api_op_DescribeDomains.go index bdb55117a45..ea69d0ccbe8 100644 --- a/service/cloudsearch/api_op_DescribeDomains.go +++ b/service/cloudsearch/api_op_DescribeDomains.go @@ -64,6 +64,9 @@ func addOperationDescribeDomainsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeDomainsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeExpressions.go b/service/cloudsearch/api_op_DescribeExpressions.go index 2a55394a497..a305eb1d1c5 100644 --- a/service/cloudsearch/api_op_DescribeExpressions.go +++ b/service/cloudsearch/api_op_DescribeExpressions.go @@ -76,6 +76,9 @@ func addOperationDescribeExpressionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeExpressionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeIndexFields.go b/service/cloudsearch/api_op_DescribeIndexFields.go index cc9298dc211..13b7383332d 100644 --- a/service/cloudsearch/api_op_DescribeIndexFields.go +++ b/service/cloudsearch/api_op_DescribeIndexFields.go @@ -76,6 +76,9 @@ func addOperationDescribeIndexFieldsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeIndexFieldsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeScalingParameters.go b/service/cloudsearch/api_op_DescribeScalingParameters.go index 5ff340eb365..ced48d33477 100644 --- a/service/cloudsearch/api_op_DescribeScalingParameters.go +++ b/service/cloudsearch/api_op_DescribeScalingParameters.go @@ -66,6 +66,9 @@ func addOperationDescribeScalingParametersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeScalingParametersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go b/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go index 8f84a4f057e..b30434f4955 100644 --- a/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go +++ b/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go @@ -69,6 +69,9 @@ func addOperationDescribeServiceAccessPoliciesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeServiceAccessPoliciesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_DescribeSuggesters.go b/service/cloudsearch/api_op_DescribeSuggesters.go index c9124203dd8..9042b1a5584 100644 --- a/service/cloudsearch/api_op_DescribeSuggesters.go +++ b/service/cloudsearch/api_op_DescribeSuggesters.go @@ -75,6 +75,9 @@ func addOperationDescribeSuggestersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeSuggestersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_IndexDocuments.go b/service/cloudsearch/api_op_IndexDocuments.go index 7794d0ed327..dc6caa9f763 100644 --- a/service/cloudsearch/api_op_IndexDocuments.go +++ b/service/cloudsearch/api_op_IndexDocuments.go @@ -61,6 +61,9 @@ func addOperationIndexDocumentsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationIndexDocumentsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_ListDomainNames.go b/service/cloudsearch/api_op_ListDomainNames.go index 85590a279b2..f3d0013ae0c 100644 --- a/service/cloudsearch/api_op_ListDomainNames.go +++ b/service/cloudsearch/api_op_ListDomainNames.go @@ -49,6 +49,9 @@ func addOperationListDomainNamesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationListDomainNamesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_UpdateAvailabilityOptions.go b/service/cloudsearch/api_op_UpdateAvailabilityOptions.go index 9cfada95f3a..18ba308ea83 100644 --- a/service/cloudsearch/api_op_UpdateAvailabilityOptions.go +++ b/service/cloudsearch/api_op_UpdateAvailabilityOptions.go @@ -76,6 +76,9 @@ func addOperationUpdateAvailabilityOptionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateAvailabilityOptionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go b/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go index 06e69a5cd6b..9023a8c7b78 100644 --- a/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go +++ b/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go @@ -69,6 +69,9 @@ func addOperationUpdateDomainEndpointOptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateDomainEndpointOptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_UpdateScalingParameters.go b/service/cloudsearch/api_op_UpdateScalingParameters.go index b31afcc5468..0f3cf38b2ec 100644 --- a/service/cloudsearch/api_op_UpdateScalingParameters.go +++ b/service/cloudsearch/api_op_UpdateScalingParameters.go @@ -76,6 +76,9 @@ func addOperationUpdateScalingParametersMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateScalingParametersMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go b/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go index 71894fa2c77..c2d67a85020 100644 --- a/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go +++ b/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go @@ -71,6 +71,9 @@ func addOperationUpdateServiceAccessPoliciesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateServiceAccessPoliciesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearch/go.mod b/service/cloudsearch/go.mod index 2ceae786503..93bf8d999bc 100644 --- a/service/cloudsearch/go.mod +++ b/service/cloudsearch/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudsearch go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudsearch/go.sum b/service/cloudsearch/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudsearch/go.sum +++ b/service/cloudsearch/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudsearchdomain/api_client.go b/service/cloudsearchdomain/api_client.go index ba265db05c2..2ec3c0deff9 100644 --- a/service/cloudsearchdomain/api_client.go +++ b/service/cloudsearchdomain/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudsearchdomain/api_op_Search.go b/service/cloudsearchdomain/api_op_Search.go index dfda51c85b6..c282e0b88b5 100644 --- a/service/cloudsearchdomain/api_op_Search.go +++ b/service/cloudsearchdomain/api_op_Search.go @@ -386,6 +386,9 @@ func addOperationSearchMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -428,6 +431,9 @@ func addOperationSearchMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearchdomain/api_op_Suggest.go b/service/cloudsearchdomain/api_op_Suggest.go index 3769f12dc03..8c741b56655 100644 --- a/service/cloudsearchdomain/api_op_Suggest.go +++ b/service/cloudsearchdomain/api_op_Suggest.go @@ -81,6 +81,9 @@ func addOperationSuggestMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationSuggestMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearchdomain/api_op_UploadDocuments.go b/service/cloudsearchdomain/api_op_UploadDocuments.go index 32e2bf81c51..89495949cdc 100644 --- a/service/cloudsearchdomain/api_op_UploadDocuments.go +++ b/service/cloudsearchdomain/api_op_UploadDocuments.go @@ -96,6 +96,9 @@ func addOperationUploadDocumentsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationUploadDocumentsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudsearchdomain/go.mod b/service/cloudsearchdomain/go.mod index 0c4ac5a85f3..6c49a89461f 100644 --- a/service/cloudsearchdomain/go.mod +++ b/service/cloudsearchdomain/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudsearchdomain go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudsearchdomain/go.sum b/service/cloudsearchdomain/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudsearchdomain/go.sum +++ b/service/cloudsearchdomain/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudtrail/api_client.go b/service/cloudtrail/api_client.go index b45dbe42722..560c548d053 100644 --- a/service/cloudtrail/api_client.go +++ b/service/cloudtrail/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudtrail/api_op_AddTags.go b/service/cloudtrail/api_op_AddTags.go index 0c2430709fd..195175949b1 100644 --- a/service/cloudtrail/api_op_AddTags.go +++ b/service/cloudtrail/api_op_AddTags.go @@ -63,6 +63,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_CreateTrail.go b/service/cloudtrail/api_op_CreateTrail.go index 59e6cb4aa08..a81fa6362e5 100644 --- a/service/cloudtrail/api_op_CreateTrail.go +++ b/service/cloudtrail/api_op_CreateTrail.go @@ -193,6 +193,9 @@ func addOperationCreateTrailMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -235,6 +238,9 @@ func addOperationCreateTrailMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_DeleteTrail.go b/service/cloudtrail/api_op_DeleteTrail.go index 93958b6caa1..7f863dc1f38 100644 --- a/service/cloudtrail/api_op_DeleteTrail.go +++ b/service/cloudtrail/api_op_DeleteTrail.go @@ -54,6 +54,9 @@ func addOperationDeleteTrailMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteTrailMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_DescribeTrails.go b/service/cloudtrail/api_op_DescribeTrails.go index 320158ec436..0bdac870c36 100644 --- a/service/cloudtrail/api_op_DescribeTrails.go +++ b/service/cloudtrail/api_op_DescribeTrails.go @@ -84,6 +84,9 @@ func addOperationDescribeTrailsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeTrailsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_GetEventSelectors.go b/service/cloudtrail/api_op_GetEventSelectors.go index a735b267799..3228c9a7043 100644 --- a/service/cloudtrail/api_op_GetEventSelectors.go +++ b/service/cloudtrail/api_op_GetEventSelectors.go @@ -92,6 +92,9 @@ func addOperationGetEventSelectorsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetEventSelectorsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_GetInsightSelectors.go b/service/cloudtrail/api_op_GetInsightSelectors.go index 68656e30b13..b4f90b549b9 100644 --- a/service/cloudtrail/api_op_GetInsightSelectors.go +++ b/service/cloudtrail/api_op_GetInsightSelectors.go @@ -84,6 +84,9 @@ func addOperationGetInsightSelectorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetInsightSelectorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_GetTrail.go b/service/cloudtrail/api_op_GetTrail.go index 1d541ca50cb..7ddb7b295e0 100644 --- a/service/cloudtrail/api_op_GetTrail.go +++ b/service/cloudtrail/api_op_GetTrail.go @@ -54,6 +54,9 @@ func addOperationGetTrailMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetTrailMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_GetTrailStatus.go b/service/cloudtrail/api_op_GetTrailStatus.go index da5088ca451..cee4bba4935 100644 --- a/service/cloudtrail/api_op_GetTrailStatus.go +++ b/service/cloudtrail/api_op_GetTrailStatus.go @@ -135,6 +135,9 @@ func addOperationGetTrailStatusMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationGetTrailStatusMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_ListPublicKeys.go b/service/cloudtrail/api_op_ListPublicKeys.go index ca682f5f1a4..869c3d3db2a 100644 --- a/service/cloudtrail/api_op_ListPublicKeys.go +++ b/service/cloudtrail/api_op_ListPublicKeys.go @@ -74,6 +74,9 @@ func addOperationListPublicKeysMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListPublicKeysMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_ListTags.go b/service/cloudtrail/api_op_ListTags.go index 736576d3d2f..cd97e1ffcc5 100644 --- a/service/cloudtrail/api_op_ListTags.go +++ b/service/cloudtrail/api_op_ListTags.go @@ -64,6 +64,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_ListTrails.go b/service/cloudtrail/api_op_ListTrails.go index 3c94b99dd0a..3ac7cbf274f 100644 --- a/service/cloudtrail/api_op_ListTrails.go +++ b/service/cloudtrail/api_op_ListTrails.go @@ -62,6 +62,9 @@ func addOperationListTrailsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTrailsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_LookupEvents.go b/service/cloudtrail/api_op_LookupEvents.go index e58ec096cc4..baf699cee68 100644 --- a/service/cloudtrail/api_op_LookupEvents.go +++ b/service/cloudtrail/api_op_LookupEvents.go @@ -129,6 +129,9 @@ func addOperationLookupEventsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationLookupEventsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_PutEventSelectors.go b/service/cloudtrail/api_op_PutEventSelectors.go index ac2e88a2531..1d90a5cf1e7 100644 --- a/service/cloudtrail/api_op_PutEventSelectors.go +++ b/service/cloudtrail/api_op_PutEventSelectors.go @@ -114,6 +114,9 @@ func addOperationPutEventSelectorsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationPutEventSelectorsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_PutInsightSelectors.go b/service/cloudtrail/api_op_PutInsightSelectors.go index 987e4de9c67..b533d693385 100644 --- a/service/cloudtrail/api_op_PutInsightSelectors.go +++ b/service/cloudtrail/api_op_PutInsightSelectors.go @@ -68,6 +68,9 @@ func addOperationPutInsightSelectorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutInsightSelectorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_RemoveTags.go b/service/cloudtrail/api_op_RemoveTags.go index 7bdc4ea5d1a..10205e71149 100644 --- a/service/cloudtrail/api_op_RemoveTags.go +++ b/service/cloudtrail/api_op_RemoveTags.go @@ -56,6 +56,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_StartLogging.go b/service/cloudtrail/api_op_StartLogging.go index fe769a93a76..c72dec6c9b8 100644 --- a/service/cloudtrail/api_op_StartLogging.go +++ b/service/cloudtrail/api_op_StartLogging.go @@ -57,6 +57,9 @@ func addOperationStartLoggingMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationStartLoggingMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_StopLogging.go b/service/cloudtrail/api_op_StopLogging.go index 10f60aaa27c..3017aa7b187 100644 --- a/service/cloudtrail/api_op_StopLogging.go +++ b/service/cloudtrail/api_op_StopLogging.go @@ -60,6 +60,9 @@ func addOperationStopLoggingMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationStopLoggingMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/api_op_UpdateTrail.go b/service/cloudtrail/api_op_UpdateTrail.go index a4915e3e012..bdb0edab9d3 100644 --- a/service/cloudtrail/api_op_UpdateTrail.go +++ b/service/cloudtrail/api_op_UpdateTrail.go @@ -202,6 +202,9 @@ func addOperationUpdateTrailMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -244,6 +247,9 @@ func addOperationUpdateTrailMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudtrail/go.mod b/service/cloudtrail/go.mod index df98b0a9183..dcbba302987 100644 --- a/service/cloudtrail/go.mod +++ b/service/cloudtrail/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudtrail go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudtrail/go.sum b/service/cloudtrail/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudtrail/go.sum +++ b/service/cloudtrail/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudwatch/api_client.go b/service/cloudwatch/api_client.go index 90303ff1709..a93cf9455d8 100644 --- a/service/cloudwatch/api_client.go +++ b/service/cloudwatch/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudwatch/api_op_DeleteAlarms.go b/service/cloudwatch/api_op_DeleteAlarms.go index 3a0b6502948..5a427e25a20 100644 --- a/service/cloudwatch/api_op_DeleteAlarms.go +++ b/service/cloudwatch/api_op_DeleteAlarms.go @@ -61,6 +61,9 @@ func addOperationDeleteAlarmsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteAlarmsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DeleteAnomalyDetector.go b/service/cloudwatch/api_op_DeleteAnomalyDetector.go index cf28a08d36a..f8e6e846a54 100644 --- a/service/cloudwatch/api_op_DeleteAnomalyDetector.go +++ b/service/cloudwatch/api_op_DeleteAnomalyDetector.go @@ -62,6 +62,9 @@ func addOperationDeleteAnomalyDetectorMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteAnomalyDetectorMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DeleteDashboards.go b/service/cloudwatch/api_op_DeleteDashboards.go index efd621d755d..892e79196bf 100644 --- a/service/cloudwatch/api_op_DeleteDashboards.go +++ b/service/cloudwatch/api_op_DeleteDashboards.go @@ -49,6 +49,9 @@ func addOperationDeleteDashboardsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteDashboardsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DeleteInsightRules.go b/service/cloudwatch/api_op_DeleteInsightRules.go index 2d47e572ebb..b030e8ce7d1 100644 --- a/service/cloudwatch/api_op_DeleteInsightRules.go +++ b/service/cloudwatch/api_op_DeleteInsightRules.go @@ -58,6 +58,9 @@ func addOperationDeleteInsightRulesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteInsightRulesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DescribeAlarmHistory.go b/service/cloudwatch/api_op_DescribeAlarmHistory.go index 7beb2c1b30f..c2174a8405e 100644 --- a/service/cloudwatch/api_op_DescribeAlarmHistory.go +++ b/service/cloudwatch/api_op_DescribeAlarmHistory.go @@ -84,6 +84,9 @@ func addOperationDescribeAlarmHistoryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeAlarmHistoryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DescribeAlarms.go b/service/cloudwatch/api_op_DescribeAlarms.go index bf9012db2b2..96b8f8b11ea 100644 --- a/service/cloudwatch/api_op_DescribeAlarms.go +++ b/service/cloudwatch/api_op_DescribeAlarms.go @@ -111,6 +111,9 @@ func addOperationDescribeAlarmsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeAlarmsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DescribeAlarmsForMetric.go b/service/cloudwatch/api_op_DescribeAlarmsForMetric.go index 591a032b600..a92038f9f18 100644 --- a/service/cloudwatch/api_op_DescribeAlarmsForMetric.go +++ b/service/cloudwatch/api_op_DescribeAlarmsForMetric.go @@ -76,6 +76,9 @@ func addOperationDescribeAlarmsForMetricMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeAlarmsForMetricMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DescribeAnomalyDetectors.go b/service/cloudwatch/api_op_DescribeAnomalyDetectors.go index 7fba7c23f5c..72debfef4ef 100644 --- a/service/cloudwatch/api_op_DescribeAnomalyDetectors.go +++ b/service/cloudwatch/api_op_DescribeAnomalyDetectors.go @@ -77,6 +77,9 @@ func addOperationDescribeAnomalyDetectorsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeAnomalyDetectorsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DescribeInsightRules.go b/service/cloudwatch/api_op_DescribeInsightRules.go index 3ce07186be8..58dbce90d4a 100644 --- a/service/cloudwatch/api_op_DescribeInsightRules.go +++ b/service/cloudwatch/api_op_DescribeInsightRules.go @@ -62,6 +62,9 @@ func addOperationDescribeInsightRulesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeInsightRulesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DisableAlarmActions.go b/service/cloudwatch/api_op_DisableAlarmActions.go index d855894ceca..b6ec4fdb0a5 100644 --- a/service/cloudwatch/api_op_DisableAlarmActions.go +++ b/service/cloudwatch/api_op_DisableAlarmActions.go @@ -49,6 +49,9 @@ func addOperationDisableAlarmActionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisableAlarmActionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_DisableInsightRules.go b/service/cloudwatch/api_op_DisableInsightRules.go index 6b23cfe4b07..101d16807a3 100644 --- a/service/cloudwatch/api_op_DisableInsightRules.go +++ b/service/cloudwatch/api_op_DisableInsightRules.go @@ -57,6 +57,9 @@ func addOperationDisableInsightRulesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDisableInsightRulesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_EnableAlarmActions.go b/service/cloudwatch/api_op_EnableAlarmActions.go index 2a1bd25d22f..cfa7f12da22 100644 --- a/service/cloudwatch/api_op_EnableAlarmActions.go +++ b/service/cloudwatch/api_op_EnableAlarmActions.go @@ -48,6 +48,9 @@ func addOperationEnableAlarmActionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationEnableAlarmActionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_EnableInsightRules.go b/service/cloudwatch/api_op_EnableInsightRules.go index 4f83d734107..0b044d03ebb 100644 --- a/service/cloudwatch/api_op_EnableInsightRules.go +++ b/service/cloudwatch/api_op_EnableInsightRules.go @@ -57,6 +57,9 @@ func addOperationEnableInsightRulesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationEnableInsightRulesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_GetDashboard.go b/service/cloudwatch/api_op_GetDashboard.go index 3115a5ac810..81d323cb5f3 100644 --- a/service/cloudwatch/api_op_GetDashboard.go +++ b/service/cloudwatch/api_op_GetDashboard.go @@ -64,6 +64,9 @@ func addOperationGetDashboardMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetDashboardMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_GetInsightRuleReport.go b/service/cloudwatch/api_op_GetInsightRuleReport.go index d11e915bce0..9f69634fa28 100644 --- a/service/cloudwatch/api_op_GetInsightRuleReport.go +++ b/service/cloudwatch/api_op_GetInsightRuleReport.go @@ -165,6 +165,9 @@ func addOperationGetInsightRuleReportMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -207,6 +210,9 @@ func addOperationGetInsightRuleReportMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_GetMetricData.go b/service/cloudwatch/api_op_GetMetricData.go index c8578ce68bc..b4d75fbbb98 100644 --- a/service/cloudwatch/api_op_GetMetricData.go +++ b/service/cloudwatch/api_op_GetMetricData.go @@ -164,6 +164,9 @@ func addOperationGetMetricDataMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -206,6 +209,9 @@ func addOperationGetMetricDataMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_GetMetricStatistics.go b/service/cloudwatch/api_op_GetMetricStatistics.go index c89e02bfae3..4b3ef1117e8 100644 --- a/service/cloudwatch/api_op_GetMetricStatistics.go +++ b/service/cloudwatch/api_op_GetMetricStatistics.go @@ -203,6 +203,9 @@ func addOperationGetMetricStatisticsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -245,6 +248,9 @@ func addOperationGetMetricStatisticsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_GetMetricWidgetImage.go b/service/cloudwatch/api_op_GetMetricWidgetImage.go index 65eb955c3d4..fc1b8b943b5 100644 --- a/service/cloudwatch/api_op_GetMetricWidgetImage.go +++ b/service/cloudwatch/api_op_GetMetricWidgetImage.go @@ -89,6 +89,9 @@ func addOperationGetMetricWidgetImageMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetMetricWidgetImageMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_ListDashboards.go b/service/cloudwatch/api_op_ListDashboards.go index fa8b3ebf21b..d0dfac7c805 100644 --- a/service/cloudwatch/api_op_ListDashboards.go +++ b/service/cloudwatch/api_op_ListDashboards.go @@ -65,6 +65,9 @@ func addOperationListDashboardsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListDashboardsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_ListMetrics.go b/service/cloudwatch/api_op_ListMetrics.go index 777a6ef5686..d58a87c31d0 100644 --- a/service/cloudwatch/api_op_ListMetrics.go +++ b/service/cloudwatch/api_op_ListMetrics.go @@ -88,6 +88,9 @@ func addOperationListMetricsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListMetricsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_ListTagsForResource.go b/service/cloudwatch/api_op_ListTagsForResource.go index dfced089440..a67995ba326 100644 --- a/service/cloudwatch/api_op_ListTagsForResource.go +++ b/service/cloudwatch/api_op_ListTagsForResource.go @@ -60,6 +60,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_PutAnomalyDetector.go b/service/cloudwatch/api_op_PutAnomalyDetector.go index 4c3411e210a..c328a7a7b91 100644 --- a/service/cloudwatch/api_op_PutAnomalyDetector.go +++ b/service/cloudwatch/api_op_PutAnomalyDetector.go @@ -71,6 +71,9 @@ func addOperationPutAnomalyDetectorMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationPutAnomalyDetectorMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_PutCompositeAlarm.go b/service/cloudwatch/api_op_PutCompositeAlarm.go index 43779e3bdd1..48c878fd528 100644 --- a/service/cloudwatch/api_op_PutCompositeAlarm.go +++ b/service/cloudwatch/api_op_PutCompositeAlarm.go @@ -157,6 +157,9 @@ func addOperationPutCompositeAlarmMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -199,6 +202,9 @@ func addOperationPutCompositeAlarmMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_PutDashboard.go b/service/cloudwatch/api_op_PutDashboard.go index 8f5e195e56f..19ac2e61209 100644 --- a/service/cloudwatch/api_op_PutDashboard.go +++ b/service/cloudwatch/api_op_PutDashboard.go @@ -82,6 +82,9 @@ func addOperationPutDashboardMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationPutDashboardMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_PutInsightRule.go b/service/cloudwatch/api_op_PutInsightRule.go index e6aa66ae277..b07f9f63de5 100644 --- a/service/cloudwatch/api_op_PutInsightRule.go +++ b/service/cloudwatch/api_op_PutInsightRule.go @@ -77,6 +77,9 @@ func addOperationPutInsightRuleMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationPutInsightRuleMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_PutMetricAlarm.go b/service/cloudwatch/api_op_PutMetricAlarm.go index 70c388f1c92..af1fb81416c 100644 --- a/service/cloudwatch/api_op_PutMetricAlarm.go +++ b/service/cloudwatch/api_op_PutMetricAlarm.go @@ -262,6 +262,9 @@ func addOperationPutMetricAlarmMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -304,6 +307,9 @@ func addOperationPutMetricAlarmMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_PutMetricData.go b/service/cloudwatch/api_op_PutMetricData.go index f2ebec06a76..ebc77494548 100644 --- a/service/cloudwatch/api_op_PutMetricData.go +++ b/service/cloudwatch/api_op_PutMetricData.go @@ -94,6 +94,9 @@ func addOperationPutMetricDataMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationPutMetricDataMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_SetAlarmState.go b/service/cloudwatch/api_op_SetAlarmState.go index d396e21d7b8..6331467572e 100644 --- a/service/cloudwatch/api_op_SetAlarmState.go +++ b/service/cloudwatch/api_op_SetAlarmState.go @@ -79,6 +79,9 @@ func addOperationSetAlarmStateMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationSetAlarmStateMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_TagResource.go b/service/cloudwatch/api_op_TagResource.go index 55618fd95f0..cbfa350865f 100644 --- a/service/cloudwatch/api_op_TagResource.go +++ b/service/cloudwatch/api_op_TagResource.go @@ -71,6 +71,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/api_op_UntagResource.go b/service/cloudwatch/api_op_UntagResource.go index cc166aade1b..dc2f7d9e283 100644 --- a/service/cloudwatch/api_op_UntagResource.go +++ b/service/cloudwatch/api_op_UntagResource.go @@ -59,6 +59,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatch/go.mod b/service/cloudwatch/go.mod index 207ca7bf706..524ff217096 100644 --- a/service/cloudwatch/go.mod +++ b/service/cloudwatch/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudwatch go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudwatch/go.sum b/service/cloudwatch/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudwatch/go.sum +++ b/service/cloudwatch/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudwatchevents/api_client.go b/service/cloudwatchevents/api_client.go index 24b3769bfed..ebfac4ce449 100644 --- a/service/cloudwatchevents/api_client.go +++ b/service/cloudwatchevents/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudwatchevents/api_op_ActivateEventSource.go b/service/cloudwatchevents/api_op_ActivateEventSource.go index c2c49225261..9b15779b4a4 100644 --- a/service/cloudwatchevents/api_op_ActivateEventSource.go +++ b/service/cloudwatchevents/api_op_ActivateEventSource.go @@ -49,6 +49,9 @@ func addOperationActivateEventSourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationActivateEventSourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_CreateEventBus.go b/service/cloudwatchevents/api_op_CreateEventBus.go index b0f5602ad7f..84501348b02 100644 --- a/service/cloudwatchevents/api_op_CreateEventBus.go +++ b/service/cloudwatchevents/api_op_CreateEventBus.go @@ -66,6 +66,9 @@ func addOperationCreateEventBusMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateEventBusMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_CreatePartnerEventSource.go b/service/cloudwatchevents/api_op_CreatePartnerEventSource.go index dd56817a660..24c4b1b66fc 100644 --- a/service/cloudwatchevents/api_op_CreatePartnerEventSource.go +++ b/service/cloudwatchevents/api_op_CreatePartnerEventSource.go @@ -76,6 +76,9 @@ func addOperationCreatePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreatePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DeactivateEventSource.go b/service/cloudwatchevents/api_op_DeactivateEventSource.go index 1c3dd413cb8..383fdf29661 100644 --- a/service/cloudwatchevents/api_op_DeactivateEventSource.go +++ b/service/cloudwatchevents/api_op_DeactivateEventSource.go @@ -52,6 +52,9 @@ func addOperationDeactivateEventSourceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeactivateEventSourceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DeleteEventBus.go b/service/cloudwatchevents/api_op_DeleteEventBus.go index d7cebf342e5..a5a069280fd 100644 --- a/service/cloudwatchevents/api_op_DeleteEventBus.go +++ b/service/cloudwatchevents/api_op_DeleteEventBus.go @@ -50,6 +50,9 @@ func addOperationDeleteEventBusMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteEventBusMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DeletePartnerEventSource.go b/service/cloudwatchevents/api_op_DeletePartnerEventSource.go index e23ba6f136e..146f30a2025 100644 --- a/service/cloudwatchevents/api_op_DeletePartnerEventSource.go +++ b/service/cloudwatchevents/api_op_DeletePartnerEventSource.go @@ -56,6 +56,9 @@ func addOperationDeletePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeletePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DeleteRule.go b/service/cloudwatchevents/api_op_DeleteRule.go index bf3cfc620d9..e1db8f6d166 100644 --- a/service/cloudwatchevents/api_op_DeleteRule.go +++ b/service/cloudwatchevents/api_op_DeleteRule.go @@ -66,6 +66,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DescribeEventBus.go b/service/cloudwatchevents/api_op_DescribeEventBus.go index 51f82ba36a6..ce656fca762 100644 --- a/service/cloudwatchevents/api_op_DescribeEventBus.go +++ b/service/cloudwatchevents/api_op_DescribeEventBus.go @@ -64,6 +64,9 @@ func addOperationDescribeEventBusMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeEventBusMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DescribeEventSource.go b/service/cloudwatchevents/api_op_DescribeEventSource.go index b4fea5a5559..cd23791e501 100644 --- a/service/cloudwatchevents/api_op_DescribeEventSource.go +++ b/service/cloudwatchevents/api_op_DescribeEventSource.go @@ -75,6 +75,9 @@ func addOperationDescribeEventSourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeEventSourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DescribePartnerEventSource.go b/service/cloudwatchevents/api_op_DescribePartnerEventSource.go index 2105e230e59..50924d3d4b6 100644 --- a/service/cloudwatchevents/api_op_DescribePartnerEventSource.go +++ b/service/cloudwatchevents/api_op_DescribePartnerEventSource.go @@ -58,6 +58,9 @@ func addOperationDescribePartnerEventSourceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribePartnerEventSourceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DescribeRule.go b/service/cloudwatchevents/api_op_DescribeRule.go index 151dd2f9f96..66ef28bbd71 100644 --- a/service/cloudwatchevents/api_op_DescribeRule.go +++ b/service/cloudwatchevents/api_op_DescribeRule.go @@ -85,6 +85,9 @@ func addOperationDescribeRuleMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeRuleMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_DisableRule.go b/service/cloudwatchevents/api_op_DisableRule.go index 8474a872308..9cd800bbcd4 100644 --- a/service/cloudwatchevents/api_op_DisableRule.go +++ b/service/cloudwatchevents/api_op_DisableRule.go @@ -55,6 +55,9 @@ func addOperationDisableRuleMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisableRuleMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_EnableRule.go b/service/cloudwatchevents/api_op_EnableRule.go index 3213a9d2dd4..0ae9c555a0b 100644 --- a/service/cloudwatchevents/api_op_EnableRule.go +++ b/service/cloudwatchevents/api_op_EnableRule.go @@ -54,6 +54,9 @@ func addOperationEnableRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationEnableRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListEventBuses.go b/service/cloudwatchevents/api_op_ListEventBuses.go index 3da00a76789..38f8206cd5a 100644 --- a/service/cloudwatchevents/api_op_ListEventBuses.go +++ b/service/cloudwatchevents/api_op_ListEventBuses.go @@ -65,6 +65,9 @@ func addOperationListEventBusesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListEventBusesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListEventSources.go b/service/cloudwatchevents/api_op_ListEventSources.go index ee0b46b5aef..860e9d859df 100644 --- a/service/cloudwatchevents/api_op_ListEventSources.go +++ b/service/cloudwatchevents/api_op_ListEventSources.go @@ -66,6 +66,9 @@ func addOperationListEventSourcesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListEventSourcesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go b/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go index 70d52eb2311..9feb002047d 100644 --- a/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go +++ b/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go @@ -68,6 +68,9 @@ func addOperationListPartnerEventSourceAccountsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListPartnerEventSourceAccountsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListPartnerEventSources.go b/service/cloudwatchevents/api_op_ListPartnerEventSources.go index f54b7b11656..4fe743dd4e0 100644 --- a/service/cloudwatchevents/api_op_ListPartnerEventSources.go +++ b/service/cloudwatchevents/api_op_ListPartnerEventSources.go @@ -68,6 +68,9 @@ func addOperationListPartnerEventSourcesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListPartnerEventSourcesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go b/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go index 80d46652d8c..da07b4f6982 100644 --- a/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go +++ b/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go @@ -67,6 +67,9 @@ func addOperationListRuleNamesByTargetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListRuleNamesByTargetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListRules.go b/service/cloudwatchevents/api_op_ListRules.go index f44785c3dcf..ce913b9478f 100644 --- a/service/cloudwatchevents/api_op_ListRules.go +++ b/service/cloudwatchevents/api_op_ListRules.go @@ -68,6 +68,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListTagsForResource.go b/service/cloudwatchevents/api_op_ListTagsForResource.go index 9009c7eaad5..6a9c4ff2ad8 100644 --- a/service/cloudwatchevents/api_op_ListTagsForResource.go +++ b/service/cloudwatchevents/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_ListTargetsByRule.go b/service/cloudwatchevents/api_op_ListTargetsByRule.go index a48747409a2..68a8a322015 100644 --- a/service/cloudwatchevents/api_op_ListTargetsByRule.go +++ b/service/cloudwatchevents/api_op_ListTargetsByRule.go @@ -67,6 +67,9 @@ func addOperationListTargetsByRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListTargetsByRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_PutEvents.go b/service/cloudwatchevents/api_op_PutEvents.go index 629d3c5ddc5..7fe882ffff2 100644 --- a/service/cloudwatchevents/api_op_PutEvents.go +++ b/service/cloudwatchevents/api_op_PutEvents.go @@ -60,6 +60,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_PutPartnerEvents.go b/service/cloudwatchevents/api_op_PutPartnerEvents.go index 500e70eb904..30bc9c08f2b 100644 --- a/service/cloudwatchevents/api_op_PutPartnerEvents.go +++ b/service/cloudwatchevents/api_op_PutPartnerEvents.go @@ -59,6 +59,9 @@ func addOperationPutPartnerEventsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutPartnerEventsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_PutPermission.go b/service/cloudwatchevents/api_op_PutPermission.go index 32444ae9efb..7651075f191 100644 --- a/service/cloudwatchevents/api_op_PutPermission.go +++ b/service/cloudwatchevents/api_op_PutPermission.go @@ -98,6 +98,9 @@ func addOperationPutPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationPutPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_PutRule.go b/service/cloudwatchevents/api_op_PutRule.go index c33d1940eb6..e69ca04558b 100644 --- a/service/cloudwatchevents/api_op_PutRule.go +++ b/service/cloudwatchevents/api_op_PutRule.go @@ -117,6 +117,9 @@ func addOperationPutRuleMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationPutRuleMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_PutTargets.go b/service/cloudwatchevents/api_op_PutTargets.go index 6bb7c7ccb86..c97e83b2cec 100644 --- a/service/cloudwatchevents/api_op_PutTargets.go +++ b/service/cloudwatchevents/api_op_PutTargets.go @@ -171,6 +171,9 @@ func addOperationPutTargetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -213,6 +216,9 @@ func addOperationPutTargetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_RemovePermission.go b/service/cloudwatchevents/api_op_RemovePermission.go index 63e6d7ecaf7..5904342f7f4 100644 --- a/service/cloudwatchevents/api_op_RemovePermission.go +++ b/service/cloudwatchevents/api_op_RemovePermission.go @@ -56,6 +56,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_RemoveTargets.go b/service/cloudwatchevents/api_op_RemoveTargets.go index b0e149ad6b8..2cacf0206aa 100644 --- a/service/cloudwatchevents/api_op_RemoveTargets.go +++ b/service/cloudwatchevents/api_op_RemoveTargets.go @@ -77,6 +77,9 @@ func addOperationRemoveTargetsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationRemoveTargetsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_TagResource.go b/service/cloudwatchevents/api_op_TagResource.go index 6d82b086cf2..ad9ba7f48ed 100644 --- a/service/cloudwatchevents/api_op_TagResource.go +++ b/service/cloudwatchevents/api_op_TagResource.go @@ -64,6 +64,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_TestEventPattern.go b/service/cloudwatchevents/api_op_TestEventPattern.go index 20c965b1c9e..fd4c4649852 100644 --- a/service/cloudwatchevents/api_op_TestEventPattern.go +++ b/service/cloudwatchevents/api_op_TestEventPattern.go @@ -63,6 +63,9 @@ func addOperationTestEventPatternMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTestEventPatternMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/api_op_UntagResource.go b/service/cloudwatchevents/api_op_UntagResource.go index e723d849dd1..d8d8c8fb26a 100644 --- a/service/cloudwatchevents/api_op_UntagResource.go +++ b/service/cloudwatchevents/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchevents/go.mod b/service/cloudwatchevents/go.mod index 46400932546..81ac99f512a 100644 --- a/service/cloudwatchevents/go.mod +++ b/service/cloudwatchevents/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudwatchevents go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudwatchevents/go.sum b/service/cloudwatchevents/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudwatchevents/go.sum +++ b/service/cloudwatchevents/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudwatchlogs/api_client.go b/service/cloudwatchlogs/api_client.go index 08b543a3d9e..7ebebf61285 100644 --- a/service/cloudwatchlogs/api_client.go +++ b/service/cloudwatchlogs/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cloudwatchlogs/api_op_AssociateKmsKey.go b/service/cloudwatchlogs/api_op_AssociateKmsKey.go index 4795816242b..62a3b37ca16 100644 --- a/service/cloudwatchlogs/api_op_AssociateKmsKey.go +++ b/service/cloudwatchlogs/api_op_AssociateKmsKey.go @@ -71,6 +71,9 @@ func addOperationAssociateKmsKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationAssociateKmsKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_CancelExportTask.go b/service/cloudwatchlogs/api_op_CancelExportTask.go index 02918c6674b..763dbb8609f 100644 --- a/service/cloudwatchlogs/api_op_CancelExportTask.go +++ b/service/cloudwatchlogs/api_op_CancelExportTask.go @@ -49,6 +49,9 @@ func addOperationCancelExportTaskMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationCancelExportTaskMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_CreateExportTask.go b/service/cloudwatchlogs/api_op_CreateExportTask.go index 35266b8cd3f..0a67b77b5bd 100644 --- a/service/cloudwatchlogs/api_op_CreateExportTask.go +++ b/service/cloudwatchlogs/api_op_CreateExportTask.go @@ -99,6 +99,9 @@ func addOperationCreateExportTaskMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreateExportTaskMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_CreateLogGroup.go b/service/cloudwatchlogs/api_op_CreateLogGroup.go index 3162dea6ac2..e9e356b18c6 100644 --- a/service/cloudwatchlogs/api_op_CreateLogGroup.go +++ b/service/cloudwatchlogs/api_op_CreateLogGroup.go @@ -84,6 +84,9 @@ func addOperationCreateLogGroupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateLogGroupMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_CreateLogStream.go b/service/cloudwatchlogs/api_op_CreateLogStream.go index bd5645ad19a..6aeb2cc9ecb 100644 --- a/service/cloudwatchlogs/api_op_CreateLogStream.go +++ b/service/cloudwatchlogs/api_op_CreateLogStream.go @@ -67,6 +67,9 @@ func addOperationCreateLogStreamMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateLogStreamMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteDestination.go b/service/cloudwatchlogs/api_op_DeleteDestination.go index dad166863e4..23f458fabf8 100644 --- a/service/cloudwatchlogs/api_op_DeleteDestination.go +++ b/service/cloudwatchlogs/api_op_DeleteDestination.go @@ -50,6 +50,9 @@ func addOperationDeleteDestinationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteDestinationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteLogGroup.go b/service/cloudwatchlogs/api_op_DeleteLogGroup.go index 793d561ead2..fdd46b770af 100644 --- a/service/cloudwatchlogs/api_op_DeleteLogGroup.go +++ b/service/cloudwatchlogs/api_op_DeleteLogGroup.go @@ -49,6 +49,9 @@ func addOperationDeleteLogGroupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteLogGroupMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteLogStream.go b/service/cloudwatchlogs/api_op_DeleteLogStream.go index e30fd31aaaa..8c531918a61 100644 --- a/service/cloudwatchlogs/api_op_DeleteLogStream.go +++ b/service/cloudwatchlogs/api_op_DeleteLogStream.go @@ -54,6 +54,9 @@ func addOperationDeleteLogStreamMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteLogStreamMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteMetricFilter.go b/service/cloudwatchlogs/api_op_DeleteMetricFilter.go index e31680126ac..784b9e15986 100644 --- a/service/cloudwatchlogs/api_op_DeleteMetricFilter.go +++ b/service/cloudwatchlogs/api_op_DeleteMetricFilter.go @@ -53,6 +53,9 @@ func addOperationDeleteMetricFilterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteMetricFilterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go b/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go index 83828ee2188..15b4b2472bc 100644 --- a/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go +++ b/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go @@ -59,6 +59,9 @@ func addOperationDeleteQueryDefinitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteQueryDefinitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go b/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go index 5eedcc23a27..fb901804c90 100644 --- a/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go +++ b/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go @@ -47,6 +47,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go b/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go index ddd03780d66..ae68652580c 100644 --- a/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go +++ b/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go @@ -49,6 +49,9 @@ func addOperationDeleteRetentionPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteRetentionPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go b/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go index dad1d52f7de..940ce995984 100644 --- a/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go +++ b/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go @@ -53,6 +53,9 @@ func addOperationDeleteSubscriptionFilterMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteSubscriptionFilterMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeDestinations.go b/service/cloudwatchlogs/api_op_DescribeDestinations.go index 265f345b006..c6a95f1a007 100644 --- a/service/cloudwatchlogs/api_op_DescribeDestinations.go +++ b/service/cloudwatchlogs/api_op_DescribeDestinations.go @@ -62,6 +62,9 @@ func addOperationDescribeDestinationsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeDestinationsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeExportTasks.go b/service/cloudwatchlogs/api_op_DescribeExportTasks.go index bc0971ef676..2a0dd2cb432 100644 --- a/service/cloudwatchlogs/api_op_DescribeExportTasks.go +++ b/service/cloudwatchlogs/api_op_DescribeExportTasks.go @@ -68,6 +68,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeLogGroups.go b/service/cloudwatchlogs/api_op_DescribeLogGroups.go index 03ec33e24da..cc3af7e82b9 100644 --- a/service/cloudwatchlogs/api_op_DescribeLogGroups.go +++ b/service/cloudwatchlogs/api_op_DescribeLogGroups.go @@ -64,6 +64,9 @@ func addOperationDescribeLogGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeLogGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeLogStreams.go b/service/cloudwatchlogs/api_op_DescribeLogStreams.go index 28b69906d1c..44c104f5357 100644 --- a/service/cloudwatchlogs/api_op_DescribeLogStreams.go +++ b/service/cloudwatchlogs/api_op_DescribeLogStreams.go @@ -86,6 +86,9 @@ func addOperationDescribeLogStreamsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeLogStreamsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeMetricFilters.go b/service/cloudwatchlogs/api_op_DescribeMetricFilters.go index 34cb69cbab2..86ab0c4ceaf 100644 --- a/service/cloudwatchlogs/api_op_DescribeMetricFilters.go +++ b/service/cloudwatchlogs/api_op_DescribeMetricFilters.go @@ -77,6 +77,9 @@ func addOperationDescribeMetricFiltersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeMetricFiltersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeQueries.go b/service/cloudwatchlogs/api_op_DescribeQueries.go index e4a78479be1..13cbca33bf2 100644 --- a/service/cloudwatchlogs/api_op_DescribeQueries.go +++ b/service/cloudwatchlogs/api_op_DescribeQueries.go @@ -67,6 +67,9 @@ func addOperationDescribeQueriesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeQueriesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go b/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go index bef3155b8c4..e26b1a8ea3c 100644 --- a/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go +++ b/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go @@ -64,6 +64,9 @@ func addOperationDescribeQueryDefinitionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeQueryDefinitionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go b/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go index a4da8ca8722..61b8784cf9d 100644 --- a/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go +++ b/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go @@ -58,6 +58,9 @@ func addOperationDescribeResourcePoliciesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeResourcePoliciesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go b/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go index adefd736845..6ff8e7a5915 100644 --- a/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go +++ b/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go @@ -69,6 +69,9 @@ func addOperationDescribeSubscriptionFiltersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeSubscriptionFiltersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_DisassociateKmsKey.go b/service/cloudwatchlogs/api_op_DisassociateKmsKey.go index c44b3ad7c9d..7f7f6c414ca 100644 --- a/service/cloudwatchlogs/api_op_DisassociateKmsKey.go +++ b/service/cloudwatchlogs/api_op_DisassociateKmsKey.go @@ -54,6 +54,9 @@ func addOperationDisassociateKmsKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateKmsKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_FilterLogEvents.go b/service/cloudwatchlogs/api_op_FilterLogEvents.go index be08e3548a6..ae418a1b80e 100644 --- a/service/cloudwatchlogs/api_op_FilterLogEvents.go +++ b/service/cloudwatchlogs/api_op_FilterLogEvents.go @@ -115,6 +115,9 @@ func addOperationFilterLogEventsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationFilterLogEventsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_GetLogEvents.go b/service/cloudwatchlogs/api_op_GetLogEvents.go index 753a2cb03aa..c71aa387344 100644 --- a/service/cloudwatchlogs/api_op_GetLogEvents.go +++ b/service/cloudwatchlogs/api_op_GetLogEvents.go @@ -100,6 +100,9 @@ func addOperationGetLogEventsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationGetLogEventsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_GetLogGroupFields.go b/service/cloudwatchlogs/api_op_GetLogGroupFields.go index 18bc1a895e2..414467e09b4 100644 --- a/service/cloudwatchlogs/api_op_GetLogGroupFields.go +++ b/service/cloudwatchlogs/api_op_GetLogGroupFields.go @@ -69,6 +69,9 @@ func addOperationGetLogGroupFieldsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetLogGroupFieldsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_GetLogRecord.go b/service/cloudwatchlogs/api_op_GetLogRecord.go index 52d14644ebd..6452df865cb 100644 --- a/service/cloudwatchlogs/api_op_GetLogRecord.go +++ b/service/cloudwatchlogs/api_op_GetLogRecord.go @@ -58,6 +58,9 @@ func addOperationGetLogRecordMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetLogRecordMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_GetQueryResults.go b/service/cloudwatchlogs/api_op_GetQueryResults.go index 990e0e6770f..945cd4bb782 100644 --- a/service/cloudwatchlogs/api_op_GetQueryResults.go +++ b/service/cloudwatchlogs/api_op_GetQueryResults.go @@ -77,6 +77,9 @@ func addOperationGetQueryResultsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetQueryResultsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_ListTagsLogGroup.go b/service/cloudwatchlogs/api_op_ListTagsLogGroup.go index 1dce4b84ee2..832a8d07dae 100644 --- a/service/cloudwatchlogs/api_op_ListTagsLogGroup.go +++ b/service/cloudwatchlogs/api_op_ListTagsLogGroup.go @@ -52,6 +52,9 @@ func addOperationListTagsLogGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsLogGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutDestination.go b/service/cloudwatchlogs/api_op_PutDestination.go index a408ab433c9..84780eefe16 100644 --- a/service/cloudwatchlogs/api_op_PutDestination.go +++ b/service/cloudwatchlogs/api_op_PutDestination.go @@ -78,6 +78,9 @@ func addOperationPutDestinationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationPutDestinationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutDestinationPolicy.go b/service/cloudwatchlogs/api_op_PutDestinationPolicy.go index 6bdc0520d75..455dcdb37f0 100644 --- a/service/cloudwatchlogs/api_op_PutDestinationPolicy.go +++ b/service/cloudwatchlogs/api_op_PutDestinationPolicy.go @@ -58,6 +58,9 @@ func addOperationPutDestinationPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutDestinationPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutLogEvents.go b/service/cloudwatchlogs/api_op_PutLogEvents.go index 044c29e097e..a10614f6a06 100644 --- a/service/cloudwatchlogs/api_op_PutLogEvents.go +++ b/service/cloudwatchlogs/api_op_PutLogEvents.go @@ -111,6 +111,9 @@ func addOperationPutLogEventsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationPutLogEventsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutMetricFilter.go b/service/cloudwatchlogs/api_op_PutMetricFilter.go index 6c989729623..85bb62a0606 100644 --- a/service/cloudwatchlogs/api_op_PutMetricFilter.go +++ b/service/cloudwatchlogs/api_op_PutMetricFilter.go @@ -69,6 +69,9 @@ func addOperationPutMetricFilterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationPutMetricFilterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutQueryDefinition.go b/service/cloudwatchlogs/api_op_PutQueryDefinition.go index 3c992e9addb..0139da2f76d 100644 --- a/service/cloudwatchlogs/api_op_PutQueryDefinition.go +++ b/service/cloudwatchlogs/api_op_PutQueryDefinition.go @@ -87,6 +87,9 @@ func addOperationPutQueryDefinitionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationPutQueryDefinitionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutResourcePolicy.go b/service/cloudwatchlogs/api_op_PutResourcePolicy.go index 751a1b4d78b..bfc22bfbf24 100644 --- a/service/cloudwatchlogs/api_op_PutResourcePolicy.go +++ b/service/cloudwatchlogs/api_op_PutResourcePolicy.go @@ -64,6 +64,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutRetentionPolicy.go b/service/cloudwatchlogs/api_op_PutRetentionPolicy.go index d1ce0c50b96..2432b6f78f2 100644 --- a/service/cloudwatchlogs/api_op_PutRetentionPolicy.go +++ b/service/cloudwatchlogs/api_op_PutRetentionPolicy.go @@ -58,6 +58,9 @@ func addOperationPutRetentionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutRetentionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go b/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go index 28e67980407..31da49d35a9 100644 --- a/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go +++ b/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go @@ -121,6 +121,9 @@ func addOperationPutSubscriptionFilterMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationPutSubscriptionFilterMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_StartQuery.go b/service/cloudwatchlogs/api_op_StartQuery.go index 488ad54ce7f..b1b40b051e3 100644 --- a/service/cloudwatchlogs/api_op_StartQuery.go +++ b/service/cloudwatchlogs/api_op_StartQuery.go @@ -88,6 +88,9 @@ func addOperationStartQueryMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationStartQueryMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_StopQuery.go b/service/cloudwatchlogs/api_op_StopQuery.go index 9ab92998be1..5447eaa7b2e 100644 --- a/service/cloudwatchlogs/api_op_StopQuery.go +++ b/service/cloudwatchlogs/api_op_StopQuery.go @@ -54,6 +54,9 @@ func addOperationStopQueryMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStopQueryMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_TagLogGroup.go b/service/cloudwatchlogs/api_op_TagLogGroup.go index 799b879b9af..94522e65a8b 100644 --- a/service/cloudwatchlogs/api_op_TagLogGroup.go +++ b/service/cloudwatchlogs/api_op_TagLogGroup.go @@ -60,6 +60,9 @@ func addOperationTagLogGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationTagLogGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_TestMetricFilter.go b/service/cloudwatchlogs/api_op_TestMetricFilter.go index a29df1a4fff..a72f58b19ba 100644 --- a/service/cloudwatchlogs/api_op_TestMetricFilter.go +++ b/service/cloudwatchlogs/api_op_TestMetricFilter.go @@ -63,6 +63,9 @@ func addOperationTestMetricFilterMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTestMetricFilterMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/api_op_UntagLogGroup.go b/service/cloudwatchlogs/api_op_UntagLogGroup.go index 34a049bbfb6..8e406d77bf2 100644 --- a/service/cloudwatchlogs/api_op_UntagLogGroup.go +++ b/service/cloudwatchlogs/api_op_UntagLogGroup.go @@ -57,6 +57,9 @@ func addOperationUntagLogGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagLogGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cloudwatchlogs/go.mod b/service/cloudwatchlogs/go.mod index 6c9de2006b9..674d567013e 100644 --- a/service/cloudwatchlogs/go.mod +++ b/service/cloudwatchlogs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudwatchlogs/go.sum b/service/cloudwatchlogs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cloudwatchlogs/go.sum +++ b/service/cloudwatchlogs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codeartifact/api_client.go b/service/codeartifact/api_client.go index dcef145296e..59b2ef1c7d2 100644 --- a/service/codeartifact/api_client.go +++ b/service/codeartifact/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codeartifact/api_op_AssociateExternalConnection.go b/service/codeartifact/api_op_AssociateExternalConnection.go index 00fc4666fb0..6b53ad8f27e 100644 --- a/service/codeartifact/api_op_AssociateExternalConnection.go +++ b/service/codeartifact/api_op_AssociateExternalConnection.go @@ -86,6 +86,9 @@ func addOperationAssociateExternalConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationAssociateExternalConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_CopyPackageVersions.go b/service/codeartifact/api_op_CopyPackageVersions.go index c1a88bb18e8..d7de2aadd9f 100644 --- a/service/codeartifact/api_op_CopyPackageVersions.go +++ b/service/codeartifact/api_op_CopyPackageVersions.go @@ -141,6 +141,9 @@ func addOperationCopyPackageVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationCopyPackageVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_CreateDomain.go b/service/codeartifact/api_op_CreateDomain.go index d4d9ba91151..8f543d8fdc2 100644 --- a/service/codeartifact/api_op_CreateDomain.go +++ b/service/codeartifact/api_op_CreateDomain.go @@ -82,6 +82,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_CreateRepository.go b/service/codeartifact/api_op_CreateRepository.go index d930fed5c4a..d666b55d374 100644 --- a/service/codeartifact/api_op_CreateRepository.go +++ b/service/codeartifact/api_op_CreateRepository.go @@ -75,6 +75,9 @@ func addOperationCreateRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DeleteDomain.go b/service/codeartifact/api_op_DeleteDomain.go index 86bd521b230..30e8c8806fb 100644 --- a/service/codeartifact/api_op_DeleteDomain.go +++ b/service/codeartifact/api_op_DeleteDomain.go @@ -58,6 +58,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go b/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go index 4f827e00645..80275c33fa0 100644 --- a/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go +++ b/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go @@ -62,6 +62,9 @@ func addOperationDeleteDomainPermissionsPolicyMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteDomainPermissionsPolicyMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DeletePackageVersions.go b/service/codeartifact/api_op_DeletePackageVersions.go index 7b6e2f369f7..ad2c76099f7 100644 --- a/service/codeartifact/api_op_DeletePackageVersions.go +++ b/service/codeartifact/api_op_DeletePackageVersions.go @@ -135,6 +135,9 @@ func addOperationDeletePackageVersionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationDeletePackageVersionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DeleteRepository.go b/service/codeartifact/api_op_DeleteRepository.go index e4120b5c2b6..4daab175843 100644 --- a/service/codeartifact/api_op_DeleteRepository.go +++ b/service/codeartifact/api_op_DeleteRepository.go @@ -62,6 +62,9 @@ func addOperationDeleteRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go b/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go index a57abc2cc46..ed7214008e4 100644 --- a/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go +++ b/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go @@ -74,6 +74,9 @@ func addOperationDeleteRepositoryPermissionsPolicyMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDeleteRepositoryPermissionsPolicyMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DescribeDomain.go b/service/codeartifact/api_op_DescribeDomain.go index af2d73360f7..7cbad976c62 100644 --- a/service/codeartifact/api_op_DescribeDomain.go +++ b/service/codeartifact/api_op_DescribeDomain.go @@ -60,6 +60,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DescribePackageVersion.go b/service/codeartifact/api_op_DescribePackageVersion.go index 75e55b2916c..98061ecd031 100644 --- a/service/codeartifact/api_op_DescribePackageVersion.go +++ b/service/codeartifact/api_op_DescribePackageVersion.go @@ -104,6 +104,9 @@ func addOperationDescribePackageVersionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDescribePackageVersionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DescribeRepository.go b/service/codeartifact/api_op_DescribeRepository.go index 949732d4ca2..8dea860c9b1 100644 --- a/service/codeartifact/api_op_DescribeRepository.go +++ b/service/codeartifact/api_op_DescribeRepository.go @@ -64,6 +64,9 @@ func addOperationDescribeRepositoryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeRepositoryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DisassociateExternalConnection.go b/service/codeartifact/api_op_DisassociateExternalConnection.go index d2143128adc..e76d41543a3 100644 --- a/service/codeartifact/api_op_DisassociateExternalConnection.go +++ b/service/codeartifact/api_op_DisassociateExternalConnection.go @@ -68,6 +68,9 @@ func addOperationDisassociateExternalConnectionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDisassociateExternalConnectionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_DisposePackageVersions.go b/service/codeartifact/api_op_DisposePackageVersions.go index b7499adec63..f69010cdf77 100644 --- a/service/codeartifact/api_op_DisposePackageVersions.go +++ b/service/codeartifact/api_op_DisposePackageVersions.go @@ -142,6 +142,9 @@ func addOperationDisposePackageVersionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -184,6 +187,9 @@ func addOperationDisposePackageVersionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_GetAuthorizationToken.go b/service/codeartifact/api_op_GetAuthorizationToken.go index 0c622a9eb4d..5400451a6c5 100644 --- a/service/codeartifact/api_op_GetAuthorizationToken.go +++ b/service/codeartifact/api_op_GetAuthorizationToken.go @@ -83,6 +83,9 @@ func addOperationGetAuthorizationTokenMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetAuthorizationTokenMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_GetDomainPermissionsPolicy.go b/service/codeartifact/api_op_GetDomainPermissionsPolicy.go index 99be73e13e9..43a718a66bb 100644 --- a/service/codeartifact/api_op_GetDomainPermissionsPolicy.go +++ b/service/codeartifact/api_op_GetDomainPermissionsPolicy.go @@ -61,6 +61,9 @@ func addOperationGetDomainPermissionsPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetDomainPermissionsPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_GetPackageVersionAsset.go b/service/codeartifact/api_op_GetPackageVersionAsset.go index 1c4b95e1941..b2bfc039f93 100644 --- a/service/codeartifact/api_op_GetPackageVersionAsset.go +++ b/service/codeartifact/api_op_GetPackageVersionAsset.go @@ -118,6 +118,9 @@ func addOperationGetPackageVersionAssetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationGetPackageVersionAssetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_GetPackageVersionReadme.go b/service/codeartifact/api_op_GetPackageVersionReadme.go index caecadf83db..62b0aad9b77 100644 --- a/service/codeartifact/api_op_GetPackageVersionReadme.go +++ b/service/codeartifact/api_op_GetPackageVersionReadme.go @@ -134,6 +134,9 @@ func addOperationGetPackageVersionReadmeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationGetPackageVersionReadmeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_GetRepositoryEndpoint.go b/service/codeartifact/api_op_GetRepositoryEndpoint.go index 3502f94b1f3..3f412520f54 100644 --- a/service/codeartifact/api_op_GetRepositoryEndpoint.go +++ b/service/codeartifact/api_op_GetRepositoryEndpoint.go @@ -81,6 +81,9 @@ func addOperationGetRepositoryEndpointMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetRepositoryEndpointMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go b/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go index ac1573bcba2..84b56501459 100644 --- a/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go +++ b/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go @@ -63,6 +63,9 @@ func addOperationGetRepositoryPermissionsPolicyMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetRepositoryPermissionsPolicyMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListDomains.go b/service/codeartifact/api_op_ListDomains.go index ef6f3cf5410..f44339c9da9 100644 --- a/service/codeartifact/api_op_ListDomains.go +++ b/service/codeartifact/api_op_ListDomains.go @@ -64,6 +64,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListPackageVersionAssets.go b/service/codeartifact/api_op_ListPackageVersionAssets.go index 4168ece8285..6876d62486a 100644 --- a/service/codeartifact/api_op_ListPackageVersionAssets.go +++ b/service/codeartifact/api_op_ListPackageVersionAssets.go @@ -140,6 +140,9 @@ func addOperationListPackageVersionAssetsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationListPackageVersionAssetsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListPackageVersionDependencies.go b/service/codeartifact/api_op_ListPackageVersionDependencies.go index caebe6729db..ff4ff2874ad 100644 --- a/service/codeartifact/api_op_ListPackageVersionDependencies.go +++ b/service/codeartifact/api_op_ListPackageVersionDependencies.go @@ -149,6 +149,9 @@ func addOperationListPackageVersionDependenciesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationListPackageVersionDependenciesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListPackageVersions.go b/service/codeartifact/api_op_ListPackageVersions.go index 71d0d449e1a..3ef32085749 100644 --- a/service/codeartifact/api_op_ListPackageVersions.go +++ b/service/codeartifact/api_op_ListPackageVersions.go @@ -163,6 +163,9 @@ func addOperationListPackageVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -205,6 +208,9 @@ func addOperationListPackageVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListPackages.go b/service/codeartifact/api_op_ListPackages.go index 3ec8091ad43..518f71c2acf 100644 --- a/service/codeartifact/api_op_ListPackages.go +++ b/service/codeartifact/api_op_ListPackages.go @@ -106,6 +106,9 @@ func addOperationListPackagesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationListPackagesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListRepositories.go b/service/codeartifact/api_op_ListRepositories.go index 506f21b6adc..45c836438aa 100644 --- a/service/codeartifact/api_op_ListRepositories.go +++ b/service/codeartifact/api_op_ListRepositories.go @@ -67,6 +67,9 @@ func addOperationListRepositoriesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListRepositoriesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListRepositoriesInDomain.go b/service/codeartifact/api_op_ListRepositoriesInDomain.go index 3074d092c64..bdb8e91342b 100644 --- a/service/codeartifact/api_op_ListRepositoriesInDomain.go +++ b/service/codeartifact/api_op_ListRepositoriesInDomain.go @@ -78,6 +78,9 @@ func addOperationListRepositoriesInDomainMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListRepositoriesInDomainMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_ListTagsForResource.go b/service/codeartifact/api_op_ListTagsForResource.go index 86685e61563..75946b5d0d8 100644 --- a/service/codeartifact/api_op_ListTagsForResource.go +++ b/service/codeartifact/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_PutDomainPermissionsPolicy.go b/service/codeartifact/api_op_PutDomainPermissionsPolicy.go index 049937c5dcd..d36655460bd 100644 --- a/service/codeartifact/api_op_PutDomainPermissionsPolicy.go +++ b/service/codeartifact/api_op_PutDomainPermissionsPolicy.go @@ -72,6 +72,9 @@ func addOperationPutDomainPermissionsPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutDomainPermissionsPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go b/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go index d11eaa87cbb..da271d46f97 100644 --- a/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go +++ b/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go @@ -77,6 +77,9 @@ func addOperationPutRepositoryPermissionsPolicyMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationPutRepositoryPermissionsPolicyMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_TagResource.go b/service/codeartifact/api_op_TagResource.go index 5e9b6fcf8cf..062a2257fa5 100644 --- a/service/codeartifact/api_op_TagResource.go +++ b/service/codeartifact/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_UntagResource.go b/service/codeartifact/api_op_UntagResource.go index fdea5d68162..880eedabbc9 100644 --- a/service/codeartifact/api_op_UntagResource.go +++ b/service/codeartifact/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_UpdatePackageVersionsStatus.go b/service/codeartifact/api_op_UpdatePackageVersionsStatus.go index 34586d65eee..c5eef5135fa 100644 --- a/service/codeartifact/api_op_UpdatePackageVersionsStatus.go +++ b/service/codeartifact/api_op_UpdatePackageVersionsStatus.go @@ -120,6 +120,9 @@ func addOperationUpdatePackageVersionsStatusMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationUpdatePackageVersionsStatusMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/api_op_UpdateRepository.go b/service/codeartifact/api_op_UpdateRepository.go index e3fc01d4105..fd4e232613c 100644 --- a/service/codeartifact/api_op_UpdateRepository.go +++ b/service/codeartifact/api_op_UpdateRepository.go @@ -72,6 +72,9 @@ func addOperationUpdateRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeartifact/go.mod b/service/codeartifact/go.mod index 35cb835dd6f..e5c43b189c8 100644 --- a/service/codeartifact/go.mod +++ b/service/codeartifact/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codeartifact go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codeartifact/go.sum b/service/codeartifact/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codeartifact/go.sum +++ b/service/codeartifact/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codebuild/api_client.go b/service/codebuild/api_client.go index fa817623245..3e34e174abc 100644 --- a/service/codebuild/api_client.go +++ b/service/codebuild/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codebuild/api_op_BatchDeleteBuilds.go b/service/codebuild/api_op_BatchDeleteBuilds.go index b1d35643e0c..c475460d406 100644 --- a/service/codebuild/api_op_BatchDeleteBuilds.go +++ b/service/codebuild/api_op_BatchDeleteBuilds.go @@ -56,6 +56,9 @@ func addOperationBatchDeleteBuildsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchDeleteBuildsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_BatchGetBuildBatches.go b/service/codebuild/api_op_BatchGetBuildBatches.go index eeee9fbc6bb..08e98f0bd55 100644 --- a/service/codebuild/api_op_BatchGetBuildBatches.go +++ b/service/codebuild/api_op_BatchGetBuildBatches.go @@ -56,6 +56,9 @@ func addOperationBatchGetBuildBatchesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchGetBuildBatchesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_BatchGetBuilds.go b/service/codebuild/api_op_BatchGetBuilds.go index 4900da17608..1085f9808dd 100644 --- a/service/codebuild/api_op_BatchGetBuilds.go +++ b/service/codebuild/api_op_BatchGetBuilds.go @@ -56,6 +56,9 @@ func addOperationBatchGetBuildsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchGetBuildsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_BatchGetProjects.go b/service/codebuild/api_op_BatchGetProjects.go index 80f4288c81e..43097aff9ba 100644 --- a/service/codebuild/api_op_BatchGetProjects.go +++ b/service/codebuild/api_op_BatchGetProjects.go @@ -58,6 +58,9 @@ func addOperationBatchGetProjectsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationBatchGetProjectsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_BatchGetReportGroups.go b/service/codebuild/api_op_BatchGetReportGroups.go index 7643f28e0b5..b333d61d30f 100644 --- a/service/codebuild/api_op_BatchGetReportGroups.go +++ b/service/codebuild/api_op_BatchGetReportGroups.go @@ -57,6 +57,9 @@ func addOperationBatchGetReportGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchGetReportGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_BatchGetReports.go b/service/codebuild/api_op_BatchGetReports.go index 60ab2c823cd..f7e687f1327 100644 --- a/service/codebuild/api_op_BatchGetReports.go +++ b/service/codebuild/api_op_BatchGetReports.go @@ -57,6 +57,9 @@ func addOperationBatchGetReportsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchGetReportsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_CreateProject.go b/service/codebuild/api_op_CreateProject.go index 2f24a5634fd..1199e0a86de 100644 --- a/service/codebuild/api_op_CreateProject.go +++ b/service/codebuild/api_op_CreateProject.go @@ -162,6 +162,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_CreateReportGroup.go b/service/codebuild/api_op_CreateReportGroup.go index 50a89117b38..4572c2e7e17 100644 --- a/service/codebuild/api_op_CreateReportGroup.go +++ b/service/codebuild/api_op_CreateReportGroup.go @@ -69,6 +69,9 @@ func addOperationCreateReportGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateReportGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_CreateWebhook.go b/service/codebuild/api_op_CreateWebhook.go index 02c4f15c6d7..34d218caf41 100644 --- a/service/codebuild/api_op_CreateWebhook.go +++ b/service/codebuild/api_op_CreateWebhook.go @@ -79,6 +79,9 @@ func addOperationCreateWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteBuildBatch.go b/service/codebuild/api_op_DeleteBuildBatch.go index 9c4cfcd05de..7d7faeffc3b 100644 --- a/service/codebuild/api_op_DeleteBuildBatch.go +++ b/service/codebuild/api_op_DeleteBuildBatch.go @@ -61,6 +61,9 @@ func addOperationDeleteBuildBatchMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteBuildBatchMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteProject.go b/service/codebuild/api_op_DeleteProject.go index abbc9221450..3b8ea4abf56 100644 --- a/service/codebuild/api_op_DeleteProject.go +++ b/service/codebuild/api_op_DeleteProject.go @@ -48,6 +48,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteReport.go b/service/codebuild/api_op_DeleteReport.go index 7fc804e9055..c37a66a8840 100644 --- a/service/codebuild/api_op_DeleteReport.go +++ b/service/codebuild/api_op_DeleteReport.go @@ -48,6 +48,9 @@ func addOperationDeleteReportMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteReportMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteReportGroup.go b/service/codebuild/api_op_DeleteReportGroup.go index 88ba1aae5cb..1d0713896ff 100644 --- a/service/codebuild/api_op_DeleteReportGroup.go +++ b/service/codebuild/api_op_DeleteReportGroup.go @@ -59,6 +59,9 @@ func addOperationDeleteReportGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteReportGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteResourcePolicy.go b/service/codebuild/api_op_DeleteResourcePolicy.go index a1b31fe9d11..d38a55fc7ef 100644 --- a/service/codebuild/api_op_DeleteResourcePolicy.go +++ b/service/codebuild/api_op_DeleteResourcePolicy.go @@ -48,6 +48,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteSourceCredentials.go b/service/codebuild/api_op_DeleteSourceCredentials.go index 73da5c67a77..4f374972698 100644 --- a/service/codebuild/api_op_DeleteSourceCredentials.go +++ b/service/codebuild/api_op_DeleteSourceCredentials.go @@ -52,6 +52,9 @@ func addOperationDeleteSourceCredentialsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteSourceCredentialsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DeleteWebhook.go b/service/codebuild/api_op_DeleteWebhook.go index 5334741bf4c..996387cb37c 100644 --- a/service/codebuild/api_op_DeleteWebhook.go +++ b/service/codebuild/api_op_DeleteWebhook.go @@ -50,6 +50,9 @@ func addOperationDeleteWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DescribeCodeCoverages.go b/service/codebuild/api_op_DescribeCodeCoverages.go index 836f53acea2..623c49801bd 100644 --- a/service/codebuild/api_op_DescribeCodeCoverages.go +++ b/service/codebuild/api_op_DescribeCodeCoverages.go @@ -79,6 +79,9 @@ func addOperationDescribeCodeCoveragesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeCodeCoveragesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_DescribeTestCases.go b/service/codebuild/api_op_DescribeTestCases.go index 7ca1236dcab..f10f7208927 100644 --- a/service/codebuild/api_op_DescribeTestCases.go +++ b/service/codebuild/api_op_DescribeTestCases.go @@ -77,6 +77,9 @@ func addOperationDescribeTestCasesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeTestCasesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_GetResourcePolicy.go b/service/codebuild/api_op_GetResourcePolicy.go index 620a0448634..9bd4d97675d 100644 --- a/service/codebuild/api_op_GetResourcePolicy.go +++ b/service/codebuild/api_op_GetResourcePolicy.go @@ -52,6 +52,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ImportSourceCredentials.go b/service/codebuild/api_op_ImportSourceCredentials.go index 6d0b06a38b6..a32bfbf951c 100644 --- a/service/codebuild/api_op_ImportSourceCredentials.go +++ b/service/codebuild/api_op_ImportSourceCredentials.go @@ -75,6 +75,9 @@ func addOperationImportSourceCredentialsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationImportSourceCredentialsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_InvalidateProjectCache.go b/service/codebuild/api_op_InvalidateProjectCache.go index 686b1523c76..23847a21ecd 100644 --- a/service/codebuild/api_op_InvalidateProjectCache.go +++ b/service/codebuild/api_op_InvalidateProjectCache.go @@ -48,6 +48,9 @@ func addOperationInvalidateProjectCacheMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationInvalidateProjectCacheMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListBuildBatches.go b/service/codebuild/api_op_ListBuildBatches.go index 5ec8774bff2..bc6bb11211d 100644 --- a/service/codebuild/api_op_ListBuildBatches.go +++ b/service/codebuild/api_op_ListBuildBatches.go @@ -72,6 +72,9 @@ func addOperationListBuildBatchesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListBuildBatchesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListBuildBatchesForProject.go b/service/codebuild/api_op_ListBuildBatchesForProject.go index dde157beac4..596ceb1f6c4 100644 --- a/service/codebuild/api_op_ListBuildBatchesForProject.go +++ b/service/codebuild/api_op_ListBuildBatchesForProject.go @@ -75,6 +75,9 @@ func addOperationListBuildBatchesForProjectMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListBuildBatchesForProjectMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListBuilds.go b/service/codebuild/api_op_ListBuilds.go index 5e3b6afc8b4..445b988c6bd 100644 --- a/service/codebuild/api_op_ListBuilds.go +++ b/service/codebuild/api_op_ListBuilds.go @@ -71,6 +71,9 @@ func addOperationListBuildsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListBuildsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListBuildsForProject.go b/service/codebuild/api_op_ListBuildsForProject.go index a2a67888ba0..9d53415f380 100644 --- a/service/codebuild/api_op_ListBuildsForProject.go +++ b/service/codebuild/api_op_ListBuildsForProject.go @@ -78,6 +78,9 @@ func addOperationListBuildsForProjectMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListBuildsForProjectMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListCuratedEnvironmentImages.go b/service/codebuild/api_op_ListCuratedEnvironmentImages.go index 5e8a1f24cf8..7c741ae9646 100644 --- a/service/codebuild/api_op_ListCuratedEnvironmentImages.go +++ b/service/codebuild/api_op_ListCuratedEnvironmentImages.go @@ -49,6 +49,9 @@ func addOperationListCuratedEnvironmentImagesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationListCuratedEnvironmentImagesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListProjects.go b/service/codebuild/api_op_ListProjects.go index 2f7add0f93e..48e6fa9b2d7 100644 --- a/service/codebuild/api_op_ListProjects.go +++ b/service/codebuild/api_op_ListProjects.go @@ -91,6 +91,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListReportGroups.go b/service/codebuild/api_op_ListReportGroups.go index bbc01045d96..b270af92180 100644 --- a/service/codebuild/api_op_ListReportGroups.go +++ b/service/codebuild/api_op_ListReportGroups.go @@ -85,6 +85,9 @@ func addOperationListReportGroupsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListReportGroupsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListReports.go b/service/codebuild/api_op_ListReports.go index bb196111716..0a526e7ca4a 100644 --- a/service/codebuild/api_op_ListReports.go +++ b/service/codebuild/api_op_ListReports.go @@ -81,6 +81,9 @@ func addOperationListReportsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListReportsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListReportsForReportGroup.go b/service/codebuild/api_op_ListReportsForReportGroup.go index 7c418e640cb..d8622dc2819 100644 --- a/service/codebuild/api_op_ListReportsForReportGroup.go +++ b/service/codebuild/api_op_ListReportsForReportGroup.go @@ -81,6 +81,9 @@ func addOperationListReportsForReportGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListReportsForReportGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListSharedProjects.go b/service/codebuild/api_op_ListSharedProjects.go index 5df1c125da8..a2750884314 100644 --- a/service/codebuild/api_op_ListSharedProjects.go +++ b/service/codebuild/api_op_ListSharedProjects.go @@ -88,6 +88,9 @@ func addOperationListSharedProjectsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListSharedProjectsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListSharedReportGroups.go b/service/codebuild/api_op_ListSharedReportGroups.go index b7a8331fc68..7f2dbf4c50c 100644 --- a/service/codebuild/api_op_ListSharedReportGroups.go +++ b/service/codebuild/api_op_ListSharedReportGroups.go @@ -88,6 +88,9 @@ func addOperationListSharedReportGroupsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListSharedReportGroupsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_ListSourceCredentials.go b/service/codebuild/api_op_ListSourceCredentials.go index 472b30ec6a5..2fb3aefa1b7 100644 --- a/service/codebuild/api_op_ListSourceCredentials.go +++ b/service/codebuild/api_op_ListSourceCredentials.go @@ -50,6 +50,9 @@ func addOperationListSourceCredentialsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationListSourceCredentialsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_PutResourcePolicy.go b/service/codebuild/api_op_PutResourcePolicy.go index 670ab0de336..85ea3bd51d4 100644 --- a/service/codebuild/api_op_PutResourcePolicy.go +++ b/service/codebuild/api_op_PutResourcePolicy.go @@ -63,6 +63,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_RetryBuild.go b/service/codebuild/api_op_RetryBuild.go index 856887b3bab..3b2aafbd784 100644 --- a/service/codebuild/api_op_RetryBuild.go +++ b/service/codebuild/api_op_RetryBuild.go @@ -57,6 +57,9 @@ func addOperationRetryBuildMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationRetryBuildMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_RetryBuildBatch.go b/service/codebuild/api_op_RetryBuildBatch.go index bdae750b4c4..16224f7a8a1 100644 --- a/service/codebuild/api_op_RetryBuildBatch.go +++ b/service/codebuild/api_op_RetryBuildBatch.go @@ -61,6 +61,9 @@ func addOperationRetryBuildBatchMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRetryBuildBatchMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_StartBuild.go b/service/codebuild/api_op_StartBuild.go index 29193a74954..b0444ed8336 100644 --- a/service/codebuild/api_op_StartBuild.go +++ b/service/codebuild/api_op_StartBuild.go @@ -210,6 +210,9 @@ func addOperationStartBuildMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -252,6 +255,9 @@ func addOperationStartBuildMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_StartBuildBatch.go b/service/codebuild/api_op_StartBuildBatch.go index 91891d29496..308a120d78c 100644 --- a/service/codebuild/api_op_StartBuildBatch.go +++ b/service/codebuild/api_op_StartBuildBatch.go @@ -207,6 +207,9 @@ func addOperationStartBuildBatchMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -249,6 +252,9 @@ func addOperationStartBuildBatchMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_StopBuild.go b/service/codebuild/api_op_StopBuild.go index 02708d4bbe9..4afec26827b 100644 --- a/service/codebuild/api_op_StopBuild.go +++ b/service/codebuild/api_op_StopBuild.go @@ -53,6 +53,9 @@ func addOperationStopBuildMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopBuildMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_StopBuildBatch.go b/service/codebuild/api_op_StopBuildBatch.go index 279afa6966f..4067a7d9765 100644 --- a/service/codebuild/api_op_StopBuildBatch.go +++ b/service/codebuild/api_op_StopBuildBatch.go @@ -53,6 +53,9 @@ func addOperationStopBuildBatchMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopBuildBatchMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_UpdateProject.go b/service/codebuild/api_op_UpdateProject.go index 47dde11caed..11bfaf50540 100644 --- a/service/codebuild/api_op_UpdateProject.go +++ b/service/codebuild/api_op_UpdateProject.go @@ -155,6 +155,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -197,6 +200,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_UpdateReportGroup.go b/service/codebuild/api_op_UpdateReportGroup.go index 92cf594c253..22c7bc95004 100644 --- a/service/codebuild/api_op_UpdateReportGroup.go +++ b/service/codebuild/api_op_UpdateReportGroup.go @@ -67,6 +67,9 @@ func addOperationUpdateReportGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateReportGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/api_op_UpdateWebhook.go b/service/codebuild/api_op_UpdateWebhook.go index 8c5fa3c753e..b297e6dad20 100644 --- a/service/codebuild/api_op_UpdateWebhook.go +++ b/service/codebuild/api_op_UpdateWebhook.go @@ -74,6 +74,9 @@ func addOperationUpdateWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codebuild/go.mod b/service/codebuild/go.mod index f44061cf970..fdef3a83018 100644 --- a/service/codebuild/go.mod +++ b/service/codebuild/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codebuild go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codebuild/go.sum b/service/codebuild/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codebuild/go.sum +++ b/service/codebuild/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codecommit/api_client.go b/service/codecommit/api_client.go index 87600ec17ee..e199ab9a32c 100644 --- a/service/codecommit/api_client.go +++ b/service/codecommit/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go b/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go index 569b292222a..7b59ad553c7 100644 --- a/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go +++ b/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go @@ -59,6 +59,9 @@ func addOperationAssociateApprovalRuleTemplateWithRepositoryMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAssociateApprovalRuleTemplateWithRepositoryMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go b/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go index e76364ff3bb..2f268b9aa88 100644 --- a/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go +++ b/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go @@ -69,6 +69,9 @@ func addOperationBatchAssociateApprovalRuleTemplateWithRepositoriesMiddlewares(s if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationBatchAssociateApprovalRuleTemplateWithRepositoriesMiddlewares(s if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_BatchDescribeMergeConflicts.go b/service/codecommit/api_op_BatchDescribeMergeConflicts.go index 6bc494e830e..39dede46973 100644 --- a/service/codecommit/api_op_BatchDescribeMergeConflicts.go +++ b/service/codecommit/api_op_BatchDescribeMergeConflicts.go @@ -123,6 +123,9 @@ func addOperationBatchDescribeMergeConflictsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationBatchDescribeMergeConflictsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go b/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go index de662bac5da..41fee474918 100644 --- a/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go +++ b/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go @@ -71,6 +71,9 @@ func addOperationBatchDisassociateApprovalRuleTemplateFromRepositoriesMiddleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchDisassociateApprovalRuleTemplateFromRepositoriesMiddleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_BatchGetCommits.go b/service/codecommit/api_op_BatchGetCommits.go index dcd8e5e4b31..c46e746b6cd 100644 --- a/service/codecommit/api_op_BatchGetCommits.go +++ b/service/codecommit/api_op_BatchGetCommits.go @@ -65,6 +65,9 @@ func addOperationBatchGetCommitsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationBatchGetCommitsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_BatchGetRepositories.go b/service/codecommit/api_op_BatchGetRepositories.go index 8582c52ee6d..2480cc2e2d1 100644 --- a/service/codecommit/api_op_BatchGetRepositories.go +++ b/service/codecommit/api_op_BatchGetRepositories.go @@ -64,6 +64,9 @@ func addOperationBatchGetRepositoriesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchGetRepositoriesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreateApprovalRuleTemplate.go b/service/codecommit/api_op_CreateApprovalRuleTemplate.go index 00b26b1807e..5d0356802f8 100644 --- a/service/codecommit/api_op_CreateApprovalRuleTemplate.go +++ b/service/codecommit/api_op_CreateApprovalRuleTemplate.go @@ -104,6 +104,9 @@ func addOperationCreateApprovalRuleTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateApprovalRuleTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreateBranch.go b/service/codecommit/api_op_CreateBranch.go index c4348db10c1..ddef3887cf9 100644 --- a/service/codecommit/api_op_CreateBranch.go +++ b/service/codecommit/api_op_CreateBranch.go @@ -61,6 +61,9 @@ func addOperationCreateBranchMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateBranchMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreateCommit.go b/service/codecommit/api_op_CreateCommit.go index 80a0e72cd59..2c32de1f0e2 100644 --- a/service/codecommit/api_op_CreateCommit.go +++ b/service/codecommit/api_op_CreateCommit.go @@ -100,6 +100,9 @@ func addOperationCreateCommitMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationCreateCommitMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreatePullRequest.go b/service/codecommit/api_op_CreatePullRequest.go index 1a4ba223e53..91b912928f9 100644 --- a/service/codecommit/api_op_CreatePullRequest.go +++ b/service/codecommit/api_op_CreatePullRequest.go @@ -76,6 +76,9 @@ func addOperationCreatePullRequestMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreatePullRequestMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreatePullRequestApprovalRule.go b/service/codecommit/api_op_CreatePullRequestApprovalRule.go index c152e06e59c..6d14b4a26e8 100644 --- a/service/codecommit/api_op_CreatePullRequestApprovalRule.go +++ b/service/codecommit/api_op_CreatePullRequestApprovalRule.go @@ -99,6 +99,9 @@ func addOperationCreatePullRequestApprovalRuleMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreatePullRequestApprovalRuleMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreateRepository.go b/service/codecommit/api_op_CreateRepository.go index 3a5f09561fd..3f41f4a2361 100644 --- a/service/codecommit/api_op_CreateRepository.go +++ b/service/codecommit/api_op_CreateRepository.go @@ -71,6 +71,9 @@ func addOperationCreateRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_CreateUnreferencedMergeCommit.go b/service/codecommit/api_op_CreateUnreferencedMergeCommit.go index 5a21eee24b7..985a968a2a9 100644 --- a/service/codecommit/api_op_CreateUnreferencedMergeCommit.go +++ b/service/codecommit/api_op_CreateUnreferencedMergeCommit.go @@ -112,6 +112,9 @@ func addOperationCreateUnreferencedMergeCommitMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationCreateUnreferencedMergeCommitMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DeleteApprovalRuleTemplate.go b/service/codecommit/api_op_DeleteApprovalRuleTemplate.go index 3b9c1c826a2..80ac613840a 100644 --- a/service/codecommit/api_op_DeleteApprovalRuleTemplate.go +++ b/service/codecommit/api_op_DeleteApprovalRuleTemplate.go @@ -56,6 +56,9 @@ func addOperationDeleteApprovalRuleTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteApprovalRuleTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DeleteBranch.go b/service/codecommit/api_op_DeleteBranch.go index 3078a443d87..b0df3f4b110 100644 --- a/service/codecommit/api_op_DeleteBranch.go +++ b/service/codecommit/api_op_DeleteBranch.go @@ -62,6 +62,9 @@ func addOperationDeleteBranchMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteBranchMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DeleteCommentContent.go b/service/codecommit/api_op_DeleteCommentContent.go index 8cdc7c4b166..94d470c411d 100644 --- a/service/codecommit/api_op_DeleteCommentContent.go +++ b/service/codecommit/api_op_DeleteCommentContent.go @@ -55,6 +55,9 @@ func addOperationDeleteCommentContentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteCommentContentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DeleteFile.go b/service/codecommit/api_op_DeleteFile.go index a81ad8ef4fb..5928d081ad2 100644 --- a/service/codecommit/api_op_DeleteFile.go +++ b/service/codecommit/api_op_DeleteFile.go @@ -113,6 +113,9 @@ func addOperationDeleteFileMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationDeleteFileMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DeletePullRequestApprovalRule.go b/service/codecommit/api_op_DeletePullRequestApprovalRule.go index 73fa89d519c..9a06d0249fa 100644 --- a/service/codecommit/api_op_DeletePullRequestApprovalRule.go +++ b/service/codecommit/api_op_DeletePullRequestApprovalRule.go @@ -66,6 +66,9 @@ func addOperationDeletePullRequestApprovalRuleMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeletePullRequestApprovalRuleMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DeleteRepository.go b/service/codecommit/api_op_DeleteRepository.go index 6e4c3b1c973..d09f7fe979d 100644 --- a/service/codecommit/api_op_DeleteRepository.go +++ b/service/codecommit/api_op_DeleteRepository.go @@ -57,6 +57,9 @@ func addOperationDeleteRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DescribeMergeConflicts.go b/service/codecommit/api_op_DescribeMergeConflicts.go index cdd421b5d50..ebdb1bb2218 100644 --- a/service/codecommit/api_op_DescribeMergeConflicts.go +++ b/service/codecommit/api_op_DescribeMergeConflicts.go @@ -124,6 +124,9 @@ func addOperationDescribeMergeConflictsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationDescribeMergeConflictsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DescribePullRequestEvents.go b/service/codecommit/api_op_DescribePullRequestEvents.go index ab73b7d7015..75435d3db81 100644 --- a/service/codecommit/api_op_DescribePullRequestEvents.go +++ b/service/codecommit/api_op_DescribePullRequestEvents.go @@ -78,6 +78,9 @@ func addOperationDescribePullRequestEventsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribePullRequestEventsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go b/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go index 01c01dffe23..db2dd10aea9 100644 --- a/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go +++ b/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go @@ -57,6 +57,9 @@ func addOperationDisassociateApprovalRuleTemplateFromRepositoryMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDisassociateApprovalRuleTemplateFromRepositoryMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go b/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go index c79563b97cf..782649d8d07 100644 --- a/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go +++ b/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go @@ -65,6 +65,9 @@ func addOperationEvaluatePullRequestApprovalRulesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationEvaluatePullRequestApprovalRulesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetApprovalRuleTemplate.go b/service/codecommit/api_op_GetApprovalRuleTemplate.go index b7588a43342..0643028e193 100644 --- a/service/codecommit/api_op_GetApprovalRuleTemplate.go +++ b/service/codecommit/api_op_GetApprovalRuleTemplate.go @@ -55,6 +55,9 @@ func addOperationGetApprovalRuleTemplateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetApprovalRuleTemplateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetBlob.go b/service/codecommit/api_op_GetBlob.go index 22ee2aae8f0..9a6f7769063 100644 --- a/service/codecommit/api_op_GetBlob.go +++ b/service/codecommit/api_op_GetBlob.go @@ -61,6 +61,9 @@ func addOperationGetBlobMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetBlobMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetBranch.go b/service/codecommit/api_op_GetBranch.go index 57c1623f0fc..608d9335def 100644 --- a/service/codecommit/api_op_GetBranch.go +++ b/service/codecommit/api_op_GetBranch.go @@ -58,6 +58,9 @@ func addOperationGetBranchMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetBranchMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetComment.go b/service/codecommit/api_op_GetComment.go index d87863ef5ec..1ad441ba9bd 100644 --- a/service/codecommit/api_op_GetComment.go +++ b/service/codecommit/api_op_GetComment.go @@ -57,6 +57,9 @@ func addOperationGetCommentMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetCommentMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetCommentReactions.go b/service/codecommit/api_op_GetCommentReactions.go index 3cd3bc61e49..8ae1141f275 100644 --- a/service/codecommit/api_op_GetCommentReactions.go +++ b/service/codecommit/api_op_GetCommentReactions.go @@ -72,6 +72,9 @@ func addOperationGetCommentReactionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetCommentReactionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetCommentsForComparedCommit.go b/service/codecommit/api_op_GetCommentsForComparedCommit.go index c5ada1f837a..61b2547ce3e 100644 --- a/service/codecommit/api_op_GetCommentsForComparedCommit.go +++ b/service/codecommit/api_op_GetCommentsForComparedCommit.go @@ -78,6 +78,9 @@ func addOperationGetCommentsForComparedCommitMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetCommentsForComparedCommitMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetCommentsForPullRequest.go b/service/codecommit/api_op_GetCommentsForPullRequest.go index 5a24139e380..8abba7b1e39 100644 --- a/service/codecommit/api_op_GetCommentsForPullRequest.go +++ b/service/codecommit/api_op_GetCommentsForPullRequest.go @@ -80,6 +80,9 @@ func addOperationGetCommentsForPullRequestMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetCommentsForPullRequestMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetCommit.go b/service/codecommit/api_op_GetCommit.go index ef4ced5a921..fbc360fd567 100644 --- a/service/codecommit/api_op_GetCommit.go +++ b/service/codecommit/api_op_GetCommit.go @@ -63,6 +63,9 @@ func addOperationGetCommitMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetCommitMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetDifferences.go b/service/codecommit/api_op_GetDifferences.go index d8d0cf27e39..ba107230e91 100644 --- a/service/codecommit/api_op_GetDifferences.go +++ b/service/codecommit/api_op_GetDifferences.go @@ -90,6 +90,9 @@ func addOperationGetDifferencesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetDifferencesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetFile.go b/service/codecommit/api_op_GetFile.go index 135e514669d..2a0bab318ad 100644 --- a/service/codecommit/api_op_GetFile.go +++ b/service/codecommit/api_op_GetFile.go @@ -97,6 +97,9 @@ func addOperationGetFileMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetFileMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetFolder.go b/service/codecommit/api_op_GetFolder.go index db93ad5b072..389fadb612c 100644 --- a/service/codecommit/api_op_GetFolder.go +++ b/service/codecommit/api_op_GetFolder.go @@ -91,6 +91,9 @@ func addOperationGetFolderMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetFolderMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetMergeCommit.go b/service/codecommit/api_op_GetMergeCommit.go index f1138ab2913..cd0b1d50c22 100644 --- a/service/codecommit/api_op_GetMergeCommit.go +++ b/service/codecommit/api_op_GetMergeCommit.go @@ -91,6 +91,9 @@ func addOperationGetMergeCommitMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetMergeCommitMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetMergeConflicts.go b/service/codecommit/api_op_GetMergeConflicts.go index eb8c2b3f1ec..89578e9153e 100644 --- a/service/codecommit/api_op_GetMergeConflicts.go +++ b/service/codecommit/api_op_GetMergeConflicts.go @@ -118,6 +118,9 @@ func addOperationGetMergeConflictsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetMergeConflictsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetMergeOptions.go b/service/codecommit/api_op_GetMergeOptions.go index d072db9de3a..d071ce32ad8 100644 --- a/service/codecommit/api_op_GetMergeOptions.go +++ b/service/codecommit/api_op_GetMergeOptions.go @@ -99,6 +99,9 @@ func addOperationGetMergeOptionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationGetMergeOptionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetPullRequest.go b/service/codecommit/api_op_GetPullRequest.go index 6eaf1269398..9c12f89398b 100644 --- a/service/codecommit/api_op_GetPullRequest.go +++ b/service/codecommit/api_op_GetPullRequest.go @@ -56,6 +56,9 @@ func addOperationGetPullRequestMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetPullRequestMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetPullRequestApprovalStates.go b/service/codecommit/api_op_GetPullRequestApprovalStates.go index 0b254946803..1a5ed3025a4 100644 --- a/service/codecommit/api_op_GetPullRequestApprovalStates.go +++ b/service/codecommit/api_op_GetPullRequestApprovalStates.go @@ -60,6 +60,9 @@ func addOperationGetPullRequestApprovalStatesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetPullRequestApprovalStatesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetPullRequestOverrideState.go b/service/codecommit/api_op_GetPullRequestOverrideState.go index d0933c2e9c3..2ec2e0ea778 100644 --- a/service/codecommit/api_op_GetPullRequestOverrideState.go +++ b/service/codecommit/api_op_GetPullRequestOverrideState.go @@ -67,6 +67,9 @@ func addOperationGetPullRequestOverrideStateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetPullRequestOverrideStateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetRepository.go b/service/codecommit/api_op_GetRepository.go index 0b9666ab076..46033d347ce 100644 --- a/service/codecommit/api_op_GetRepository.go +++ b/service/codecommit/api_op_GetRepository.go @@ -60,6 +60,9 @@ func addOperationGetRepositoryMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetRepositoryMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_GetRepositoryTriggers.go b/service/codecommit/api_op_GetRepositoryTriggers.go index 032427a9157..182c87e8c58 100644 --- a/service/codecommit/api_op_GetRepositoryTriggers.go +++ b/service/codecommit/api_op_GetRepositoryTriggers.go @@ -58,6 +58,9 @@ func addOperationGetRepositoryTriggersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetRepositoryTriggersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListApprovalRuleTemplates.go b/service/codecommit/api_op_ListApprovalRuleTemplates.go index 52b8d468e25..59db6a5e929 100644 --- a/service/codecommit/api_op_ListApprovalRuleTemplates.go +++ b/service/codecommit/api_op_ListApprovalRuleTemplates.go @@ -61,6 +61,9 @@ func addOperationListApprovalRuleTemplatesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListApprovalRuleTemplatesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go b/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go index 836e440a63c..b5bb2da7024 100644 --- a/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go +++ b/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go @@ -65,6 +65,9 @@ func addOperationListAssociatedApprovalRuleTemplatesForRepositoryMiddlewares(sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAssociatedApprovalRuleTemplatesForRepositoryMiddlewares(sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListBranches.go b/service/codecommit/api_op_ListBranches.go index 333dc2cea1b..c4fd7253ecf 100644 --- a/service/codecommit/api_op_ListBranches.go +++ b/service/codecommit/api_op_ListBranches.go @@ -60,6 +60,9 @@ func addOperationListBranchesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListBranchesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListPullRequests.go b/service/codecommit/api_op_ListPullRequests.go index 1354a608e90..b598f142027 100644 --- a/service/codecommit/api_op_ListPullRequests.go +++ b/service/codecommit/api_op_ListPullRequests.go @@ -76,6 +76,9 @@ func addOperationListPullRequestsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListPullRequestsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListRepositories.go b/service/codecommit/api_op_ListRepositories.go index e98243a640e..a6d9f2a0508 100644 --- a/service/codecommit/api_op_ListRepositories.go +++ b/service/codecommit/api_op_ListRepositories.go @@ -68,6 +68,9 @@ func addOperationListRepositoriesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListRepositoriesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go b/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go index 0b44e206964..ca126fea7e5 100644 --- a/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go +++ b/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go @@ -65,6 +65,9 @@ func addOperationListRepositoriesForApprovalRuleTemplateMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListRepositoriesForApprovalRuleTemplateMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_ListTagsForResource.go b/service/codecommit/api_op_ListTagsForResource.go index ffaa7ed802e..7cab5ea1690 100644 --- a/service/codecommit/api_op_ListTagsForResource.go +++ b/service/codecommit/api_op_ListTagsForResource.go @@ -65,6 +65,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_MergeBranchesByFastForward.go b/service/codecommit/api_op_MergeBranchesByFastForward.go index e2a73d7ee1c..166667b6699 100644 --- a/service/codecommit/api_op_MergeBranchesByFastForward.go +++ b/service/codecommit/api_op_MergeBranchesByFastForward.go @@ -70,6 +70,9 @@ func addOperationMergeBranchesByFastForwardMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationMergeBranchesByFastForwardMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_MergeBranchesBySquash.go b/service/codecommit/api_op_MergeBranchesBySquash.go index 4649c185f31..6e92544ef4d 100644 --- a/service/codecommit/api_op_MergeBranchesBySquash.go +++ b/service/codecommit/api_op_MergeBranchesBySquash.go @@ -103,6 +103,9 @@ func addOperationMergeBranchesBySquashMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationMergeBranchesBySquashMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_MergeBranchesByThreeWay.go b/service/codecommit/api_op_MergeBranchesByThreeWay.go index 25c8b51fe1a..af36d827f98 100644 --- a/service/codecommit/api_op_MergeBranchesByThreeWay.go +++ b/service/codecommit/api_op_MergeBranchesByThreeWay.go @@ -103,6 +103,9 @@ func addOperationMergeBranchesByThreeWayMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationMergeBranchesByThreeWayMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_MergePullRequestByFastForward.go b/service/codecommit/api_op_MergePullRequestByFastForward.go index 7edf96cd2d2..b215f7dd5bc 100644 --- a/service/codecommit/api_op_MergePullRequestByFastForward.go +++ b/service/codecommit/api_op_MergePullRequestByFastForward.go @@ -67,6 +67,9 @@ func addOperationMergePullRequestByFastForwardMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationMergePullRequestByFastForwardMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_MergePullRequestBySquash.go b/service/codecommit/api_op_MergePullRequestBySquash.go index 45b4a82ab2e..58b1d1a07da 100644 --- a/service/codecommit/api_op_MergePullRequestBySquash.go +++ b/service/codecommit/api_op_MergePullRequestBySquash.go @@ -98,6 +98,9 @@ func addOperationMergePullRequestBySquashMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationMergePullRequestBySquashMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_MergePullRequestByThreeWay.go b/service/codecommit/api_op_MergePullRequestByThreeWay.go index 6fc8379371c..d8914953279 100644 --- a/service/codecommit/api_op_MergePullRequestByThreeWay.go +++ b/service/codecommit/api_op_MergePullRequestByThreeWay.go @@ -99,6 +99,9 @@ func addOperationMergePullRequestByThreeWayMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationMergePullRequestByThreeWayMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_OverridePullRequestApprovalRules.go b/service/codecommit/api_op_OverridePullRequestApprovalRules.go index cc012323ca7..37731ad95ff 100644 --- a/service/codecommit/api_op_OverridePullRequestApprovalRules.go +++ b/service/codecommit/api_op_OverridePullRequestApprovalRules.go @@ -65,6 +65,9 @@ func addOperationOverridePullRequestApprovalRulesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationOverridePullRequestApprovalRulesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_PostCommentForComparedCommit.go b/service/codecommit/api_op_PostCommentForComparedCommit.go index 2cca838cab0..8db3301ed04 100644 --- a/service/codecommit/api_op_PostCommentForComparedCommit.go +++ b/service/codecommit/api_op_PostCommentForComparedCommit.go @@ -99,6 +99,9 @@ func addOperationPostCommentForComparedCommitMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationPostCommentForComparedCommitMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_PostCommentForPullRequest.go b/service/codecommit/api_op_PostCommentForPullRequest.go index 0e8c1d3dd4c..7fd4800c7c8 100644 --- a/service/codecommit/api_op_PostCommentForPullRequest.go +++ b/service/codecommit/api_op_PostCommentForPullRequest.go @@ -112,6 +112,9 @@ func addOperationPostCommentForPullRequestMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationPostCommentForPullRequestMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_PostCommentReply.go b/service/codecommit/api_op_PostCommentReply.go index b505370f427..119773e9e56 100644 --- a/service/codecommit/api_op_PostCommentReply.go +++ b/service/codecommit/api_op_PostCommentReply.go @@ -67,6 +67,9 @@ func addOperationPostCommentReplyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationPostCommentReplyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_PutCommentReaction.go b/service/codecommit/api_op_PutCommentReaction.go index 5ddc5038774..a74505b03fb 100644 --- a/service/codecommit/api_op_PutCommentReaction.go +++ b/service/codecommit/api_op_PutCommentReaction.go @@ -59,6 +59,9 @@ func addOperationPutCommentReactionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutCommentReactionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_PutFile.go b/service/codecommit/api_op_PutFile.go index 7b63674f0a3..af848d53805 100644 --- a/service/codecommit/api_op_PutFile.go +++ b/service/codecommit/api_op_PutFile.go @@ -107,6 +107,9 @@ func addOperationPutFileMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationPutFileMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_PutRepositoryTriggers.go b/service/codecommit/api_op_PutRepositoryTriggers.go index 4533d362b6f..4926672e311 100644 --- a/service/codecommit/api_op_PutRepositoryTriggers.go +++ b/service/codecommit/api_op_PutRepositoryTriggers.go @@ -60,6 +60,9 @@ func addOperationPutRepositoryTriggersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutRepositoryTriggersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_TagResource.go b/service/codecommit/api_op_TagResource.go index 1a5441e107c..a78c1f394a2 100644 --- a/service/codecommit/api_op_TagResource.go +++ b/service/codecommit/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_TestRepositoryTriggers.go b/service/codecommit/api_op_TestRepositoryTriggers.go index 00b10955379..4d09328f9e5 100644 --- a/service/codecommit/api_op_TestRepositoryTriggers.go +++ b/service/codecommit/api_op_TestRepositoryTriggers.go @@ -67,6 +67,9 @@ func addOperationTestRepositoryTriggersMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationTestRepositoryTriggersMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UntagResource.go b/service/codecommit/api_op_UntagResource.go index c5c08b53cff..39a071e08da 100644 --- a/service/codecommit/api_op_UntagResource.go +++ b/service/codecommit/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go b/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go index 889063517a3..4d7b984feac 100644 --- a/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go +++ b/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go @@ -68,6 +68,9 @@ func addOperationUpdateApprovalRuleTemplateContentMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateApprovalRuleTemplateContentMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go b/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go index 4531c1404f6..6f886d78b04 100644 --- a/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go +++ b/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go @@ -60,6 +60,9 @@ func addOperationUpdateApprovalRuleTemplateDescriptionMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateApprovalRuleTemplateDescriptionMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go b/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go index fe7d703d96d..cacc6db1068 100644 --- a/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go +++ b/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go @@ -60,6 +60,9 @@ func addOperationUpdateApprovalRuleTemplateNameMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateApprovalRuleTemplateNameMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateComment.go b/service/codecommit/api_op_UpdateComment.go index d4fe6b823ab..6e862117b15 100644 --- a/service/codecommit/api_op_UpdateComment.go +++ b/service/codecommit/api_op_UpdateComment.go @@ -59,6 +59,9 @@ func addOperationUpdateCommentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateCommentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateDefaultBranch.go b/service/codecommit/api_op_UpdateDefaultBranch.go index 40980400f51..a163155c260 100644 --- a/service/codecommit/api_op_UpdateDefaultBranch.go +++ b/service/codecommit/api_op_UpdateDefaultBranch.go @@ -57,6 +57,9 @@ func addOperationUpdateDefaultBranchMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateDefaultBranchMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go b/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go index ef09d45f620..46bb8018643 100644 --- a/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go +++ b/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go @@ -101,6 +101,9 @@ func addOperationUpdatePullRequestApprovalRuleContentMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationUpdatePullRequestApprovalRuleContentMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdatePullRequestApprovalState.go b/service/codecommit/api_op_UpdatePullRequestApprovalState.go index ec29618f464..d3c5fd8d0e1 100644 --- a/service/codecommit/api_op_UpdatePullRequestApprovalState.go +++ b/service/codecommit/api_op_UpdatePullRequestApprovalState.go @@ -60,6 +60,9 @@ func addOperationUpdatePullRequestApprovalStateMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdatePullRequestApprovalStateMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdatePullRequestDescription.go b/service/codecommit/api_op_UpdatePullRequestDescription.go index 566f8f03d25..5962ed64f01 100644 --- a/service/codecommit/api_op_UpdatePullRequestDescription.go +++ b/service/codecommit/api_op_UpdatePullRequestDescription.go @@ -62,6 +62,9 @@ func addOperationUpdatePullRequestDescriptionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdatePullRequestDescriptionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdatePullRequestStatus.go b/service/codecommit/api_op_UpdatePullRequestStatus.go index dc14d8d97ef..5db340bee01 100644 --- a/service/codecommit/api_op_UpdatePullRequestStatus.go +++ b/service/codecommit/api_op_UpdatePullRequestStatus.go @@ -62,6 +62,9 @@ func addOperationUpdatePullRequestStatusMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdatePullRequestStatusMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdatePullRequestTitle.go b/service/codecommit/api_op_UpdatePullRequestTitle.go index 1756e735fc9..6ad180439b9 100644 --- a/service/codecommit/api_op_UpdatePullRequestTitle.go +++ b/service/codecommit/api_op_UpdatePullRequestTitle.go @@ -61,6 +61,9 @@ func addOperationUpdatePullRequestTitleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdatePullRequestTitleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateRepositoryDescription.go b/service/codecommit/api_op_UpdateRepositoryDescription.go index 93ff4cd21c3..ab773434a8e 100644 --- a/service/codecommit/api_op_UpdateRepositoryDescription.go +++ b/service/codecommit/api_op_UpdateRepositoryDescription.go @@ -58,6 +58,9 @@ func addOperationUpdateRepositoryDescriptionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateRepositoryDescriptionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/api_op_UpdateRepositoryName.go b/service/codecommit/api_op_UpdateRepositoryName.go index afe194069b7..f598f2456ce 100644 --- a/service/codecommit/api_op_UpdateRepositoryName.go +++ b/service/codecommit/api_op_UpdateRepositoryName.go @@ -59,6 +59,9 @@ func addOperationUpdateRepositoryNameMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateRepositoryNameMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codecommit/go.mod b/service/codecommit/go.mod index 40066c87d47..c1644cc356c 100644 --- a/service/codecommit/go.mod +++ b/service/codecommit/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codecommit go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codecommit/go.sum b/service/codecommit/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codecommit/go.sum +++ b/service/codecommit/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codedeploy/api_client.go b/service/codedeploy/api_client.go index 3974258b854..58914f92208 100644 --- a/service/codedeploy/api_client.go +++ b/service/codedeploy/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go b/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go index 46c277e7be3..511befc7399 100644 --- a/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go +++ b/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go @@ -57,6 +57,9 @@ func addOperationAddTagsToOnPremisesInstancesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationAddTagsToOnPremisesInstancesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetApplicationRevisions.go b/service/codedeploy/api_op_BatchGetApplicationRevisions.go index e1e9ff7820c..8778c921872 100644 --- a/service/codedeploy/api_op_BatchGetApplicationRevisions.go +++ b/service/codedeploy/api_op_BatchGetApplicationRevisions.go @@ -70,6 +70,9 @@ func addOperationBatchGetApplicationRevisionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationBatchGetApplicationRevisionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetApplications.go b/service/codedeploy/api_op_BatchGetApplications.go index 358efecad0c..f96568f8112 100644 --- a/service/codedeploy/api_op_BatchGetApplications.go +++ b/service/codedeploy/api_op_BatchGetApplications.go @@ -57,6 +57,9 @@ func addOperationBatchGetApplicationsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchGetApplicationsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetDeploymentGroups.go b/service/codedeploy/api_op_BatchGetDeploymentGroups.go index a1dd0544afb..05610738d3c 100644 --- a/service/codedeploy/api_op_BatchGetDeploymentGroups.go +++ b/service/codedeploy/api_op_BatchGetDeploymentGroups.go @@ -64,6 +64,9 @@ func addOperationBatchGetDeploymentGroupsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchGetDeploymentGroupsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetDeploymentInstances.go b/service/codedeploy/api_op_BatchGetDeploymentInstances.go index a417f784d90..d144e51b5e5 100644 --- a/service/codedeploy/api_op_BatchGetDeploymentInstances.go +++ b/service/codedeploy/api_op_BatchGetDeploymentInstances.go @@ -68,6 +68,9 @@ func addOperationBatchGetDeploymentInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationBatchGetDeploymentInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetDeploymentTargets.go b/service/codedeploy/api_op_BatchGetDeploymentTargets.go index 02f9c8f23e8..d02692c2ba8 100644 --- a/service/codedeploy/api_op_BatchGetDeploymentTargets.go +++ b/service/codedeploy/api_op_BatchGetDeploymentTargets.go @@ -102,6 +102,9 @@ func addOperationBatchGetDeploymentTargetsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationBatchGetDeploymentTargetsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetDeployments.go b/service/codedeploy/api_op_BatchGetDeployments.go index 683e7888210..f356543d17c 100644 --- a/service/codedeploy/api_op_BatchGetDeployments.go +++ b/service/codedeploy/api_op_BatchGetDeployments.go @@ -57,6 +57,9 @@ func addOperationBatchGetDeploymentsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchGetDeploymentsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_BatchGetOnPremisesInstances.go b/service/codedeploy/api_op_BatchGetOnPremisesInstances.go index a2f0cd3560a..f0bbddeb6c3 100644 --- a/service/codedeploy/api_op_BatchGetOnPremisesInstances.go +++ b/service/codedeploy/api_op_BatchGetOnPremisesInstances.go @@ -57,6 +57,9 @@ func addOperationBatchGetOnPremisesInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchGetOnPremisesInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ContinueDeployment.go b/service/codedeploy/api_op_ContinueDeployment.go index 36516e38926..4bc70f30a68 100644 --- a/service/codedeploy/api_op_ContinueDeployment.go +++ b/service/codedeploy/api_op_ContinueDeployment.go @@ -58,6 +58,9 @@ func addOperationContinueDeploymentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationContinueDeploymentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_CreateApplication.go b/service/codedeploy/api_op_CreateApplication.go index 394c7236888..a85bbea224d 100644 --- a/service/codedeploy/api_op_CreateApplication.go +++ b/service/codedeploy/api_op_CreateApplication.go @@ -64,6 +64,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_CreateDeployment.go b/service/codedeploy/api_op_CreateDeployment.go index 815244f425d..c3e37b7580d 100644 --- a/service/codedeploy/api_op_CreateDeployment.go +++ b/service/codedeploy/api_op_CreateDeployment.go @@ -120,6 +120,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_CreateDeploymentConfig.go b/service/codedeploy/api_op_CreateDeploymentConfig.go index 7a58728a725..866ab3fff73 100644 --- a/service/codedeploy/api_op_CreateDeploymentConfig.go +++ b/service/codedeploy/api_op_CreateDeploymentConfig.go @@ -80,6 +80,9 @@ func addOperationCreateDeploymentConfigMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateDeploymentConfigMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_CreateDeploymentGroup.go b/service/codedeploy/api_op_CreateDeploymentGroup.go index a287a45ec09..70a7ed45f07 100644 --- a/service/codedeploy/api_op_CreateDeploymentGroup.go +++ b/service/codedeploy/api_op_CreateDeploymentGroup.go @@ -136,6 +136,9 @@ func addOperationCreateDeploymentGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationCreateDeploymentGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_DeleteApplication.go b/service/codedeploy/api_op_DeleteApplication.go index 8c94addb217..129e990ad62 100644 --- a/service/codedeploy/api_op_DeleteApplication.go +++ b/service/codedeploy/api_op_DeleteApplication.go @@ -50,6 +50,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_DeleteDeploymentConfig.go b/service/codedeploy/api_op_DeleteDeploymentConfig.go index 77370b24072..56482f4e6f5 100644 --- a/service/codedeploy/api_op_DeleteDeploymentConfig.go +++ b/service/codedeploy/api_op_DeleteDeploymentConfig.go @@ -51,6 +51,9 @@ func addOperationDeleteDeploymentConfigMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDeploymentConfigMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_DeleteDeploymentGroup.go b/service/codedeploy/api_op_DeleteDeploymentGroup.go index b2ef087c7fd..f1a4786cf0e 100644 --- a/service/codedeploy/api_op_DeleteDeploymentGroup.go +++ b/service/codedeploy/api_op_DeleteDeploymentGroup.go @@ -66,6 +66,9 @@ func addOperationDeleteDeploymentGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteDeploymentGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_DeleteGitHubAccountToken.go b/service/codedeploy/api_op_DeleteGitHubAccountToken.go index 0891516dcde..5bccf691f4f 100644 --- a/service/codedeploy/api_op_DeleteGitHubAccountToken.go +++ b/service/codedeploy/api_op_DeleteGitHubAccountToken.go @@ -52,6 +52,9 @@ func addOperationDeleteGitHubAccountTokenMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteGitHubAccountTokenMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_DeleteResourcesByExternalId.go b/service/codedeploy/api_op_DeleteResourcesByExternalId.go index 7c1f5ea52d9..738ca6e6d59 100644 --- a/service/codedeploy/api_op_DeleteResourcesByExternalId.go +++ b/service/codedeploy/api_op_DeleteResourcesByExternalId.go @@ -47,6 +47,9 @@ func addOperationDeleteResourcesByExternalIdMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationDeleteResourcesByExternalIdMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_DeregisterOnPremisesInstance.go b/service/codedeploy/api_op_DeregisterOnPremisesInstance.go index 2668277c955..0d36694e566 100644 --- a/service/codedeploy/api_op_DeregisterOnPremisesInstance.go +++ b/service/codedeploy/api_op_DeregisterOnPremisesInstance.go @@ -49,6 +49,9 @@ func addOperationDeregisterOnPremisesInstanceMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeregisterOnPremisesInstanceMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetApplication.go b/service/codedeploy/api_op_GetApplication.go index bab0746dca2..012f8ae6d21 100644 --- a/service/codedeploy/api_op_GetApplication.go +++ b/service/codedeploy/api_op_GetApplication.go @@ -56,6 +56,9 @@ func addOperationGetApplicationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetApplicationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetApplicationRevision.go b/service/codedeploy/api_op_GetApplicationRevision.go index 5879f857af5..ef1744d5dfe 100644 --- a/service/codedeploy/api_op_GetApplicationRevision.go +++ b/service/codedeploy/api_op_GetApplicationRevision.go @@ -66,6 +66,9 @@ func addOperationGetApplicationRevisionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetApplicationRevisionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetDeployment.go b/service/codedeploy/api_op_GetDeployment.go index d4a8790c81a..768d2d503a7 100644 --- a/service/codedeploy/api_op_GetDeployment.go +++ b/service/codedeploy/api_op_GetDeployment.go @@ -58,6 +58,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDeploymentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetDeploymentConfig.go b/service/codedeploy/api_op_GetDeploymentConfig.go index a2a7f1d7784..90c3d475497 100644 --- a/service/codedeploy/api_op_GetDeploymentConfig.go +++ b/service/codedeploy/api_op_GetDeploymentConfig.go @@ -56,6 +56,9 @@ func addOperationGetDeploymentConfigMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetDeploymentConfigMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetDeploymentGroup.go b/service/codedeploy/api_op_GetDeploymentGroup.go index cf6365b84f3..3d63cf1a75a 100644 --- a/service/codedeploy/api_op_GetDeploymentGroup.go +++ b/service/codedeploy/api_op_GetDeploymentGroup.go @@ -61,6 +61,9 @@ func addOperationGetDeploymentGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetDeploymentGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetDeploymentInstance.go b/service/codedeploy/api_op_GetDeploymentInstance.go index bba5169a2e9..f53e9a805a2 100644 --- a/service/codedeploy/api_op_GetDeploymentInstance.go +++ b/service/codedeploy/api_op_GetDeploymentInstance.go @@ -60,6 +60,9 @@ func addOperationGetDeploymentInstanceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetDeploymentInstanceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetDeploymentTarget.go b/service/codedeploy/api_op_GetDeploymentTarget.go index 64b89488822..74dda61cd11 100644 --- a/service/codedeploy/api_op_GetDeploymentTarget.go +++ b/service/codedeploy/api_op_GetDeploymentTarget.go @@ -57,6 +57,9 @@ func addOperationGetDeploymentTargetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetDeploymentTargetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_GetOnPremisesInstance.go b/service/codedeploy/api_op_GetOnPremisesInstance.go index 18c6803bbf1..def8a9f4d6e 100644 --- a/service/codedeploy/api_op_GetOnPremisesInstance.go +++ b/service/codedeploy/api_op_GetOnPremisesInstance.go @@ -55,6 +55,9 @@ func addOperationGetOnPremisesInstanceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetOnPremisesInstanceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListApplicationRevisions.go b/service/codedeploy/api_op_ListApplicationRevisions.go index ecceea42d36..acc2a8f4b11 100644 --- a/service/codedeploy/api_op_ListApplicationRevisions.go +++ b/service/codedeploy/api_op_ListApplicationRevisions.go @@ -110,6 +110,9 @@ func addOperationListApplicationRevisionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationListApplicationRevisionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListApplications.go b/service/codedeploy/api_op_ListApplications.go index 457542ed010..b6ff1df25ee 100644 --- a/service/codedeploy/api_op_ListApplications.go +++ b/service/codedeploy/api_op_ListApplications.go @@ -58,6 +58,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListDeploymentConfigs.go b/service/codedeploy/api_op_ListDeploymentConfigs.go index 33a5acb2938..d202a1942f1 100644 --- a/service/codedeploy/api_op_ListDeploymentConfigs.go +++ b/service/codedeploy/api_op_ListDeploymentConfigs.go @@ -59,6 +59,9 @@ func addOperationListDeploymentConfigsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDeploymentConfigsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListDeploymentGroups.go b/service/codedeploy/api_op_ListDeploymentGroups.go index 9319760a41d..b960bdca6a7 100644 --- a/service/codedeploy/api_op_ListDeploymentGroups.go +++ b/service/codedeploy/api_op_ListDeploymentGroups.go @@ -68,6 +68,9 @@ func addOperationListDeploymentGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListDeploymentGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListDeploymentInstances.go b/service/codedeploy/api_op_ListDeploymentInstances.go index df530459270..da9b9b7eac6 100644 --- a/service/codedeploy/api_op_ListDeploymentInstances.go +++ b/service/codedeploy/api_op_ListDeploymentInstances.go @@ -92,6 +92,9 @@ func addOperationListDeploymentInstancesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListDeploymentInstancesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListDeploymentTargets.go b/service/codedeploy/api_op_ListDeploymentTargets.go index 33c64e7afa9..fc05300479d 100644 --- a/service/codedeploy/api_op_ListDeploymentTargets.go +++ b/service/codedeploy/api_op_ListDeploymentTargets.go @@ -69,6 +69,9 @@ func addOperationListDeploymentTargetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListDeploymentTargetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListDeployments.go b/service/codedeploy/api_op_ListDeployments.go index f6bb7dbc8bc..72d0bfb3ae2 100644 --- a/service/codedeploy/api_op_ListDeployments.go +++ b/service/codedeploy/api_op_ListDeployments.go @@ -98,6 +98,9 @@ func addOperationListDeploymentsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationListDeploymentsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListGitHubAccountTokenNames.go b/service/codedeploy/api_op_ListGitHubAccountTokenNames.go index f15c1955e41..3873fda248e 100644 --- a/service/codedeploy/api_op_ListGitHubAccountTokenNames.go +++ b/service/codedeploy/api_op_ListGitHubAccountTokenNames.go @@ -58,6 +58,9 @@ func addOperationListGitHubAccountTokenNamesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListGitHubAccountTokenNamesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListOnPremisesInstances.go b/service/codedeploy/api_op_ListOnPremisesInstances.go index cb5838debc9..6abdb583ad8 100644 --- a/service/codedeploy/api_op_ListOnPremisesInstances.go +++ b/service/codedeploy/api_op_ListOnPremisesInstances.go @@ -75,6 +75,9 @@ func addOperationListOnPremisesInstancesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListOnPremisesInstancesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_ListTagsForResource.go b/service/codedeploy/api_op_ListTagsForResource.go index 6dc3b0e5bb0..72e79e7aece 100644 --- a/service/codedeploy/api_op_ListTagsForResource.go +++ b/service/codedeploy/api_op_ListTagsForResource.go @@ -66,6 +66,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go b/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go index ed1cc0bbb54..06dd330c34a 100644 --- a/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go +++ b/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go @@ -71,6 +71,9 @@ func addOperationPutLifecycleEventHookExecutionStatusMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutLifecycleEventHookExecutionStatusMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_RegisterApplicationRevision.go b/service/codedeploy/api_op_RegisterApplicationRevision.go index 4e2539bea8e..09b0d17a961 100644 --- a/service/codedeploy/api_op_RegisterApplicationRevision.go +++ b/service/codedeploy/api_op_RegisterApplicationRevision.go @@ -60,6 +60,9 @@ func addOperationRegisterApplicationRevisionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRegisterApplicationRevisionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_RegisterOnPremisesInstance.go b/service/codedeploy/api_op_RegisterOnPremisesInstance.go index 4fadd36d7cb..d3d78547192 100644 --- a/service/codedeploy/api_op_RegisterOnPremisesInstance.go +++ b/service/codedeploy/api_op_RegisterOnPremisesInstance.go @@ -56,6 +56,9 @@ func addOperationRegisterOnPremisesInstanceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRegisterOnPremisesInstanceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go b/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go index 588ca9c3a3c..ac616316072 100644 --- a/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go +++ b/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go @@ -55,6 +55,9 @@ func addOperationRemoveTagsFromOnPremisesInstancesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRemoveTagsFromOnPremisesInstancesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go b/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go index 767679b6b42..0ac90fe5741 100644 --- a/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go +++ b/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go @@ -48,6 +48,9 @@ func addOperationSkipWaitTimeForInstanceTerminationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationSkipWaitTimeForInstanceTerminationMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_StopDeployment.go b/service/codedeploy/api_op_StopDeployment.go index 4d52628e2e3..dbe30da1993 100644 --- a/service/codedeploy/api_op_StopDeployment.go +++ b/service/codedeploy/api_op_StopDeployment.go @@ -68,6 +68,9 @@ func addOperationStopDeploymentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationStopDeploymentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_TagResource.go b/service/codedeploy/api_op_TagResource.go index d7ea09e40a7..78fb79f9312 100644 --- a/service/codedeploy/api_op_TagResource.go +++ b/service/codedeploy/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_UntagResource.go b/service/codedeploy/api_op_UntagResource.go index 72ed6dd6e2e..bf987fc2ee6 100644 --- a/service/codedeploy/api_op_UntagResource.go +++ b/service/codedeploy/api_op_UntagResource.go @@ -57,6 +57,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_UpdateApplication.go b/service/codedeploy/api_op_UpdateApplication.go index e735c202965..b3e915572e6 100644 --- a/service/codedeploy/api_op_UpdateApplication.go +++ b/service/codedeploy/api_op_UpdateApplication.go @@ -50,6 +50,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/api_op_UpdateDeploymentGroup.go b/service/codedeploy/api_op_UpdateDeploymentGroup.go index 9fa00e2816a..f0bc5b075d6 100644 --- a/service/codedeploy/api_op_UpdateDeploymentGroup.go +++ b/service/codedeploy/api_op_UpdateDeploymentGroup.go @@ -126,6 +126,9 @@ func addOperationUpdateDeploymentGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationUpdateDeploymentGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codedeploy/go.mod b/service/codedeploy/go.mod index 1b2fda4074c..922cae4b782 100644 --- a/service/codedeploy/go.mod +++ b/service/codedeploy/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codedeploy go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codedeploy/go.sum b/service/codedeploy/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codedeploy/go.sum +++ b/service/codedeploy/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codeguruprofiler/api_client.go b/service/codeguruprofiler/api_client.go index c2b9b737837..b5338a03a03 100644 --- a/service/codeguruprofiler/api_client.go +++ b/service/codeguruprofiler/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codeguruprofiler/api_op_ConfigureAgent.go b/service/codeguruprofiler/api_op_ConfigureAgent.go index 8f006d4d724..9f61ed84341 100644 --- a/service/codeguruprofiler/api_op_ConfigureAgent.go +++ b/service/codeguruprofiler/api_op_ConfigureAgent.go @@ -62,6 +62,9 @@ func addOperationConfigureAgentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,5 +104,8 @@ func addOperationConfigureAgentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_CreateProfilingGroup.go b/service/codeguruprofiler/api_op_CreateProfilingGroup.go index cf315a18f96..f185d2556af 100644 --- a/service/codeguruprofiler/api_op_CreateProfilingGroup.go +++ b/service/codeguruprofiler/api_op_CreateProfilingGroup.go @@ -69,6 +69,9 @@ func addOperationCreateProfilingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,5 +111,8 @@ func addOperationCreateProfilingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_DeleteProfilingGroup.go b/service/codeguruprofiler/api_op_DeleteProfilingGroup.go index ae2a0ad4006..a34e8f48f27 100644 --- a/service/codeguruprofiler/api_op_DeleteProfilingGroup.go +++ b/service/codeguruprofiler/api_op_DeleteProfilingGroup.go @@ -50,6 +50,9 @@ func addOperationDeleteProfilingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,5 +92,8 @@ func addOperationDeleteProfilingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_DescribeProfilingGroup.go b/service/codeguruprofiler/api_op_DescribeProfilingGroup.go index 42bd62fc7ef..fa62a6ed12c 100644 --- a/service/codeguruprofiler/api_op_DescribeProfilingGroup.go +++ b/service/codeguruprofiler/api_op_DescribeProfilingGroup.go @@ -57,6 +57,9 @@ func addOperationDescribeProfilingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,5 +99,8 @@ func addOperationDescribeProfilingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_GetPolicy.go b/service/codeguruprofiler/api_op_GetPolicy.go index 857f6e9ad68..d7e996f23a0 100644 --- a/service/codeguruprofiler/api_op_GetPolicy.go +++ b/service/codeguruprofiler/api_op_GetPolicy.go @@ -61,6 +61,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,5 +103,8 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_GetProfile.go b/service/codeguruprofiler/api_op_GetProfile.go index e640fa68568..3226fb4d91b 100644 --- a/service/codeguruprofiler/api_op_GetProfile.go +++ b/service/codeguruprofiler/api_op_GetProfile.go @@ -94,6 +94,9 @@ func addOperationGetProfileMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,5 +136,8 @@ func addOperationGetProfileMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_ListProfileTimes.go b/service/codeguruprofiler/api_op_ListProfileTimes.go index 538a18c4735..af7950312b6 100644 --- a/service/codeguruprofiler/api_op_ListProfileTimes.go +++ b/service/codeguruprofiler/api_op_ListProfileTimes.go @@ -100,6 +100,9 @@ func addOperationListProfileTimesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,5 +142,8 @@ func addOperationListProfileTimesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_ListProfilingGroups.go b/service/codeguruprofiler/api_op_ListProfilingGroups.go index a0fd960fd52..da621633e70 100644 --- a/service/codeguruprofiler/api_op_ListProfilingGroups.go +++ b/service/codeguruprofiler/api_op_ListProfilingGroups.go @@ -79,6 +79,9 @@ func addOperationListProfilingGroupsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,5 +118,8 @@ func addOperationListProfilingGroupsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_PostAgentProfile.go b/service/codeguruprofiler/api_op_PostAgentProfile.go index d35acccde34..107825c655b 100644 --- a/service/codeguruprofiler/api_op_PostAgentProfile.go +++ b/service/codeguruprofiler/api_op_PostAgentProfile.go @@ -63,6 +63,9 @@ func addOperationPostAgentProfileMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,5 +105,8 @@ func addOperationPostAgentProfileMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_PutPermission.go b/service/codeguruprofiler/api_op_PutPermission.go index 71440a5179b..96305c647ab 100644 --- a/service/codeguruprofiler/api_op_PutPermission.go +++ b/service/codeguruprofiler/api_op_PutPermission.go @@ -79,6 +79,9 @@ func addOperationPutPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,5 +121,8 @@ func addOperationPutPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_RemovePermission.go b/service/codeguruprofiler/api_op_RemovePermission.go index 5ff44f33352..31ae7609310 100644 --- a/service/codeguruprofiler/api_op_RemovePermission.go +++ b/service/codeguruprofiler/api_op_RemovePermission.go @@ -72,6 +72,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,5 +114,8 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_RetrieveTimeSeries.go b/service/codeguruprofiler/api_op_RetrieveTimeSeries.go index 99e658df33c..b641bd06f90 100644 --- a/service/codeguruprofiler/api_op_RetrieveTimeSeries.go +++ b/service/codeguruprofiler/api_op_RetrieveTimeSeries.go @@ -69,6 +69,9 @@ func addOperationRetrieveTimeSeriesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,5 +111,8 @@ func addOperationRetrieveTimeSeriesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/api_op_UpdateProfilingGroup.go b/service/codeguruprofiler/api_op_UpdateProfilingGroup.go index f88e88224c2..0787af239fb 100644 --- a/service/codeguruprofiler/api_op_UpdateProfilingGroup.go +++ b/service/codeguruprofiler/api_op_UpdateProfilingGroup.go @@ -62,6 +62,9 @@ func addOperationUpdateProfilingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,5 +104,8 @@ func addOperationUpdateProfilingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codeguruprofiler/go.mod b/service/codeguruprofiler/go.mod index f568839f5b1..d9a283f0f15 100644 --- a/service/codeguruprofiler/go.mod +++ b/service/codeguruprofiler/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codeguruprofiler go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codeguruprofiler/go.sum b/service/codeguruprofiler/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codeguruprofiler/go.sum +++ b/service/codeguruprofiler/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codegurureviewer/api_client.go b/service/codegurureviewer/api_client.go index f66cacacdc8..b3e0fbb4068 100644 --- a/service/codegurureviewer/api_client.go +++ b/service/codegurureviewer/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codegurureviewer/api_op_AssociateRepository.go b/service/codegurureviewer/api_op_AssociateRepository.go index 5799f7d40b3..dc3de34507e 100644 --- a/service/codegurureviewer/api_op_AssociateRepository.go +++ b/service/codegurureviewer/api_op_AssociateRepository.go @@ -76,6 +76,9 @@ func addOperationAssociateRepositoryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationAssociateRepositoryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_CreateCodeReview.go b/service/codegurureviewer/api_op_CreateCodeReview.go index 173cf0fd1ea..c53ebfe531c 100644 --- a/service/codegurureviewer/api_op_CreateCodeReview.go +++ b/service/codegurureviewer/api_op_CreateCodeReview.go @@ -75,6 +75,9 @@ func addOperationCreateCodeReviewMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateCodeReviewMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_DescribeCodeReview.go b/service/codegurureviewer/api_op_DescribeCodeReview.go index 77895c0bac7..1ea4f26418f 100644 --- a/service/codegurureviewer/api_op_DescribeCodeReview.go +++ b/service/codegurureviewer/api_op_DescribeCodeReview.go @@ -55,6 +55,9 @@ func addOperationDescribeCodeReviewMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeCodeReviewMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go b/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go index 4f67267a505..a9592bf9a16 100644 --- a/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go +++ b/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go @@ -69,6 +69,9 @@ func addOperationDescribeRecommendationFeedbackMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeRecommendationFeedbackMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go b/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go index 49f9c0d026f..ff179e2fbc1 100644 --- a/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go +++ b/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go @@ -57,6 +57,9 @@ func addOperationDescribeRepositoryAssociationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeRepositoryAssociationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_DisassociateRepository.go b/service/codegurureviewer/api_op_DisassociateRepository.go index eb70ca7d153..095277626f3 100644 --- a/service/codegurureviewer/api_op_DisassociateRepository.go +++ b/service/codegurureviewer/api_op_DisassociateRepository.go @@ -55,6 +55,9 @@ func addOperationDisassociateRepositoryMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisassociateRepositoryMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_ListCodeReviews.go b/service/codegurureviewer/api_op_ListCodeReviews.go index d696cd87125..b52f9779374 100644 --- a/service/codegurureviewer/api_op_ListCodeReviews.go +++ b/service/codegurureviewer/api_op_ListCodeReviews.go @@ -88,6 +88,9 @@ func addOperationListCodeReviewsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListCodeReviewsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_ListRecommendationFeedback.go b/service/codegurureviewer/api_op_ListRecommendationFeedback.go index 282060f35f7..3114d95f18b 100644 --- a/service/codegurureviewer/api_op_ListRecommendationFeedback.go +++ b/service/codegurureviewer/api_op_ListRecommendationFeedback.go @@ -84,6 +84,9 @@ func addOperationListRecommendationFeedbackMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListRecommendationFeedbackMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_ListRecommendations.go b/service/codegurureviewer/api_op_ListRecommendations.go index c024ecd3d95..432c29eb9f2 100644 --- a/service/codegurureviewer/api_op_ListRecommendations.go +++ b/service/codegurureviewer/api_op_ListRecommendations.go @@ -64,6 +64,9 @@ func addOperationListRecommendationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListRecommendationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_ListRepositoryAssociations.go b/service/codegurureviewer/api_op_ListRepositoryAssociations.go index ccd3dee3ced..06ab2a0ca45 100644 --- a/service/codegurureviewer/api_op_ListRepositoryAssociations.go +++ b/service/codegurureviewer/api_op_ListRepositoryAssociations.go @@ -120,6 +120,9 @@ func addOperationListRepositoryAssociationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationListRepositoryAssociationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/api_op_PutRecommendationFeedback.go b/service/codegurureviewer/api_op_PutRecommendationFeedback.go index 1344935c083..f913260d39a 100644 --- a/service/codegurureviewer/api_op_PutRecommendationFeedback.go +++ b/service/codegurureviewer/api_op_PutRecommendationFeedback.go @@ -64,6 +64,9 @@ func addOperationPutRecommendationFeedbackMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationPutRecommendationFeedbackMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codegurureviewer/go.mod b/service/codegurureviewer/go.mod index 45409563281..f77ecd9f575 100644 --- a/service/codegurureviewer/go.mod +++ b/service/codegurureviewer/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codegurureviewer go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codegurureviewer/go.sum b/service/codegurureviewer/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codegurureviewer/go.sum +++ b/service/codegurureviewer/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codepipeline/api_client.go b/service/codepipeline/api_client.go index e28e778e463..b749e24ce3f 100644 --- a/service/codepipeline/api_client.go +++ b/service/codepipeline/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codepipeline/api_op_AcknowledgeJob.go b/service/codepipeline/api_op_AcknowledgeJob.go index 926f2c653d4..aa1f351d1f0 100644 --- a/service/codepipeline/api_op_AcknowledgeJob.go +++ b/service/codepipeline/api_op_AcknowledgeJob.go @@ -63,6 +63,9 @@ func addOperationAcknowledgeJobMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAcknowledgeJobMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go b/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go index 328e702f93a..f3f1e6f5f1d 100644 --- a/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go +++ b/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go @@ -69,6 +69,9 @@ func addOperationAcknowledgeThirdPartyJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAcknowledgeThirdPartyJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_CreateCustomActionType.go b/service/codepipeline/api_op_CreateCustomActionType.go index f62a9e89a49..996ca5e2fd1 100644 --- a/service/codepipeline/api_op_CreateCustomActionType.go +++ b/service/codepipeline/api_op_CreateCustomActionType.go @@ -97,6 +97,9 @@ func addOperationCreateCustomActionTypeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateCustomActionTypeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_CreatePipeline.go b/service/codepipeline/api_op_CreatePipeline.go index 2c66bd0b0dc..723a7742106 100644 --- a/service/codepipeline/api_op_CreatePipeline.go +++ b/service/codepipeline/api_op_CreatePipeline.go @@ -63,6 +63,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_DeleteCustomActionType.go b/service/codepipeline/api_op_DeleteCustomActionType.go index a89a32fb6ad..af51e4dc24c 100644 --- a/service/codepipeline/api_op_DeleteCustomActionType.go +++ b/service/codepipeline/api_op_DeleteCustomActionType.go @@ -68,6 +68,9 @@ func addOperationDeleteCustomActionTypeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteCustomActionTypeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_DeletePipeline.go b/service/codepipeline/api_op_DeletePipeline.go index 1765d3b77c2..b3df82f8970 100644 --- a/service/codepipeline/api_op_DeletePipeline.go +++ b/service/codepipeline/api_op_DeletePipeline.go @@ -49,6 +49,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_DeleteWebhook.go b/service/codepipeline/api_op_DeleteWebhook.go index c67a4888ea1..42b234afc3d 100644 --- a/service/codepipeline/api_op_DeleteWebhook.go +++ b/service/codepipeline/api_op_DeleteWebhook.go @@ -52,6 +52,9 @@ func addOperationDeleteWebhookMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteWebhookMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go b/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go index fbfd6225d29..2954d9c0d09 100644 --- a/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go +++ b/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go @@ -48,6 +48,9 @@ func addOperationDeregisterWebhookWithThirdPartyMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDeregisterWebhookWithThirdPartyMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_DisableStageTransition.go b/service/codepipeline/api_op_DisableStageTransition.go index 6c58e0a52d9..87f26556fcc 100644 --- a/service/codepipeline/api_op_DisableStageTransition.go +++ b/service/codepipeline/api_op_DisableStageTransition.go @@ -73,6 +73,9 @@ func addOperationDisableStageTransitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDisableStageTransitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_EnableStageTransition.go b/service/codepipeline/api_op_EnableStageTransition.go index 172c8eda3b4..8b7d3c6c794 100644 --- a/service/codepipeline/api_op_EnableStageTransition.go +++ b/service/codepipeline/api_op_EnableStageTransition.go @@ -64,6 +64,9 @@ func addOperationEnableStageTransitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationEnableStageTransitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_GetJobDetails.go b/service/codepipeline/api_op_GetJobDetails.go index 4c093302748..ef35dc01ab7 100644 --- a/service/codepipeline/api_op_GetJobDetails.go +++ b/service/codepipeline/api_op_GetJobDetails.go @@ -60,6 +60,9 @@ func addOperationGetJobDetailsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetJobDetailsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_GetPipeline.go b/service/codepipeline/api_op_GetPipeline.go index 3b823371457..5be7c6194d2 100644 --- a/service/codepipeline/api_op_GetPipeline.go +++ b/service/codepipeline/api_op_GetPipeline.go @@ -66,6 +66,9 @@ func addOperationGetPipelineMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetPipelineMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_GetPipelineExecution.go b/service/codepipeline/api_op_GetPipelineExecution.go index f364751432a..42186f30287 100644 --- a/service/codepipeline/api_op_GetPipelineExecution.go +++ b/service/codepipeline/api_op_GetPipelineExecution.go @@ -62,6 +62,9 @@ func addOperationGetPipelineExecutionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetPipelineExecutionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_GetPipelineState.go b/service/codepipeline/api_op_GetPipelineState.go index 8f37fc0ce14..f9b40c2e24a 100644 --- a/service/codepipeline/api_op_GetPipelineState.go +++ b/service/codepipeline/api_op_GetPipelineState.go @@ -72,6 +72,9 @@ func addOperationGetPipelineStateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetPipelineStateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_GetThirdPartyJobDetails.go b/service/codepipeline/api_op_GetThirdPartyJobDetails.go index 3a9070677fb..33fb4dd4bab 100644 --- a/service/codepipeline/api_op_GetThirdPartyJobDetails.go +++ b/service/codepipeline/api_op_GetThirdPartyJobDetails.go @@ -65,6 +65,9 @@ func addOperationGetThirdPartyJobDetailsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetThirdPartyJobDetailsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_ListActionExecutions.go b/service/codepipeline/api_op_ListActionExecutions.go index 02320a3f384..abf19a39075 100644 --- a/service/codepipeline/api_op_ListActionExecutions.go +++ b/service/codepipeline/api_op_ListActionExecutions.go @@ -72,6 +72,9 @@ func addOperationListActionExecutionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListActionExecutionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_ListActionTypes.go b/service/codepipeline/api_op_ListActionTypes.go index aa7b4d89b94..9005512f304 100644 --- a/service/codepipeline/api_op_ListActionTypes.go +++ b/service/codepipeline/api_op_ListActionTypes.go @@ -65,6 +65,9 @@ func addOperationListActionTypesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListActionTypesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_ListPipelineExecutions.go b/service/codepipeline/api_op_ListPipelineExecutions.go index 02c59b8d68d..3925ea8225c 100644 --- a/service/codepipeline/api_op_ListPipelineExecutions.go +++ b/service/codepipeline/api_op_ListPipelineExecutions.go @@ -71,6 +71,9 @@ func addOperationListPipelineExecutionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListPipelineExecutionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_ListPipelines.go b/service/codepipeline/api_op_ListPipelines.go index 76c9dd2162a..43c6a1aa380 100644 --- a/service/codepipeline/api_op_ListPipelines.go +++ b/service/codepipeline/api_op_ListPipelines.go @@ -59,6 +59,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_ListTagsForResource.go b/service/codepipeline/api_op_ListTagsForResource.go index 98382ebd6d6..e5bbb4c4efc 100644 --- a/service/codepipeline/api_op_ListTagsForResource.go +++ b/service/codepipeline/api_op_ListTagsForResource.go @@ -67,6 +67,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_ListWebhooks.go b/service/codepipeline/api_op_ListWebhooks.go index 0b096a8bd83..bbd317df840 100644 --- a/service/codepipeline/api_op_ListWebhooks.go +++ b/service/codepipeline/api_op_ListWebhooks.go @@ -64,6 +64,9 @@ func addOperationListWebhooksMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListWebhooksMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PollForJobs.go b/service/codepipeline/api_op_PollForJobs.go index 5593bda0d0f..8b37c7fc538 100644 --- a/service/codepipeline/api_op_PollForJobs.go +++ b/service/codepipeline/api_op_PollForJobs.go @@ -70,6 +70,9 @@ func addOperationPollForJobsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationPollForJobsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PollForThirdPartyJobs.go b/service/codepipeline/api_op_PollForThirdPartyJobs.go index 2afc05abb12..6b8842b420f 100644 --- a/service/codepipeline/api_op_PollForThirdPartyJobs.go +++ b/service/codepipeline/api_op_PollForThirdPartyJobs.go @@ -62,6 +62,9 @@ func addOperationPollForThirdPartyJobsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationPollForThirdPartyJobsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutActionRevision.go b/service/codepipeline/api_op_PutActionRevision.go index e3efc2afed0..3ddfcbf9e31 100644 --- a/service/codepipeline/api_op_PutActionRevision.go +++ b/service/codepipeline/api_op_PutActionRevision.go @@ -74,6 +74,9 @@ func addOperationPutActionRevisionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationPutActionRevisionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutApprovalResult.go b/service/codepipeline/api_op_PutApprovalResult.go index 9419be5965c..da11f88def9 100644 --- a/service/codepipeline/api_op_PutApprovalResult.go +++ b/service/codepipeline/api_op_PutApprovalResult.go @@ -80,6 +80,9 @@ func addOperationPutApprovalResultMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationPutApprovalResultMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutJobFailureResult.go b/service/codepipeline/api_op_PutJobFailureResult.go index 19754c54953..241cf66aa05 100644 --- a/service/codepipeline/api_op_PutJobFailureResult.go +++ b/service/codepipeline/api_op_PutJobFailureResult.go @@ -57,6 +57,9 @@ func addOperationPutJobFailureResultMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutJobFailureResultMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutJobSuccessResult.go b/service/codepipeline/api_op_PutJobSuccessResult.go index d7d888225f3..45fca11591c 100644 --- a/service/codepipeline/api_op_PutJobSuccessResult.go +++ b/service/codepipeline/api_op_PutJobSuccessResult.go @@ -72,6 +72,9 @@ func addOperationPutJobSuccessResultMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutJobSuccessResultMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go b/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go index 9e09492a2a8..54eec5c8bf0 100644 --- a/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go +++ b/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go @@ -63,6 +63,9 @@ func addOperationPutThirdPartyJobFailureResultMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPutThirdPartyJobFailureResultMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go b/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go index e0b8ade7717..9c747e59783 100644 --- a/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go +++ b/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go @@ -72,6 +72,9 @@ func addOperationPutThirdPartyJobSuccessResultMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutThirdPartyJobSuccessResultMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_PutWebhook.go b/service/codepipeline/api_op_PutWebhook.go index 5b7074ea28b..ea13fa5e553 100644 --- a/service/codepipeline/api_op_PutWebhook.go +++ b/service/codepipeline/api_op_PutWebhook.go @@ -67,6 +67,9 @@ func addOperationPutWebhookMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationPutWebhookMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go b/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go index 959c414ab0c..8395421e309 100644 --- a/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go +++ b/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go @@ -48,6 +48,9 @@ func addOperationRegisterWebhookWithThirdPartyMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationRegisterWebhookWithThirdPartyMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_RetryStageExecution.go b/service/codepipeline/api_op_RetryStageExecution.go index 2ddd0dc7ff9..7a90d310bc0 100644 --- a/service/codepipeline/api_op_RetryStageExecution.go +++ b/service/codepipeline/api_op_RetryStageExecution.go @@ -76,6 +76,9 @@ func addOperationRetryStageExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationRetryStageExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_StartPipelineExecution.go b/service/codepipeline/api_op_StartPipelineExecution.go index 347a1bd9bcc..321f7b87d4f 100644 --- a/service/codepipeline/api_op_StartPipelineExecution.go +++ b/service/codepipeline/api_op_StartPipelineExecution.go @@ -59,6 +59,9 @@ func addOperationStartPipelineExecutionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationStartPipelineExecutionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_StopPipelineExecution.go b/service/codepipeline/api_op_StopPipelineExecution.go index 53a82573a2c..4a5925d86b2 100644 --- a/service/codepipeline/api_op_StopPipelineExecution.go +++ b/service/codepipeline/api_op_StopPipelineExecution.go @@ -71,6 +71,9 @@ func addOperationStopPipelineExecutionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationStopPipelineExecutionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_TagResource.go b/service/codepipeline/api_op_TagResource.go index e97641e69e2..135e180efcb 100644 --- a/service/codepipeline/api_op_TagResource.go +++ b/service/codepipeline/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_UntagResource.go b/service/codepipeline/api_op_UntagResource.go index 1513745c61f..c61ee51dca9 100644 --- a/service/codepipeline/api_op_UntagResource.go +++ b/service/codepipeline/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/api_op_UpdatePipeline.go b/service/codepipeline/api_op_UpdatePipeline.go index 15b00f6a123..f57cc73aea3 100644 --- a/service/codepipeline/api_op_UpdatePipeline.go +++ b/service/codepipeline/api_op_UpdatePipeline.go @@ -58,6 +58,9 @@ func addOperationUpdatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codepipeline/go.mod b/service/codepipeline/go.mod index 3a2d7721d12..56d7124792d 100644 --- a/service/codepipeline/go.mod +++ b/service/codepipeline/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codepipeline go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codepipeline/go.sum b/service/codepipeline/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codepipeline/go.sum +++ b/service/codepipeline/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codestar/api_client.go b/service/codestar/api_client.go index 9fbd6202411..e1fda7cf9e6 100644 --- a/service/codestar/api_client.go +++ b/service/codestar/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codestar/api_op_AssociateTeamMember.go b/service/codestar/api_op_AssociateTeamMember.go index 0deace7b868..cf8aca61603 100644 --- a/service/codestar/api_op_AssociateTeamMember.go +++ b/service/codestar/api_op_AssociateTeamMember.go @@ -74,6 +74,9 @@ func addOperationAssociateTeamMemberMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationAssociateTeamMemberMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_CreateProject.go b/service/codestar/api_op_CreateProject.go index 4d5cc943396..3096e1ace3f 100644 --- a/service/codestar/api_op_CreateProject.go +++ b/service/codestar/api_op_CreateProject.go @@ -94,6 +94,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_CreateUserProfile.go b/service/codestar/api_op_CreateUserProfile.go index a5d219ddab5..056b63bd894 100644 --- a/service/codestar/api_op_CreateUserProfile.go +++ b/service/codestar/api_op_CreateUserProfile.go @@ -93,6 +93,9 @@ func addOperationCreateUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_DeleteProject.go b/service/codestar/api_op_DeleteProject.go index 28c8969c465..761a04a953f 100644 --- a/service/codestar/api_op_DeleteProject.go +++ b/service/codestar/api_op_DeleteProject.go @@ -68,6 +68,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_DeleteUserProfile.go b/service/codestar/api_op_DeleteUserProfile.go index af29f53ec8d..f5c4cf8e566 100644 --- a/service/codestar/api_op_DeleteUserProfile.go +++ b/service/codestar/api_op_DeleteUserProfile.go @@ -57,6 +57,9 @@ func addOperationDeleteUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_DescribeProject.go b/service/codestar/api_op_DescribeProject.go index fe5e5e8d960..49eeea8343b 100644 --- a/service/codestar/api_op_DescribeProject.go +++ b/service/codestar/api_op_DescribeProject.go @@ -80,6 +80,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_DescribeUserProfile.go b/service/codestar/api_op_DescribeUserProfile.go index c87ee2cf272..e2809c850f5 100644 --- a/service/codestar/api_op_DescribeUserProfile.go +++ b/service/codestar/api_op_DescribeUserProfile.go @@ -86,6 +86,9 @@ func addOperationDescribeUserProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeUserProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_DisassociateTeamMember.go b/service/codestar/api_op_DisassociateTeamMember.go index b2e85a9a3c3..5102b9bed29 100644 --- a/service/codestar/api_op_DisassociateTeamMember.go +++ b/service/codestar/api_op_DisassociateTeamMember.go @@ -57,6 +57,9 @@ func addOperationDisassociateTeamMemberMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDisassociateTeamMemberMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_ListProjects.go b/service/codestar/api_op_ListProjects.go index 15ce1c7852d..6fc87c92310 100644 --- a/service/codestar/api_op_ListProjects.go +++ b/service/codestar/api_op_ListProjects.go @@ -61,6 +61,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_ListResources.go b/service/codestar/api_op_ListResources.go index e1614ba17e1..b90679cbbfc 100644 --- a/service/codestar/api_op_ListResources.go +++ b/service/codestar/api_op_ListResources.go @@ -64,6 +64,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_ListTagsForProject.go b/service/codestar/api_op_ListTagsForProject.go index 8c14c643291..e906961cbad 100644 --- a/service/codestar/api_op_ListTagsForProject.go +++ b/service/codestar/api_op_ListTagsForProject.go @@ -61,6 +61,9 @@ func addOperationListTagsForProjectMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTagsForProjectMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_ListTeamMembers.go b/service/codestar/api_op_ListTeamMembers.go index 4720c3be85e..4504a29c046 100644 --- a/service/codestar/api_op_ListTeamMembers.go +++ b/service/codestar/api_op_ListTeamMembers.go @@ -66,6 +66,9 @@ func addOperationListTeamMembersMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListTeamMembersMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_ListUserProfiles.go b/service/codestar/api_op_ListUserProfiles.go index 4851583d913..e5e332201f3 100644 --- a/service/codestar/api_op_ListUserProfiles.go +++ b/service/codestar/api_op_ListUserProfiles.go @@ -61,6 +61,9 @@ func addOperationListUserProfilesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListUserProfilesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_TagProject.go b/service/codestar/api_op_TagProject.go index c348240ef91..afb98b9b2a5 100644 --- a/service/codestar/api_op_TagProject.go +++ b/service/codestar/api_op_TagProject.go @@ -57,6 +57,9 @@ func addOperationTagProjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagProjectMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_UntagProject.go b/service/codestar/api_op_UntagProject.go index 754c22a5bd7..71bab823d35 100644 --- a/service/codestar/api_op_UntagProject.go +++ b/service/codestar/api_op_UntagProject.go @@ -53,6 +53,9 @@ func addOperationUntagProjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagProjectMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_UpdateProject.go b/service/codestar/api_op_UpdateProject.go index f6f330b97cc..f6a20f53ca4 100644 --- a/service/codestar/api_op_UpdateProject.go +++ b/service/codestar/api_op_UpdateProject.go @@ -54,6 +54,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_UpdateTeamMember.go b/service/codestar/api_op_UpdateTeamMember.go index a8a02aabd6e..5ea59a5ca0d 100644 --- a/service/codestar/api_op_UpdateTeamMember.go +++ b/service/codestar/api_op_UpdateTeamMember.go @@ -80,6 +80,9 @@ func addOperationUpdateTeamMemberMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateTeamMemberMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/api_op_UpdateUserProfile.go b/service/codestar/api_op_UpdateUserProfile.go index b6d8c9ec89d..5bf1e5127db 100644 --- a/service/codestar/api_op_UpdateUserProfile.go +++ b/service/codestar/api_op_UpdateUserProfile.go @@ -88,6 +88,9 @@ func addOperationUpdateUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationUpdateUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestar/go.mod b/service/codestar/go.mod index 49a1fecc20b..a7909a77d14 100644 --- a/service/codestar/go.mod +++ b/service/codestar/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codestar go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestar/go.sum b/service/codestar/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codestar/go.sum +++ b/service/codestar/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codestarconnections/api_client.go b/service/codestarconnections/api_client.go index f7f2e24af49..a39f03ac3f1 100644 --- a/service/codestarconnections/api_client.go +++ b/service/codestarconnections/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codestarconnections/api_op_CreateConnection.go b/service/codestarconnections/api_op_CreateConnection.go index ee41475b1dc..5a0a6c6205d 100644 --- a/service/codestarconnections/api_op_CreateConnection.go +++ b/service/codestarconnections/api_op_CreateConnection.go @@ -75,6 +75,9 @@ func addOperationCreateConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_CreateHost.go b/service/codestarconnections/api_op_CreateHost.go index 4613718b410..1dffd292587 100644 --- a/service/codestarconnections/api_op_CreateHost.go +++ b/service/codestarconnections/api_op_CreateHost.go @@ -77,6 +77,9 @@ func addOperationCreateHostMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateHostMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_DeleteConnection.go b/service/codestarconnections/api_op_DeleteConnection.go index 8c78c287471..f18d6dfdb70 100644 --- a/service/codestarconnections/api_op_DeleteConnection.go +++ b/service/codestarconnections/api_op_DeleteConnection.go @@ -49,6 +49,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_DeleteHost.go b/service/codestarconnections/api_op_DeleteHost.go index 850627c9aef..636b1a55127 100644 --- a/service/codestarconnections/api_op_DeleteHost.go +++ b/service/codestarconnections/api_op_DeleteHost.go @@ -50,6 +50,9 @@ func addOperationDeleteHostMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteHostMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_GetConnection.go b/service/codestarconnections/api_op_GetConnection.go index 1fc52ebef69..c6568714cb1 100644 --- a/service/codestarconnections/api_op_GetConnection.go +++ b/service/codestarconnections/api_op_GetConnection.go @@ -53,6 +53,9 @@ func addOperationGetConnectionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetConnectionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_GetHost.go b/service/codestarconnections/api_op_GetHost.go index 5fd460e72e7..ec284cb5ee2 100644 --- a/service/codestarconnections/api_op_GetHost.go +++ b/service/codestarconnections/api_op_GetHost.go @@ -66,6 +66,9 @@ func addOperationGetHostMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetHostMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_ListConnections.go b/service/codestarconnections/api_op_ListConnections.go index 6f629ea8fbc..6d04415ce62 100644 --- a/service/codestarconnections/api_op_ListConnections.go +++ b/service/codestarconnections/api_op_ListConnections.go @@ -69,6 +69,9 @@ func addOperationListConnectionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListConnectionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_ListHosts.go b/service/codestarconnections/api_op_ListHosts.go index f9812678079..6081046ff74 100644 --- a/service/codestarconnections/api_op_ListHosts.go +++ b/service/codestarconnections/api_op_ListHosts.go @@ -62,6 +62,9 @@ func addOperationListHostsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListHostsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_ListTagsForResource.go b/service/codestarconnections/api_op_ListTagsForResource.go index 5f5edb284d2..cd0d78daf4a 100644 --- a/service/codestarconnections/api_op_ListTagsForResource.go +++ b/service/codestarconnections/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_TagResource.go b/service/codestarconnections/api_op_TagResource.go index 29a424af323..b236d53457e 100644 --- a/service/codestarconnections/api_op_TagResource.go +++ b/service/codestarconnections/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/api_op_UntagResource.go b/service/codestarconnections/api_op_UntagResource.go index 41c2494f1f1..06d6a95e153 100644 --- a/service/codestarconnections/api_op_UntagResource.go +++ b/service/codestarconnections/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarconnections/go.mod b/service/codestarconnections/go.mod index 918cfcc19c7..728b94172ce 100644 --- a/service/codestarconnections/go.mod +++ b/service/codestarconnections/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codestarconnections go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestarconnections/go.sum b/service/codestarconnections/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codestarconnections/go.sum +++ b/service/codestarconnections/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codestarnotifications/api_client.go b/service/codestarnotifications/api_client.go index 0efbe31c09d..90ac6eecd8e 100644 --- a/service/codestarnotifications/api_client.go +++ b/service/codestarnotifications/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/codestarnotifications/api_op_CreateNotificationRule.go b/service/codestarnotifications/api_op_CreateNotificationRule.go index fc615b938e0..269b3c4d885 100644 --- a/service/codestarnotifications/api_op_CreateNotificationRule.go +++ b/service/codestarnotifications/api_op_CreateNotificationRule.go @@ -101,6 +101,9 @@ func addOperationCreateNotificationRuleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateNotificationRuleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_DeleteNotificationRule.go b/service/codestarnotifications/api_op_DeleteNotificationRule.go index c78f8a4e8a9..715357c5d85 100644 --- a/service/codestarnotifications/api_op_DeleteNotificationRule.go +++ b/service/codestarnotifications/api_op_DeleteNotificationRule.go @@ -52,6 +52,9 @@ func addOperationDeleteNotificationRuleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteNotificationRuleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_DeleteTarget.go b/service/codestarnotifications/api_op_DeleteTarget.go index 219788467c9..f422c5b8c55 100644 --- a/service/codestarnotifications/api_op_DeleteTarget.go +++ b/service/codestarnotifications/api_op_DeleteTarget.go @@ -53,6 +53,9 @@ func addOperationDeleteTargetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteTargetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_DescribeNotificationRule.go b/service/codestarnotifications/api_op_DescribeNotificationRule.go index f62e620a71c..e369c07d11c 100644 --- a/service/codestarnotifications/api_op_DescribeNotificationRule.go +++ b/service/codestarnotifications/api_op_DescribeNotificationRule.go @@ -93,6 +93,9 @@ func addOperationDescribeNotificationRuleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeNotificationRuleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_ListEventTypes.go b/service/codestarnotifications/api_op_ListEventTypes.go index d59c958be3b..d294add48fc 100644 --- a/service/codestarnotifications/api_op_ListEventTypes.go +++ b/service/codestarnotifications/api_op_ListEventTypes.go @@ -65,6 +65,9 @@ func addOperationListEventTypesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListEventTypesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_ListNotificationRules.go b/service/codestarnotifications/api_op_ListNotificationRules.go index ed60bbacc21..c1f933ba11d 100644 --- a/service/codestarnotifications/api_op_ListNotificationRules.go +++ b/service/codestarnotifications/api_op_ListNotificationRules.go @@ -67,6 +67,9 @@ func addOperationListNotificationRulesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListNotificationRulesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_ListTagsForResource.go b/service/codestarnotifications/api_op_ListTagsForResource.go index 307209e0f0f..94b2b12eb20 100644 --- a/service/codestarnotifications/api_op_ListTagsForResource.go +++ b/service/codestarnotifications/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_ListTargets.go b/service/codestarnotifications/api_op_ListTargets.go index ae952a13f63..465e24e50c5 100644 --- a/service/codestarnotifications/api_op_ListTargets.go +++ b/service/codestarnotifications/api_op_ListTargets.go @@ -66,6 +66,9 @@ func addOperationListTargetsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListTargetsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_Subscribe.go b/service/codestarnotifications/api_op_Subscribe.go index d100f23fcd0..bae02a4c502 100644 --- a/service/codestarnotifications/api_op_Subscribe.go +++ b/service/codestarnotifications/api_op_Subscribe.go @@ -66,6 +66,9 @@ func addOperationSubscribeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationSubscribeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_TagResource.go b/service/codestarnotifications/api_op_TagResource.go index 50017068ea5..79a37949ec2 100644 --- a/service/codestarnotifications/api_op_TagResource.go +++ b/service/codestarnotifications/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_Unsubscribe.go b/service/codestarnotifications/api_op_Unsubscribe.go index 6527c44af2d..c99a24894ac 100644 --- a/service/codestarnotifications/api_op_Unsubscribe.go +++ b/service/codestarnotifications/api_op_Unsubscribe.go @@ -62,6 +62,9 @@ func addOperationUnsubscribeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUnsubscribeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_UntagResource.go b/service/codestarnotifications/api_op_UntagResource.go index 25029e83efe..0899c82980d 100644 --- a/service/codestarnotifications/api_op_UntagResource.go +++ b/service/codestarnotifications/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/api_op_UpdateNotificationRule.go b/service/codestarnotifications/api_op_UpdateNotificationRule.go index f086baafde5..82fc5e501eb 100644 --- a/service/codestarnotifications/api_op_UpdateNotificationRule.go +++ b/service/codestarnotifications/api_op_UpdateNotificationRule.go @@ -73,6 +73,9 @@ func addOperationUpdateNotificationRuleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateNotificationRuleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/codestarnotifications/go.mod b/service/codestarnotifications/go.mod index d611895f250..8cde858aaad 100644 --- a/service/codestarnotifications/go.mod +++ b/service/codestarnotifications/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/codestarnotifications go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestarnotifications/go.sum b/service/codestarnotifications/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/codestarnotifications/go.sum +++ b/service/codestarnotifications/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cognitoidentity/api_client.go b/service/cognitoidentity/api_client.go index 4113311eae8..f75a7626fc5 100644 --- a/service/cognitoidentity/api_client.go +++ b/service/cognitoidentity/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cognitoidentity/api_op_CreateIdentityPool.go b/service/cognitoidentity/api_op_CreateIdentityPool.go index d3b5f0e97ff..e96870e0ff2 100644 --- a/service/cognitoidentity/api_op_CreateIdentityPool.go +++ b/service/cognitoidentity/api_op_CreateIdentityPool.go @@ -148,6 +148,9 @@ func addOperationCreateIdentityPoolMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationCreateIdentityPoolMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_DeleteIdentities.go b/service/cognitoidentity/api_op_DeleteIdentities.go index 74540c498d4..9fa17c024b6 100644 --- a/service/cognitoidentity/api_op_DeleteIdentities.go +++ b/service/cognitoidentity/api_op_DeleteIdentities.go @@ -58,6 +58,9 @@ func addOperationDeleteIdentitiesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteIdentitiesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_DeleteIdentityPool.go b/service/cognitoidentity/api_op_DeleteIdentityPool.go index a8c3e71f3ae..77e414371ac 100644 --- a/service/cognitoidentity/api_op_DeleteIdentityPool.go +++ b/service/cognitoidentity/api_op_DeleteIdentityPool.go @@ -51,6 +51,9 @@ func addOperationDeleteIdentityPoolMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteIdentityPoolMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_DescribeIdentity.go b/service/cognitoidentity/api_op_DescribeIdentity.go index 30dc7b78a88..2f1cf34bfd6 100644 --- a/service/cognitoidentity/api_op_DescribeIdentity.go +++ b/service/cognitoidentity/api_op_DescribeIdentity.go @@ -66,6 +66,9 @@ func addOperationDescribeIdentityMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeIdentityMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_DescribeIdentityPool.go b/service/cognitoidentity/api_op_DescribeIdentityPool.go index e5c170098d0..6a0543360ae 100644 --- a/service/cognitoidentity/api_op_DescribeIdentityPool.go +++ b/service/cognitoidentity/api_op_DescribeIdentityPool.go @@ -96,6 +96,9 @@ func addOperationDescribeIdentityPoolMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationDescribeIdentityPoolMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_GetCredentialsForIdentity.go b/service/cognitoidentity/api_op_GetCredentialsForIdentity.go index 72fc610c41d..b2debc3c617 100644 --- a/service/cognitoidentity/api_op_GetCredentialsForIdentity.go +++ b/service/cognitoidentity/api_op_GetCredentialsForIdentity.go @@ -78,6 +78,9 @@ func addOperationGetCredentialsForIdentityMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetCredentialsForIdentityMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_GetId.go b/service/cognitoidentity/api_op_GetId.go index 8fdc085c0e6..3939898513d 100644 --- a/service/cognitoidentity/api_op_GetId.go +++ b/service/cognitoidentity/api_op_GetId.go @@ -78,6 +78,9 @@ func addOperationGetIdMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetIdMiddlewares(stack *middleware.Stack, options Options) (err if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_GetIdentityPoolRoles.go b/service/cognitoidentity/api_op_GetIdentityPoolRoles.go index f5acf05d0cc..daa7d6a75fe 100644 --- a/service/cognitoidentity/api_op_GetIdentityPoolRoles.go +++ b/service/cognitoidentity/api_op_GetIdentityPoolRoles.go @@ -66,6 +66,9 @@ func addOperationGetIdentityPoolRolesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetIdentityPoolRolesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_GetOpenIdToken.go b/service/cognitoidentity/api_op_GetOpenIdToken.go index d671a1a7416..13817e88497 100644 --- a/service/cognitoidentity/api_op_GetOpenIdToken.go +++ b/service/cognitoidentity/api_op_GetOpenIdToken.go @@ -68,6 +68,9 @@ func addOperationGetOpenIdTokenMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetOpenIdTokenMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go b/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go index 58714e82a24..e44c41fb090 100644 --- a/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go +++ b/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go @@ -96,6 +96,9 @@ func addOperationGetOpenIdTokenForDeveloperIdentityMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationGetOpenIdTokenForDeveloperIdentityMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_ListIdentities.go b/service/cognitoidentity/api_op_ListIdentities.go index 2068ed58288..b90d8da6952 100644 --- a/service/cognitoidentity/api_op_ListIdentities.go +++ b/service/cognitoidentity/api_op_ListIdentities.go @@ -75,6 +75,9 @@ func addOperationListIdentitiesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListIdentitiesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_ListIdentityPools.go b/service/cognitoidentity/api_op_ListIdentityPools.go index 69372c6cd79..f7be698963a 100644 --- a/service/cognitoidentity/api_op_ListIdentityPools.go +++ b/service/cognitoidentity/api_op_ListIdentityPools.go @@ -62,6 +62,9 @@ func addOperationListIdentityPoolsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListIdentityPoolsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_ListTagsForResource.go b/service/cognitoidentity/api_op_ListTagsForResource.go index 65f8bd07fc0..7bffa05f0d0 100644 --- a/service/cognitoidentity/api_op_ListTagsForResource.go +++ b/service/cognitoidentity/api_op_ListTagsForResource.go @@ -56,6 +56,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_LookupDeveloperIdentity.go b/service/cognitoidentity/api_op_LookupDeveloperIdentity.go index becb1a477e2..87bc35112d9 100644 --- a/service/cognitoidentity/api_op_LookupDeveloperIdentity.go +++ b/service/cognitoidentity/api_op_LookupDeveloperIdentity.go @@ -99,6 +99,9 @@ func addOperationLookupDeveloperIdentityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationLookupDeveloperIdentityMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_MergeDeveloperIdentities.go b/service/cognitoidentity/api_op_MergeDeveloperIdentities.go index f64581d9510..2d76b5b221d 100644 --- a/service/cognitoidentity/api_op_MergeDeveloperIdentities.go +++ b/service/cognitoidentity/api_op_MergeDeveloperIdentities.go @@ -86,6 +86,9 @@ func addOperationMergeDeveloperIdentitiesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationMergeDeveloperIdentitiesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_SetIdentityPoolRoles.go b/service/cognitoidentity/api_op_SetIdentityPoolRoles.go index fc2caac6669..a0a14ac67c7 100644 --- a/service/cognitoidentity/api_op_SetIdentityPoolRoles.go +++ b/service/cognitoidentity/api_op_SetIdentityPoolRoles.go @@ -65,6 +65,9 @@ func addOperationSetIdentityPoolRolesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSetIdentityPoolRolesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_TagResource.go b/service/cognitoidentity/api_op_TagResource.go index ec16c4eb856..be916054191 100644 --- a/service/cognitoidentity/api_op_TagResource.go +++ b/service/cognitoidentity/api_op_TagResource.go @@ -65,6 +65,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go b/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go index f23bdcb5855..a51c67674e2 100644 --- a/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go +++ b/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go @@ -68,6 +68,9 @@ func addOperationUnlinkDeveloperIdentityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUnlinkDeveloperIdentityMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_UnlinkIdentity.go b/service/cognitoidentity/api_op_UnlinkIdentity.go index fe98e96ddfe..8a525754c17 100644 --- a/service/cognitoidentity/api_op_UnlinkIdentity.go +++ b/service/cognitoidentity/api_op_UnlinkIdentity.go @@ -61,6 +61,9 @@ func addOperationUnlinkIdentityMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUnlinkIdentityMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_UntagResource.go b/service/cognitoidentity/api_op_UntagResource.go index cbfa7a8a0b6..bfd311fa908 100644 --- a/service/cognitoidentity/api_op_UntagResource.go +++ b/service/cognitoidentity/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/api_op_UpdateIdentityPool.go b/service/cognitoidentity/api_op_UpdateIdentityPool.go index 885bd980d98..6cd7020fbbe 100644 --- a/service/cognitoidentity/api_op_UpdateIdentityPool.go +++ b/service/cognitoidentity/api_op_UpdateIdentityPool.go @@ -132,6 +132,9 @@ func addOperationUpdateIdentityPoolMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationUpdateIdentityPoolMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentity/go.mod b/service/cognitoidentity/go.mod index ffd4c9ffc72..8219d652b93 100644 --- a/service/cognitoidentity/go.mod +++ b/service/cognitoidentity/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cognitoidentity go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitoidentity/go.sum b/service/cognitoidentity/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cognitoidentity/go.sum +++ b/service/cognitoidentity/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cognitoidentityprovider/api_client.go b/service/cognitoidentityprovider/api_client.go index 35f55dbc9e8..3f0685a411f 100644 --- a/service/cognitoidentityprovider/api_client.go +++ b/service/cognitoidentityprovider/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cognitoidentityprovider/api_op_AddCustomAttributes.go b/service/cognitoidentityprovider/api_op_AddCustomAttributes.go index 867334657a4..b765f244442 100644 --- a/service/cognitoidentityprovider/api_op_AddCustomAttributes.go +++ b/service/cognitoidentityprovider/api_op_AddCustomAttributes.go @@ -57,6 +57,9 @@ func addOperationAddCustomAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationAddCustomAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go b/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go index d8efb96760c..6626976fe0f 100644 --- a/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go +++ b/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go @@ -59,6 +59,9 @@ func addOperationAdminAddUserToGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAdminAddUserToGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go b/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go index 39c35d7c8e8..4dc3c9de9b0 100644 --- a/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go +++ b/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go @@ -83,6 +83,9 @@ func addOperationAdminConfirmSignUpMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationAdminConfirmSignUpMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminCreateUser.go b/service/cognitoidentityprovider/api_op_AdminCreateUser.go index 43628b1df3c..35f29ae7109 100644 --- a/service/cognitoidentityprovider/api_op_AdminCreateUser.go +++ b/service/cognitoidentityprovider/api_op_AdminCreateUser.go @@ -166,6 +166,9 @@ func addOperationAdminCreateUserMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -208,6 +211,9 @@ func addOperationAdminCreateUserMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminDeleteUser.go b/service/cognitoidentityprovider/api_op_AdminDeleteUser.go index 6f29cfd1788..9490d245329 100644 --- a/service/cognitoidentityprovider/api_op_AdminDeleteUser.go +++ b/service/cognitoidentityprovider/api_op_AdminDeleteUser.go @@ -55,6 +55,9 @@ func addOperationAdminDeleteUserMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAdminDeleteUserMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go b/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go index 90ba3bcf948..ca32e25d9be 100644 --- a/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go @@ -64,6 +64,9 @@ func addOperationAdminDeleteUserAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationAdminDeleteUserAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go b/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go index aa3c71fab15..aaafc014771 100644 --- a/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go +++ b/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go @@ -77,6 +77,9 @@ func addOperationAdminDisableProviderForUserMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAdminDisableProviderForUserMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminDisableUser.go b/service/cognitoidentityprovider/api_op_AdminDisableUser.go index f02b0a5cb24..42c391e5f3f 100644 --- a/service/cognitoidentityprovider/api_op_AdminDisableUser.go +++ b/service/cognitoidentityprovider/api_op_AdminDisableUser.go @@ -56,6 +56,9 @@ func addOperationAdminDisableUserMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAdminDisableUserMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminEnableUser.go b/service/cognitoidentityprovider/api_op_AdminEnableUser.go index c1120fefac0..e4aa00ce9bc 100644 --- a/service/cognitoidentityprovider/api_op_AdminEnableUser.go +++ b/service/cognitoidentityprovider/api_op_AdminEnableUser.go @@ -57,6 +57,9 @@ func addOperationAdminEnableUserMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationAdminEnableUserMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminForgetDevice.go b/service/cognitoidentityprovider/api_op_AdminForgetDevice.go index 56229fca0fc..a0341d29e56 100644 --- a/service/cognitoidentityprovider/api_op_AdminForgetDevice.go +++ b/service/cognitoidentityprovider/api_op_AdminForgetDevice.go @@ -60,6 +60,9 @@ func addOperationAdminForgetDeviceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAdminForgetDeviceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminGetDevice.go b/service/cognitoidentityprovider/api_op_AdminGetDevice.go index c7e873cbaa7..bd78ffdd021 100644 --- a/service/cognitoidentityprovider/api_op_AdminGetDevice.go +++ b/service/cognitoidentityprovider/api_op_AdminGetDevice.go @@ -68,6 +68,9 @@ func addOperationAdminGetDeviceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAdminGetDeviceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminGetUser.go b/service/cognitoidentityprovider/api_op_AdminGetUser.go index 9e11b40e3cd..8b0de88ebea 100644 --- a/service/cognitoidentityprovider/api_op_AdminGetUser.go +++ b/service/cognitoidentityprovider/api_op_AdminGetUser.go @@ -115,6 +115,9 @@ func addOperationAdminGetUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationAdminGetUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go b/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go index d06698690e0..9e171ef6166 100644 --- a/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go +++ b/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go @@ -250,6 +250,9 @@ func addOperationAdminInitiateAuthMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -292,6 +295,9 @@ func addOperationAdminInitiateAuthMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go b/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go index e679f2d136e..929abbb799f 100644 --- a/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go +++ b/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go @@ -96,6 +96,9 @@ func addOperationAdminLinkProviderForUserMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationAdminLinkProviderForUserMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminListDevices.go b/service/cognitoidentityprovider/api_op_AdminListDevices.go index 4d35a7b1437..8f3ab292407 100644 --- a/service/cognitoidentityprovider/api_op_AdminListDevices.go +++ b/service/cognitoidentityprovider/api_op_AdminListDevices.go @@ -70,6 +70,9 @@ func addOperationAdminListDevicesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAdminListDevicesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go b/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go index 7a2585f0aa8..a4f81554e8c 100644 --- a/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go +++ b/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go @@ -70,6 +70,9 @@ func addOperationAdminListGroupsForUserMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAdminListGroupsForUserMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go b/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go index 2a8e4ff4afc..7b66bb46bd8 100644 --- a/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go +++ b/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go @@ -69,6 +69,9 @@ func addOperationAdminListUserAuthEventsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAdminListUserAuthEventsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go b/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go index bb94e7d392b..bf13325199c 100644 --- a/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go +++ b/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go @@ -59,6 +59,9 @@ func addOperationAdminRemoveUserFromGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAdminRemoveUserFromGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go b/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go index 41822bc6f18..15f943fd933 100644 --- a/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go +++ b/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go @@ -93,6 +93,9 @@ func addOperationAdminResetUserPasswordMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationAdminResetUserPasswordMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go b/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go index 45e348160e8..2385d83ae04 100644 --- a/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go +++ b/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go @@ -153,6 +153,9 @@ func addOperationAdminRespondToAuthChallengeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -195,6 +198,9 @@ func addOperationAdminRespondToAuthChallengeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go b/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go index 94b28e9b854..bbfba4a1196 100644 --- a/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go +++ b/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go @@ -64,6 +64,9 @@ func addOperationAdminSetUserMFAPreferenceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationAdminSetUserMFAPreferenceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go b/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go index cce1997c98d..641365c236f 100644 --- a/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go +++ b/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go @@ -68,6 +68,9 @@ func addOperationAdminSetUserPasswordMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAdminSetUserPasswordMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go b/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go index ed879cf9c6a..c5065241944 100644 --- a/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go +++ b/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go @@ -68,6 +68,9 @@ func addOperationAdminSetUserSettingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAdminSetUserSettingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go b/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go index b24b8159433..8a7684369d1 100644 --- a/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go +++ b/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go @@ -66,6 +66,9 @@ func addOperationAdminUpdateAuthEventFeedbackMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationAdminUpdateAuthEventFeedbackMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go b/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go index c8e9579c94a..4f460972fbd 100644 --- a/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go +++ b/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go @@ -65,6 +65,9 @@ func addOperationAdminUpdateDeviceStatusMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAdminUpdateDeviceStatusMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go b/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go index 5a70339b4af..7e7d27fdd89 100644 --- a/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go @@ -95,6 +95,9 @@ func addOperationAdminUpdateUserAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationAdminUpdateUserAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go b/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go index 67101bd2f0c..3b9f73f6c7e 100644 --- a/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go +++ b/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go @@ -58,6 +58,9 @@ func addOperationAdminUserGlobalSignOutMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAdminUserGlobalSignOutMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go b/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go index 2d8f8256902..ea89a8d2702 100644 --- a/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go +++ b/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go @@ -62,6 +62,9 @@ func addOperationAssociateSoftwareTokenMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAssociateSoftwareTokenMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ChangePassword.go b/service/cognitoidentityprovider/api_op_ChangePassword.go index 594395451b9..d5b3e9bd9a6 100644 --- a/service/cognitoidentityprovider/api_op_ChangePassword.go +++ b/service/cognitoidentityprovider/api_op_ChangePassword.go @@ -59,6 +59,9 @@ func addOperationChangePasswordMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationChangePasswordMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ConfirmDevice.go b/service/cognitoidentityprovider/api_op_ConfirmDevice.go index b724fc0f681..3f33b219e9e 100644 --- a/service/cognitoidentityprovider/api_op_ConfirmDevice.go +++ b/service/cognitoidentityprovider/api_op_ConfirmDevice.go @@ -68,6 +68,9 @@ func addOperationConfirmDeviceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationConfirmDeviceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go b/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go index a4181b6d2a0..fd3d4fd7072 100644 --- a/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go +++ b/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go @@ -110,6 +110,9 @@ func addOperationConfirmForgotPasswordMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationConfirmForgotPasswordMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ConfirmSignUp.go b/service/cognitoidentityprovider/api_op_ConfirmSignUp.go index 6235132dae1..66650aa6f8d 100644 --- a/service/cognitoidentityprovider/api_op_ConfirmSignUp.go +++ b/service/cognitoidentityprovider/api_op_ConfirmSignUp.go @@ -110,6 +110,9 @@ func addOperationConfirmSignUpMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationConfirmSignUpMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateGroup.go b/service/cognitoidentityprovider/api_op_CreateGroup.go index b32524afc8c..60f4d137154 100644 --- a/service/cognitoidentityprovider/api_op_CreateGroup.go +++ b/service/cognitoidentityprovider/api_op_CreateGroup.go @@ -79,6 +79,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go b/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go index 7c27b1ccdd6..de7db0aad19 100644 --- a/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go @@ -144,6 +144,9 @@ func addOperationCreateIdentityProviderMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationCreateIdentityProviderMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateResourceServer.go b/service/cognitoidentityprovider/api_op_CreateResourceServer.go index f862097f563..da6cf2edb30 100644 --- a/service/cognitoidentityprovider/api_op_CreateResourceServer.go +++ b/service/cognitoidentityprovider/api_op_CreateResourceServer.go @@ -70,6 +70,9 @@ func addOperationCreateResourceServerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateResourceServerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateUserImportJob.go b/service/cognitoidentityprovider/api_op_CreateUserImportJob.go index 2b87f282a03..d5817c199a9 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_CreateUserImportJob.go @@ -66,6 +66,9 @@ func addOperationCreateUserImportJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateUserImportJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateUserPool.go b/service/cognitoidentityprovider/api_op_CreateUserPool.go index f96c21d00f9..3c67f3e078a 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserPool.go +++ b/service/cognitoidentityprovider/api_op_CreateUserPool.go @@ -140,6 +140,9 @@ func addOperationCreateUserPoolMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationCreateUserPoolMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go b/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go index 0e545c9e2ed..0abb9d8fe7f 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go @@ -208,6 +208,9 @@ func addOperationCreateUserPoolClientMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -250,6 +253,9 @@ func addOperationCreateUserPoolClientMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go b/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go index f443fd85691..6a15abbecef 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go @@ -67,6 +67,9 @@ func addOperationCreateUserPoolDomainMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateUserPoolDomainMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteGroup.go b/service/cognitoidentityprovider/api_op_DeleteGroup.go index 69965df5c15..dee19096ba5 100644 --- a/service/cognitoidentityprovider/api_op_DeleteGroup.go +++ b/service/cognitoidentityprovider/api_op_DeleteGroup.go @@ -54,6 +54,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go b/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go index 4076b17afaa..7bd2e1e491a 100644 --- a/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go @@ -53,6 +53,9 @@ func addOperationDeleteIdentityProviderMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteIdentityProviderMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteResourceServer.go b/service/cognitoidentityprovider/api_op_DeleteResourceServer.go index 7ff8af3c81c..8cef6fdf4ea 100644 --- a/service/cognitoidentityprovider/api_op_DeleteResourceServer.go +++ b/service/cognitoidentityprovider/api_op_DeleteResourceServer.go @@ -53,6 +53,9 @@ func addOperationDeleteResourceServerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteResourceServerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteUser.go b/service/cognitoidentityprovider/api_op_DeleteUser.go index e738d9753ed..c49cbc93ade 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUser.go +++ b/service/cognitoidentityprovider/api_op_DeleteUser.go @@ -48,6 +48,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go b/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go index cac9ba311ff..eac0ed2d5c1 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go @@ -56,6 +56,9 @@ func addOperationDeleteUserAttributesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteUserAttributesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteUserPool.go b/service/cognitoidentityprovider/api_op_DeleteUserPool.go index 03c2f0073fc..9a7d6c4f506 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserPool.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserPool.go @@ -49,6 +49,9 @@ func addOperationDeleteUserPoolMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteUserPoolMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go b/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go index 9b649fc68fa..845fea9125c 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go @@ -54,6 +54,9 @@ func addOperationDeleteUserPoolClientMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteUserPoolClientMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go b/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go index 66a8712846c..85aefec0e38 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go @@ -53,6 +53,9 @@ func addOperationDeleteUserPoolDomainMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteUserPoolDomainMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go b/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go index f6438f77c36..570918e00de 100644 --- a/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go @@ -60,6 +60,9 @@ func addOperationDescribeIdentityProviderMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeIdentityProviderMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeResourceServer.go b/service/cognitoidentityprovider/api_op_DescribeResourceServer.go index e98db8428d6..0053881a8a1 100644 --- a/service/cognitoidentityprovider/api_op_DescribeResourceServer.go +++ b/service/cognitoidentityprovider/api_op_DescribeResourceServer.go @@ -60,6 +60,9 @@ func addOperationDescribeResourceServerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeResourceServerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go b/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go index cbc43d2b982..1d4d48c2ee9 100644 --- a/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go +++ b/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go @@ -58,6 +58,9 @@ func addOperationDescribeRiskConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeRiskConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go b/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go index 739c3cb0717..451c12db525 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go @@ -61,6 +61,9 @@ func addOperationDescribeUserImportJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeUserImportJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeUserPool.go b/service/cognitoidentityprovider/api_op_DescribeUserPool.go index 0cfa8f43047..83f3d0fe134 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserPool.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserPool.go @@ -55,6 +55,9 @@ func addOperationDescribeUserPoolMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeUserPoolMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go b/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go index bcfc878d26f..469abe0bfc2 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go @@ -62,6 +62,9 @@ func addOperationDescribeUserPoolClientMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeUserPoolClientMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go b/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go index 4850eb24b3b..1bf9d8435c0 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go @@ -53,6 +53,9 @@ func addOperationDescribeUserPoolDomainMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeUserPoolDomainMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ForgetDevice.go b/service/cognitoidentityprovider/api_op_ForgetDevice.go index 4e8cbfd98c3..fc0e54dc412 100644 --- a/service/cognitoidentityprovider/api_op_ForgetDevice.go +++ b/service/cognitoidentityprovider/api_op_ForgetDevice.go @@ -52,6 +52,9 @@ func addOperationForgetDeviceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationForgetDeviceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ForgotPassword.go b/service/cognitoidentityprovider/api_op_ForgotPassword.go index fbe3ee4cfc2..b00b4fe85bc 100644 --- a/service/cognitoidentityprovider/api_op_ForgotPassword.go +++ b/service/cognitoidentityprovider/api_op_ForgotPassword.go @@ -112,6 +112,9 @@ func addOperationForgotPasswordMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationForgotPasswordMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetCSVHeader.go b/service/cognitoidentityprovider/api_op_GetCSVHeader.go index eb166c19aef..dc8f5d3c0dd 100644 --- a/service/cognitoidentityprovider/api_op_GetCSVHeader.go +++ b/service/cognitoidentityprovider/api_op_GetCSVHeader.go @@ -60,6 +60,9 @@ func addOperationGetCSVHeaderMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetCSVHeaderMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetDevice.go b/service/cognitoidentityprovider/api_op_GetDevice.go index 5b8e1b29e12..fe842476af8 100644 --- a/service/cognitoidentityprovider/api_op_GetDevice.go +++ b/service/cognitoidentityprovider/api_op_GetDevice.go @@ -60,6 +60,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetGroup.go b/service/cognitoidentityprovider/api_op_GetGroup.go index d9dd56c8481..0f0e8819925 100644 --- a/service/cognitoidentityprovider/api_op_GetGroup.go +++ b/service/cognitoidentityprovider/api_op_GetGroup.go @@ -58,6 +58,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go b/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go index 1e568cd7c91..4fdc4aeab70 100644 --- a/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go +++ b/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go @@ -60,6 +60,9 @@ func addOperationGetIdentityProviderByIdentifierMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetIdentityProviderByIdentifierMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetSigningCertificate.go b/service/cognitoidentityprovider/api_op_GetSigningCertificate.go index 834da31e96e..7f7398c6f1c 100644 --- a/service/cognitoidentityprovider/api_op_GetSigningCertificate.go +++ b/service/cognitoidentityprovider/api_op_GetSigningCertificate.go @@ -54,6 +54,9 @@ func addOperationGetSigningCertificateMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetSigningCertificateMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetUICustomization.go b/service/cognitoidentityprovider/api_op_GetUICustomization.go index a65c73e1dd1..e07b568b6d4 100644 --- a/service/cognitoidentityprovider/api_op_GetUICustomization.go +++ b/service/cognitoidentityprovider/api_op_GetUICustomization.go @@ -61,6 +61,9 @@ func addOperationGetUICustomizationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetUICustomizationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetUser.go b/service/cognitoidentityprovider/api_op_GetUser.go index 880693e08e2..0d5fc871c3e 100644 --- a/service/cognitoidentityprovider/api_op_GetUser.go +++ b/service/cognitoidentityprovider/api_op_GetUser.go @@ -77,6 +77,9 @@ func addOperationGetUserMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetUserMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go b/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go index 206713aff58..e1869af71d9 100644 --- a/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go +++ b/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go @@ -92,6 +92,9 @@ func addOperationGetUserAttributeVerificationCodeMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetUserAttributeVerificationCodeMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go b/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go index a5c868690ef..2e97182857a 100644 --- a/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go +++ b/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go @@ -68,6 +68,9 @@ func addOperationGetUserPoolMfaConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetUserPoolMfaConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_GlobalSignOut.go b/service/cognitoidentityprovider/api_op_GlobalSignOut.go index 98fc6437754..0291802f364 100644 --- a/service/cognitoidentityprovider/api_op_GlobalSignOut.go +++ b/service/cognitoidentityprovider/api_op_GlobalSignOut.go @@ -52,6 +52,9 @@ func addOperationGlobalSignOutMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGlobalSignOutMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_InitiateAuth.go b/service/cognitoidentityprovider/api_op_InitiateAuth.go index 54535cb1703..4ba66e59519 100644 --- a/service/cognitoidentityprovider/api_op_InitiateAuth.go +++ b/service/cognitoidentityprovider/api_op_InitiateAuth.go @@ -221,6 +221,9 @@ func addOperationInitiateAuthMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -257,6 +260,9 @@ func addOperationInitiateAuthMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListDevices.go b/service/cognitoidentityprovider/api_op_ListDevices.go index 35ab916520c..e199fd92835 100644 --- a/service/cognitoidentityprovider/api_op_ListDevices.go +++ b/service/cognitoidentityprovider/api_op_ListDevices.go @@ -64,6 +64,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListGroups.go b/service/cognitoidentityprovider/api_op_ListGroups.go index 528f3b66582..900516d7593 100644 --- a/service/cognitoidentityprovider/api_op_ListGroups.go +++ b/service/cognitoidentityprovider/api_op_ListGroups.go @@ -65,6 +65,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListIdentityProviders.go b/service/cognitoidentityprovider/api_op_ListIdentityProviders.go index df7a831977b..5e3af0435cb 100644 --- a/service/cognitoidentityprovider/api_op_ListIdentityProviders.go +++ b/service/cognitoidentityprovider/api_op_ListIdentityProviders.go @@ -64,6 +64,9 @@ func addOperationListIdentityProvidersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListIdentityProvidersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListResourceServers.go b/service/cognitoidentityprovider/api_op_ListResourceServers.go index a6dc0527bcd..15efc75aad3 100644 --- a/service/cognitoidentityprovider/api_op_ListResourceServers.go +++ b/service/cognitoidentityprovider/api_op_ListResourceServers.go @@ -64,6 +64,9 @@ func addOperationListResourceServersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListResourceServersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListTagsForResource.go b/service/cognitoidentityprovider/api_op_ListTagsForResource.go index 63f19ad9205..09e0971f728 100644 --- a/service/cognitoidentityprovider/api_op_ListTagsForResource.go +++ b/service/cognitoidentityprovider/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListUserImportJobs.go b/service/cognitoidentityprovider/api_op_ListUserImportJobs.go index ca7080662d4..1bcee359e56 100644 --- a/service/cognitoidentityprovider/api_op_ListUserImportJobs.go +++ b/service/cognitoidentityprovider/api_op_ListUserImportJobs.go @@ -69,6 +69,9 @@ func addOperationListUserImportJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListUserImportJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListUserPoolClients.go b/service/cognitoidentityprovider/api_op_ListUserPoolClients.go index 08a374309c3..2fe0277f70d 100644 --- a/service/cognitoidentityprovider/api_op_ListUserPoolClients.go +++ b/service/cognitoidentityprovider/api_op_ListUserPoolClients.go @@ -67,6 +67,9 @@ func addOperationListUserPoolClientsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListUserPoolClientsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListUserPools.go b/service/cognitoidentityprovider/api_op_ListUserPools.go index c734652976f..9c1964c2612 100644 --- a/service/cognitoidentityprovider/api_op_ListUserPools.go +++ b/service/cognitoidentityprovider/api_op_ListUserPools.go @@ -64,6 +64,9 @@ func addOperationListUserPoolsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListUserPoolsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListUsers.go b/service/cognitoidentityprovider/api_op_ListUsers.go index e0180fd6a58..261d709c970 100644 --- a/service/cognitoidentityprovider/api_op_ListUsers.go +++ b/service/cognitoidentityprovider/api_op_ListUsers.go @@ -121,6 +121,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ListUsersInGroup.go b/service/cognitoidentityprovider/api_op_ListUsersInGroup.go index dfbfbcd367a..148ad313a2e 100644 --- a/service/cognitoidentityprovider/api_op_ListUsersInGroup.go +++ b/service/cognitoidentityprovider/api_op_ListUsersInGroup.go @@ -70,6 +70,9 @@ func addOperationListUsersInGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListUsersInGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go b/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go index be17c406ef7..df52a05652f 100644 --- a/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go +++ b/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go @@ -103,6 +103,9 @@ func addOperationResendConfirmationCodeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationResendConfirmationCodeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go b/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go index 98d89993e78..b5f7cf7ad9f 100644 --- a/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go +++ b/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go @@ -146,6 +146,9 @@ func addOperationRespondToAuthChallengeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationRespondToAuthChallengeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go b/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go index 339e0b4a4da..3e5e8e938d0 100644 --- a/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go +++ b/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go @@ -74,6 +74,9 @@ func addOperationSetRiskConfigurationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationSetRiskConfigurationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_SetUICustomization.go b/service/cognitoidentityprovider/api_op_SetUICustomization.go index 2617cd63387..b93ca106509 100644 --- a/service/cognitoidentityprovider/api_op_SetUICustomization.go +++ b/service/cognitoidentityprovider/api_op_SetUICustomization.go @@ -71,6 +71,9 @@ func addOperationSetUICustomizationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSetUICustomizationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go b/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go index f5e92a02df4..8e8df02c874 100644 --- a/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go +++ b/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go @@ -60,6 +60,9 @@ func addOperationSetUserMFAPreferenceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationSetUserMFAPreferenceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go b/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go index 49a91ef940f..e7756b519c6 100644 --- a/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go +++ b/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go @@ -84,6 +84,9 @@ func addOperationSetUserPoolMfaConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationSetUserPoolMfaConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_SetUserSettings.go b/service/cognitoidentityprovider/api_op_SetUserSettings.go index 0effb9d3275..df9f6956bec 100644 --- a/service/cognitoidentityprovider/api_op_SetUserSettings.go +++ b/service/cognitoidentityprovider/api_op_SetUserSettings.go @@ -60,6 +60,9 @@ func addOperationSetUserSettingsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationSetUserSettingsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_SignUp.go b/service/cognitoidentityprovider/api_op_SignUp.go index 666e227ed1f..1a4c0dac2e1 100644 --- a/service/cognitoidentityprovider/api_op_SignUp.go +++ b/service/cognitoidentityprovider/api_op_SignUp.go @@ -124,6 +124,9 @@ func addOperationSignUpMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationSignUpMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_StartUserImportJob.go b/service/cognitoidentityprovider/api_op_StartUserImportJob.go index a52fed58e00..2b1a4a9966a 100644 --- a/service/cognitoidentityprovider/api_op_StartUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_StartUserImportJob.go @@ -61,6 +61,9 @@ func addOperationStartUserImportJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationStartUserImportJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_StopUserImportJob.go b/service/cognitoidentityprovider/api_op_StopUserImportJob.go index 7a47b86f502..1e4d678ede4 100644 --- a/service/cognitoidentityprovider/api_op_StopUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_StopUserImportJob.go @@ -61,6 +61,9 @@ func addOperationStopUserImportJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationStopUserImportJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_TagResource.go b/service/cognitoidentityprovider/api_op_TagResource.go index 414cfefc3e3..9dfac20e67f 100644 --- a/service/cognitoidentityprovider/api_op_TagResource.go +++ b/service/cognitoidentityprovider/api_op_TagResource.go @@ -65,6 +65,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UntagResource.go b/service/cognitoidentityprovider/api_op_UntagResource.go index 7bd0d4caaa7..ffa8c5ca636 100644 --- a/service/cognitoidentityprovider/api_op_UntagResource.go +++ b/service/cognitoidentityprovider/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go b/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go index c241cfbdc89..26522469afb 100644 --- a/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go +++ b/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go @@ -71,6 +71,9 @@ func addOperationUpdateAuthEventFeedbackMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateAuthEventFeedbackMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go b/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go index 4cf68c5f301..f041e3ec4ea 100644 --- a/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go +++ b/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go @@ -59,6 +59,9 @@ func addOperationUpdateDeviceStatusMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateDeviceStatusMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateGroup.go b/service/cognitoidentityprovider/api_op_UpdateGroup.go index e1123ee20b1..0b94ffa9bc7 100644 --- a/service/cognitoidentityprovider/api_op_UpdateGroup.go +++ b/service/cognitoidentityprovider/api_op_UpdateGroup.go @@ -72,6 +72,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go b/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go index 32048714503..75a1184fe84 100644 --- a/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go @@ -70,6 +70,9 @@ func addOperationUpdateIdentityProviderMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateIdentityProviderMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateResourceServer.go b/service/cognitoidentityprovider/api_op_UpdateResourceServer.go index 5010f6fdd25..300707a5727 100644 --- a/service/cognitoidentityprovider/api_op_UpdateResourceServer.go +++ b/service/cognitoidentityprovider/api_op_UpdateResourceServer.go @@ -70,6 +70,9 @@ func addOperationUpdateResourceServerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateResourceServerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go b/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go index a81fe674d14..71283c93fab 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go @@ -90,6 +90,9 @@ func addOperationUpdateUserAttributesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateUserAttributesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateUserPool.go b/service/cognitoidentityprovider/api_op_UpdateUserPool.go index fca6c33fdf1..c5feb47f8fd 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserPool.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserPool.go @@ -125,6 +125,9 @@ func addOperationUpdateUserPoolMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationUpdateUserPoolMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go b/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go index 07ed9c3aea3..7588eaed4bb 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go @@ -203,6 +203,9 @@ func addOperationUpdateUserPoolClientMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -245,6 +248,9 @@ func addOperationUpdateUserPoolClientMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go b/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go index 10e9ea5480d..e662485fef8 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go @@ -90,6 +90,9 @@ func addOperationUpdateUserPoolDomainMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationUpdateUserPoolDomainMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go b/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go index fe821226f8e..3d7638b83b3 100644 --- a/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go +++ b/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go @@ -71,6 +71,9 @@ func addOperationVerifySoftwareTokenMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationVerifySoftwareTokenMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go b/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go index 82b74426520..2d1a6c63477 100644 --- a/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go +++ b/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go @@ -60,6 +60,9 @@ func addOperationVerifyUserAttributeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationVerifyUserAttributeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitoidentityprovider/go.mod b/service/cognitoidentityprovider/go.mod index 3f4059e2810..a6535ab5e8a 100644 --- a/service/cognitoidentityprovider/go.mod +++ b/service/cognitoidentityprovider/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitoidentityprovider/go.sum b/service/cognitoidentityprovider/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cognitoidentityprovider/go.sum +++ b/service/cognitoidentityprovider/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cognitosync/api_client.go b/service/cognitosync/api_client.go index 6bd17b235a6..0db41a7b970 100644 --- a/service/cognitosync/api_client.go +++ b/service/cognitosync/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/cognitosync/api_op_BulkPublish.go b/service/cognitosync/api_op_BulkPublish.go index 11f619bfb98..c78590a5006 100644 --- a/service/cognitosync/api_op_BulkPublish.go +++ b/service/cognitosync/api_op_BulkPublish.go @@ -61,6 +61,9 @@ func addOperationBulkPublishMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationBulkPublishMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_DeleteDataset.go b/service/cognitosync/api_op_DeleteDataset.go index 952ccabd0df..40357e941a8 100644 --- a/service/cognitosync/api_op_DeleteDataset.go +++ b/service/cognitosync/api_op_DeleteDataset.go @@ -76,6 +76,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_DescribeDataset.go b/service/cognitosync/api_op_DescribeDataset.go index a966895d492..d73690eb932 100644 --- a/service/cognitosync/api_op_DescribeDataset.go +++ b/service/cognitosync/api_op_DescribeDataset.go @@ -78,6 +78,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_DescribeIdentityPoolUsage.go b/service/cognitosync/api_op_DescribeIdentityPoolUsage.go index ce296bae600..a7dc85bc19b 100644 --- a/service/cognitosync/api_op_DescribeIdentityPoolUsage.go +++ b/service/cognitosync/api_op_DescribeIdentityPoolUsage.go @@ -58,6 +58,9 @@ func addOperationDescribeIdentityPoolUsageMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeIdentityPoolUsageMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_DescribeIdentityUsage.go b/service/cognitosync/api_op_DescribeIdentityUsage.go index 50a78fc69d6..8542051a306 100644 --- a/service/cognitosync/api_op_DescribeIdentityUsage.go +++ b/service/cognitosync/api_op_DescribeIdentityUsage.go @@ -64,6 +64,9 @@ func addOperationDescribeIdentityUsageMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeIdentityUsageMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_GetBulkPublishDetails.go b/service/cognitosync/api_op_GetBulkPublishDetails.go index 89b9740bb47..7e23a12425c 100644 --- a/service/cognitosync/api_op_GetBulkPublishDetails.go +++ b/service/cognitosync/api_op_GetBulkPublishDetails.go @@ -86,6 +86,9 @@ func addOperationGetBulkPublishDetailsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetBulkPublishDetailsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_GetCognitoEvents.go b/service/cognitosync/api_op_GetCognitoEvents.go index fb971abd376..6441b13e4c1 100644 --- a/service/cognitosync/api_op_GetCognitoEvents.go +++ b/service/cognitosync/api_op_GetCognitoEvents.go @@ -57,6 +57,9 @@ func addOperationGetCognitoEventsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetCognitoEventsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_GetIdentityPoolConfiguration.go b/service/cognitosync/api_op_GetIdentityPoolConfiguration.go index 88911faa671..69042e9246e 100644 --- a/service/cognitosync/api_op_GetIdentityPoolConfiguration.go +++ b/service/cognitosync/api_op_GetIdentityPoolConfiguration.go @@ -66,6 +66,9 @@ func addOperationGetIdentityPoolConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetIdentityPoolConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_ListDatasets.go b/service/cognitosync/api_op_ListDatasets.go index f562ab2c612..d82cf79e389 100644 --- a/service/cognitosync/api_op_ListDatasets.go +++ b/service/cognitosync/api_op_ListDatasets.go @@ -79,6 +79,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_ListIdentityPoolUsage.go b/service/cognitosync/api_op_ListIdentityPoolUsage.go index 463b4d44f1b..4d300e2cfbd 100644 --- a/service/cognitosync/api_op_ListIdentityPoolUsage.go +++ b/service/cognitosync/api_op_ListIdentityPoolUsage.go @@ -67,6 +67,9 @@ func addOperationListIdentityPoolUsageMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListIdentityPoolUsageMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_ListRecords.go b/service/cognitosync/api_op_ListRecords.go index d99b620a8ae..248cb8915e4 100644 --- a/service/cognitosync/api_op_ListRecords.go +++ b/service/cognitosync/api_op_ListRecords.go @@ -109,6 +109,9 @@ func addOperationListRecordsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationListRecordsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_RegisterDevice.go b/service/cognitosync/api_op_RegisterDevice.go index 0c63a55faa6..d924baa7155 100644 --- a/service/cognitosync/api_op_RegisterDevice.go +++ b/service/cognitosync/api_op_RegisterDevice.go @@ -74,6 +74,9 @@ func addOperationRegisterDeviceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationRegisterDeviceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_SetCognitoEvents.go b/service/cognitosync/api_op_SetCognitoEvents.go index 52b9f7d33b0..109aa8dcf3c 100644 --- a/service/cognitosync/api_op_SetCognitoEvents.go +++ b/service/cognitosync/api_op_SetCognitoEvents.go @@ -58,6 +58,9 @@ func addOperationSetCognitoEventsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationSetCognitoEventsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_SetIdentityPoolConfiguration.go b/service/cognitosync/api_op_SetIdentityPoolConfiguration.go index 4eae2bb5da7..d924e044d14 100644 --- a/service/cognitosync/api_op_SetIdentityPoolConfiguration.go +++ b/service/cognitosync/api_op_SetIdentityPoolConfiguration.go @@ -71,6 +71,9 @@ func addOperationSetIdentityPoolConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSetIdentityPoolConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_SubscribeToDataset.go b/service/cognitosync/api_op_SubscribeToDataset.go index 6c2c83cc129..81f39243015 100644 --- a/service/cognitosync/api_op_SubscribeToDataset.go +++ b/service/cognitosync/api_op_SubscribeToDataset.go @@ -68,6 +68,9 @@ func addOperationSubscribeToDatasetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationSubscribeToDatasetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_UnsubscribeFromDataset.go b/service/cognitosync/api_op_UnsubscribeFromDataset.go index 96695bb4340..8d49077886c 100644 --- a/service/cognitosync/api_op_UnsubscribeFromDataset.go +++ b/service/cognitosync/api_op_UnsubscribeFromDataset.go @@ -68,6 +68,9 @@ func addOperationUnsubscribeFromDatasetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUnsubscribeFromDatasetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/api_op_UpdateRecords.go b/service/cognitosync/api_op_UpdateRecords.go index 6095674ff12..79c170abec7 100644 --- a/service/cognitosync/api_op_UpdateRecords.go +++ b/service/cognitosync/api_op_UpdateRecords.go @@ -96,6 +96,9 @@ func addOperationUpdateRecordsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationUpdateRecordsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/cognitosync/go.mod b/service/cognitosync/go.mod index 8c1f7351606..9a49b733739 100644 --- a/service/cognitosync/go.mod +++ b/service/cognitosync/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/cognitosync go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitosync/go.sum b/service/cognitosync/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/cognitosync/go.sum +++ b/service/cognitosync/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/comprehend/api_client.go b/service/comprehend/api_client.go index 95d38bce69c..3cf409fe8b6 100644 --- a/service/comprehend/api_client.go +++ b/service/comprehend/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/comprehend/api_op_BatchDetectDominantLanguage.go b/service/comprehend/api_op_BatchDetectDominantLanguage.go index 24fb802988e..383207e895e 100644 --- a/service/comprehend/api_op_BatchDetectDominantLanguage.go +++ b/service/comprehend/api_op_BatchDetectDominantLanguage.go @@ -71,6 +71,9 @@ func addOperationBatchDetectDominantLanguageMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchDetectDominantLanguageMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_BatchDetectEntities.go b/service/comprehend/api_op_BatchDetectEntities.go index 9ddde788ef1..ffdbe67f368 100644 --- a/service/comprehend/api_op_BatchDetectEntities.go +++ b/service/comprehend/api_op_BatchDetectEntities.go @@ -77,6 +77,9 @@ func addOperationBatchDetectEntitiesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationBatchDetectEntitiesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_BatchDetectKeyPhrases.go b/service/comprehend/api_op_BatchDetectKeyPhrases.go index 74b75f93bec..1c94a7ec525 100644 --- a/service/comprehend/api_op_BatchDetectKeyPhrases.go +++ b/service/comprehend/api_op_BatchDetectKeyPhrases.go @@ -75,6 +75,9 @@ func addOperationBatchDetectKeyPhrasesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationBatchDetectKeyPhrasesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_BatchDetectSentiment.go b/service/comprehend/api_op_BatchDetectSentiment.go index b783ca0688a..9e78eadcc65 100644 --- a/service/comprehend/api_op_BatchDetectSentiment.go +++ b/service/comprehend/api_op_BatchDetectSentiment.go @@ -76,6 +76,9 @@ func addOperationBatchDetectSentimentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationBatchDetectSentimentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_BatchDetectSyntax.go b/service/comprehend/api_op_BatchDetectSyntax.go index a2698c5ba32..d1aaa691c11 100644 --- a/service/comprehend/api_op_BatchDetectSyntax.go +++ b/service/comprehend/api_op_BatchDetectSyntax.go @@ -78,6 +78,9 @@ func addOperationBatchDetectSyntaxMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationBatchDetectSyntaxMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ClassifyDocument.go b/service/comprehend/api_op_ClassifyDocument.go index caed5e52ceb..49338b71e32 100644 --- a/service/comprehend/api_op_ClassifyDocument.go +++ b/service/comprehend/api_op_ClassifyDocument.go @@ -69,6 +69,9 @@ func addOperationClassifyDocumentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationClassifyDocumentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_CreateDocumentClassifier.go b/service/comprehend/api_op_CreateDocumentClassifier.go index 67c1e143216..61fb66543ff 100644 --- a/service/comprehend/api_op_CreateDocumentClassifier.go +++ b/service/comprehend/api_op_CreateDocumentClassifier.go @@ -116,6 +116,9 @@ func addOperationCreateDocumentClassifierMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationCreateDocumentClassifierMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_CreateEndpoint.go b/service/comprehend/api_op_CreateEndpoint.go index 44fe8087ce3..89e490ef938 100644 --- a/service/comprehend/api_op_CreateEndpoint.go +++ b/service/comprehend/api_op_CreateEndpoint.go @@ -79,6 +79,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_CreateEntityRecognizer.go b/service/comprehend/api_op_CreateEntityRecognizer.go index ff0382d9644..5a9383eaddc 100644 --- a/service/comprehend/api_op_CreateEntityRecognizer.go +++ b/service/comprehend/api_op_CreateEntityRecognizer.go @@ -106,6 +106,9 @@ func addOperationCreateEntityRecognizerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateEntityRecognizerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DeleteDocumentClassifier.go b/service/comprehend/api_op_DeleteDocumentClassifier.go index 1fc8c8481fa..9ffc09dfe09 100644 --- a/service/comprehend/api_op_DeleteDocumentClassifier.go +++ b/service/comprehend/api_op_DeleteDocumentClassifier.go @@ -53,6 +53,9 @@ func addOperationDeleteDocumentClassifierMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteDocumentClassifierMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DeleteEndpoint.go b/service/comprehend/api_op_DeleteEndpoint.go index 128017ec528..89324b70ce1 100644 --- a/service/comprehend/api_op_DeleteEndpoint.go +++ b/service/comprehend/api_op_DeleteEndpoint.go @@ -49,6 +49,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DeleteEntityRecognizer.go b/service/comprehend/api_op_DeleteEntityRecognizer.go index 83960762bcf..a753cdfb991 100644 --- a/service/comprehend/api_op_DeleteEntityRecognizer.go +++ b/service/comprehend/api_op_DeleteEntityRecognizer.go @@ -53,6 +53,9 @@ func addOperationDeleteEntityRecognizerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteEntityRecognizerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeDocumentClassificationJob.go b/service/comprehend/api_op_DescribeDocumentClassificationJob.go index 01a0a754298..58db50d60ab 100644 --- a/service/comprehend/api_op_DescribeDocumentClassificationJob.go +++ b/service/comprehend/api_op_DescribeDocumentClassificationJob.go @@ -56,6 +56,9 @@ func addOperationDescribeDocumentClassificationJobMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeDocumentClassificationJobMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeDocumentClassifier.go b/service/comprehend/api_op_DescribeDocumentClassifier.go index 47311119521..275c11c20d1 100644 --- a/service/comprehend/api_op_DescribeDocumentClassifier.go +++ b/service/comprehend/api_op_DescribeDocumentClassifier.go @@ -54,6 +54,9 @@ func addOperationDescribeDocumentClassifierMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeDocumentClassifierMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go b/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go index 32985bf997b..ccb51d3038e 100644 --- a/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go +++ b/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go @@ -56,6 +56,9 @@ func addOperationDescribeDominantLanguageDetectionJobMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeDominantLanguageDetectionJobMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeEndpoint.go b/service/comprehend/api_op_DescribeEndpoint.go index dd3d2f28841..7e05fc400f4 100644 --- a/service/comprehend/api_op_DescribeEndpoint.go +++ b/service/comprehend/api_op_DescribeEndpoint.go @@ -54,6 +54,9 @@ func addOperationDescribeEndpointMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeEndpointMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeEntitiesDetectionJob.go b/service/comprehend/api_op_DescribeEntitiesDetectionJob.go index 9baccd5d9cc..32a14fa80f6 100644 --- a/service/comprehend/api_op_DescribeEntitiesDetectionJob.go +++ b/service/comprehend/api_op_DescribeEntitiesDetectionJob.go @@ -56,6 +56,9 @@ func addOperationDescribeEntitiesDetectionJobMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeEntitiesDetectionJobMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeEntityRecognizer.go b/service/comprehend/api_op_DescribeEntityRecognizer.go index ea662e393ae..5ecfa932d0c 100644 --- a/service/comprehend/api_op_DescribeEntityRecognizer.go +++ b/service/comprehend/api_op_DescribeEntityRecognizer.go @@ -54,6 +54,9 @@ func addOperationDescribeEntityRecognizerMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeEntityRecognizerMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go b/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go index 16b093bc074..61cf48113c7 100644 --- a/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go +++ b/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go @@ -56,6 +56,9 @@ func addOperationDescribeKeyPhrasesDetectionJobMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeKeyPhrasesDetectionJobMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribePiiEntitiesDetectionJob.go b/service/comprehend/api_op_DescribePiiEntitiesDetectionJob.go index 5932cbafde9..68c34788141 100644 --- a/service/comprehend/api_op_DescribePiiEntitiesDetectionJob.go +++ b/service/comprehend/api_op_DescribePiiEntitiesDetectionJob.go @@ -55,6 +55,9 @@ func addOperationDescribePiiEntitiesDetectionJobMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribePiiEntitiesDetectionJobMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeSentimentDetectionJob.go b/service/comprehend/api_op_DescribeSentimentDetectionJob.go index 923af24a37d..177205fce04 100644 --- a/service/comprehend/api_op_DescribeSentimentDetectionJob.go +++ b/service/comprehend/api_op_DescribeSentimentDetectionJob.go @@ -56,6 +56,9 @@ func addOperationDescribeSentimentDetectionJobMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeSentimentDetectionJobMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DescribeTopicsDetectionJob.go b/service/comprehend/api_op_DescribeTopicsDetectionJob.go index 1cda50cdfcf..91356aa6c24 100644 --- a/service/comprehend/api_op_DescribeTopicsDetectionJob.go +++ b/service/comprehend/api_op_DescribeTopicsDetectionJob.go @@ -54,6 +54,9 @@ func addOperationDescribeTopicsDetectionJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeTopicsDetectionJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DetectDominantLanguage.go b/service/comprehend/api_op_DetectDominantLanguage.go index 97af342646e..e7d450bf1b6 100644 --- a/service/comprehend/api_op_DetectDominantLanguage.go +++ b/service/comprehend/api_op_DetectDominantLanguage.go @@ -60,6 +60,9 @@ func addOperationDetectDominantLanguageMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDetectDominantLanguageMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DetectEntities.go b/service/comprehend/api_op_DetectEntities.go index 190dd2132c2..19b37dc06ae 100644 --- a/service/comprehend/api_op_DetectEntities.go +++ b/service/comprehend/api_op_DetectEntities.go @@ -76,6 +76,9 @@ func addOperationDetectEntitiesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDetectEntitiesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DetectKeyPhrases.go b/service/comprehend/api_op_DetectKeyPhrases.go index c7093a81fb9..0758f4de8f2 100644 --- a/service/comprehend/api_op_DetectKeyPhrases.go +++ b/service/comprehend/api_op_DetectKeyPhrases.go @@ -64,6 +64,9 @@ func addOperationDetectKeyPhrasesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDetectKeyPhrasesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DetectPiiEntities.go b/service/comprehend/api_op_DetectPiiEntities.go index d433bbe6e8c..26179d8592a 100644 --- a/service/comprehend/api_op_DetectPiiEntities.go +++ b/service/comprehend/api_op_DetectPiiEntities.go @@ -62,6 +62,9 @@ func addOperationDetectPiiEntitiesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDetectPiiEntitiesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DetectSentiment.go b/service/comprehend/api_op_DetectSentiment.go index 98cb30ca645..caa90087700 100644 --- a/service/comprehend/api_op_DetectSentiment.go +++ b/service/comprehend/api_op_DetectSentiment.go @@ -66,6 +66,9 @@ func addOperationDetectSentimentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetectSentimentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_DetectSyntax.go b/service/comprehend/api_op_DetectSyntax.go index bdfdd80ff3f..18b840aaf1d 100644 --- a/service/comprehend/api_op_DetectSyntax.go +++ b/service/comprehend/api_op_DetectSyntax.go @@ -65,6 +65,9 @@ func addOperationDetectSyntaxMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDetectSyntaxMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListDocumentClassificationJobs.go b/service/comprehend/api_op_ListDocumentClassificationJobs.go index 369d6a1201a..0590b2fa305 100644 --- a/service/comprehend/api_op_ListDocumentClassificationJobs.go +++ b/service/comprehend/api_op_ListDocumentClassificationJobs.go @@ -62,6 +62,9 @@ func addOperationListDocumentClassificationJobsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListDocumentClassificationJobsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListDocumentClassifiers.go b/service/comprehend/api_op_ListDocumentClassifiers.go index d77b0643262..70a369459a7 100644 --- a/service/comprehend/api_op_ListDocumentClassifiers.go +++ b/service/comprehend/api_op_ListDocumentClassifiers.go @@ -62,6 +62,9 @@ func addOperationListDocumentClassifiersMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListDocumentClassifiersMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go b/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go index 2a2f7e99452..63684317452 100644 --- a/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go +++ b/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go @@ -62,6 +62,9 @@ func addOperationListDominantLanguageDetectionJobsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListDominantLanguageDetectionJobsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListEndpoints.go b/service/comprehend/api_op_ListEndpoints.go index 2fd7f675778..62f28ef5f30 100644 --- a/service/comprehend/api_op_ListEndpoints.go +++ b/service/comprehend/api_op_ListEndpoints.go @@ -63,6 +63,9 @@ func addOperationListEndpointsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListEndpointsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListEntitiesDetectionJobs.go b/service/comprehend/api_op_ListEntitiesDetectionJobs.go index d16ca0d1db3..86d9e7ed877 100644 --- a/service/comprehend/api_op_ListEntitiesDetectionJobs.go +++ b/service/comprehend/api_op_ListEntitiesDetectionJobs.go @@ -62,6 +62,9 @@ func addOperationListEntitiesDetectionJobsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListEntitiesDetectionJobsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListEntityRecognizers.go b/service/comprehend/api_op_ListEntityRecognizers.go index 96988e3d4b8..237063ff1a1 100644 --- a/service/comprehend/api_op_ListEntityRecognizers.go +++ b/service/comprehend/api_op_ListEntityRecognizers.go @@ -66,6 +66,9 @@ func addOperationListEntityRecognizersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListEntityRecognizersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go b/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go index 5281b1ce706..ad0ccaad612 100644 --- a/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go +++ b/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go @@ -62,6 +62,9 @@ func addOperationListKeyPhrasesDetectionJobsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListKeyPhrasesDetectionJobsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListPiiEntitiesDetectionJobs.go b/service/comprehend/api_op_ListPiiEntitiesDetectionJobs.go index 28f1e24d116..15be831fc57 100644 --- a/service/comprehend/api_op_ListPiiEntitiesDetectionJobs.go +++ b/service/comprehend/api_op_ListPiiEntitiesDetectionJobs.go @@ -62,6 +62,9 @@ func addOperationListPiiEntitiesDetectionJobsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListPiiEntitiesDetectionJobsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListSentimentDetectionJobs.go b/service/comprehend/api_op_ListSentimentDetectionJobs.go index 296d0c73c40..d7a47965c58 100644 --- a/service/comprehend/api_op_ListSentimentDetectionJobs.go +++ b/service/comprehend/api_op_ListSentimentDetectionJobs.go @@ -62,6 +62,9 @@ func addOperationListSentimentDetectionJobsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListSentimentDetectionJobsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListTagsForResource.go b/service/comprehend/api_op_ListTagsForResource.go index 5373d38c16c..eedf6fbb556 100644 --- a/service/comprehend/api_op_ListTagsForResource.go +++ b/service/comprehend/api_op_ListTagsForResource.go @@ -61,6 +61,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_ListTopicsDetectionJobs.go b/service/comprehend/api_op_ListTopicsDetectionJobs.go index 390075e9c82..17dc6f825e3 100644 --- a/service/comprehend/api_op_ListTopicsDetectionJobs.go +++ b/service/comprehend/api_op_ListTopicsDetectionJobs.go @@ -62,6 +62,9 @@ func addOperationListTopicsDetectionJobsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTopicsDetectionJobsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartDocumentClassificationJob.go b/service/comprehend/api_op_StartDocumentClassificationJob.go index 6196c8dd670..97e2d5eb9e3 100644 --- a/service/comprehend/api_op_StartDocumentClassificationJob.go +++ b/service/comprehend/api_op_StartDocumentClassificationJob.go @@ -119,6 +119,9 @@ func addOperationStartDocumentClassificationJobMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationStartDocumentClassificationJobMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartDominantLanguageDetectionJob.go b/service/comprehend/api_op_StartDominantLanguageDetectionJob.go index 4a1f98bc97b..830adf6d327 100644 --- a/service/comprehend/api_op_StartDominantLanguageDetectionJob.go +++ b/service/comprehend/api_op_StartDominantLanguageDetectionJob.go @@ -109,6 +109,9 @@ func addOperationStartDominantLanguageDetectionJobMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationStartDominantLanguageDetectionJobMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartEntitiesDetectionJob.go b/service/comprehend/api_op_StartEntitiesDetectionJob.go index 40d0f8f7671..8ad25fdd7f9 100644 --- a/service/comprehend/api_op_StartEntitiesDetectionJob.go +++ b/service/comprehend/api_op_StartEntitiesDetectionJob.go @@ -133,6 +133,9 @@ func addOperationStartEntitiesDetectionJobMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationStartEntitiesDetectionJobMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go b/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go index 104cb51480f..8e320c8532f 100644 --- a/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go +++ b/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go @@ -116,6 +116,9 @@ func addOperationStartKeyPhrasesDetectionJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationStartKeyPhrasesDetectionJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartPiiEntitiesDetectionJob.go b/service/comprehend/api_op_StartPiiEntitiesDetectionJob.go index a517edc476e..04ae51383c7 100644 --- a/service/comprehend/api_op_StartPiiEntitiesDetectionJob.go +++ b/service/comprehend/api_op_StartPiiEntitiesDetectionJob.go @@ -91,6 +91,9 @@ func addOperationStartPiiEntitiesDetectionJobMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationStartPiiEntitiesDetectionJobMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartSentimentDetectionJob.go b/service/comprehend/api_op_StartSentimentDetectionJob.go index 3c088fdceea..4fd64b1fe5e 100644 --- a/service/comprehend/api_op_StartSentimentDetectionJob.go +++ b/service/comprehend/api_op_StartSentimentDetectionJob.go @@ -116,6 +116,9 @@ func addOperationStartSentimentDetectionJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationStartSentimentDetectionJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StartTopicsDetectionJob.go b/service/comprehend/api_op_StartTopicsDetectionJob.go index f05a9bfd764..5d798369ef6 100644 --- a/service/comprehend/api_op_StartTopicsDetectionJob.go +++ b/service/comprehend/api_op_StartTopicsDetectionJob.go @@ -115,6 +115,9 @@ func addOperationStartTopicsDetectionJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationStartTopicsDetectionJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopDominantLanguageDetectionJob.go b/service/comprehend/api_op_StopDominantLanguageDetectionJob.go index b124009ca7a..a010449e8f1 100644 --- a/service/comprehend/api_op_StopDominantLanguageDetectionJob.go +++ b/service/comprehend/api_op_StopDominantLanguageDetectionJob.go @@ -64,6 +64,9 @@ func addOperationStopDominantLanguageDetectionJobMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationStopDominantLanguageDetectionJobMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopEntitiesDetectionJob.go b/service/comprehend/api_op_StopEntitiesDetectionJob.go index 7b60077cfd1..2c3f41c5361 100644 --- a/service/comprehend/api_op_StopEntitiesDetectionJob.go +++ b/service/comprehend/api_op_StopEntitiesDetectionJob.go @@ -63,6 +63,9 @@ func addOperationStopEntitiesDetectionJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopEntitiesDetectionJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go b/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go index 61403d8b5ec..0936bbc3077 100644 --- a/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go +++ b/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go @@ -63,6 +63,9 @@ func addOperationStopKeyPhrasesDetectionJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopKeyPhrasesDetectionJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopPiiEntitiesDetectionJob.go b/service/comprehend/api_op_StopPiiEntitiesDetectionJob.go index bb21c392b0f..2cc1ffd67c6 100644 --- a/service/comprehend/api_op_StopPiiEntitiesDetectionJob.go +++ b/service/comprehend/api_op_StopPiiEntitiesDetectionJob.go @@ -56,6 +56,9 @@ func addOperationStopPiiEntitiesDetectionJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopPiiEntitiesDetectionJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopSentimentDetectionJob.go b/service/comprehend/api_op_StopSentimentDetectionJob.go index ea70356d2cf..e173e0340fc 100644 --- a/service/comprehend/api_op_StopSentimentDetectionJob.go +++ b/service/comprehend/api_op_StopSentimentDetectionJob.go @@ -63,6 +63,9 @@ func addOperationStopSentimentDetectionJobMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopSentimentDetectionJobMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopTrainingDocumentClassifier.go b/service/comprehend/api_op_StopTrainingDocumentClassifier.go index dc92c395615..e6ab6055a12 100644 --- a/service/comprehend/api_op_StopTrainingDocumentClassifier.go +++ b/service/comprehend/api_op_StopTrainingDocumentClassifier.go @@ -54,6 +54,9 @@ func addOperationStopTrainingDocumentClassifierMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStopTrainingDocumentClassifierMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_StopTrainingEntityRecognizer.go b/service/comprehend/api_op_StopTrainingEntityRecognizer.go index 82ace2875d9..b573d12770f 100644 --- a/service/comprehend/api_op_StopTrainingEntityRecognizer.go +++ b/service/comprehend/api_op_StopTrainingEntityRecognizer.go @@ -54,6 +54,9 @@ func addOperationStopTrainingEntityRecognizerMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStopTrainingEntityRecognizerMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_TagResource.go b/service/comprehend/api_op_TagResource.go index 4076e54857f..3458a906a72 100644 --- a/service/comprehend/api_op_TagResource.go +++ b/service/comprehend/api_op_TagResource.go @@ -60,6 +60,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_UntagResource.go b/service/comprehend/api_op_UntagResource.go index bb670b01e6f..9d3bfedb6af 100644 --- a/service/comprehend/api_op_UntagResource.go +++ b/service/comprehend/api_op_UntagResource.go @@ -57,6 +57,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/api_op_UpdateEndpoint.go b/service/comprehend/api_op_UpdateEndpoint.go index 354418d4284..5fc33426580 100644 --- a/service/comprehend/api_op_UpdateEndpoint.go +++ b/service/comprehend/api_op_UpdateEndpoint.go @@ -55,6 +55,9 @@ func addOperationUpdateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehend/go.mod b/service/comprehend/go.mod index 90975fa3f9a..011e4273e62 100644 --- a/service/comprehend/go.mod +++ b/service/comprehend/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/comprehend go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/comprehend/go.sum b/service/comprehend/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/comprehend/go.sum +++ b/service/comprehend/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/comprehendmedical/api_client.go b/service/comprehendmedical/api_client.go index 5af3a7138b8..ae44c8db409 100644 --- a/service/comprehendmedical/api_client.go +++ b/service/comprehendmedical/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go b/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go index 75e54dc7097..68473f25171 100644 --- a/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go +++ b/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go @@ -55,6 +55,9 @@ func addOperationDescribeEntitiesDetectionV2JobMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeEntitiesDetectionV2JobMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go b/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go index dded56bb802..9c4aa9077e7 100644 --- a/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go +++ b/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go @@ -55,6 +55,9 @@ func addOperationDescribeICD10CMInferenceJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeICD10CMInferenceJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_DescribePHIDetectionJob.go b/service/comprehendmedical/api_op_DescribePHIDetectionJob.go index 78301dd2815..e47155344a5 100644 --- a/service/comprehendmedical/api_op_DescribePHIDetectionJob.go +++ b/service/comprehendmedical/api_op_DescribePHIDetectionJob.go @@ -55,6 +55,9 @@ func addOperationDescribePHIDetectionJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribePHIDetectionJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go b/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go index 88c879f72bb..506a83459b7 100644 --- a/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go +++ b/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go @@ -55,6 +55,9 @@ func addOperationDescribeRxNormInferenceJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeRxNormInferenceJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_DetectEntities.go b/service/comprehendmedical/api_op_DetectEntities.go index 959cc13a473..740f97bcd2f 100644 --- a/service/comprehendmedical/api_op_DetectEntities.go +++ b/service/comprehendmedical/api_op_DetectEntities.go @@ -78,6 +78,9 @@ func addOperationDetectEntitiesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDetectEntitiesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_DetectEntitiesV2.go b/service/comprehendmedical/api_op_DetectEntitiesV2.go index 0ef3eb32867..075d8888da9 100644 --- a/service/comprehendmedical/api_op_DetectEntitiesV2.go +++ b/service/comprehendmedical/api_op_DetectEntitiesV2.go @@ -82,6 +82,9 @@ func addOperationDetectEntitiesV2Middlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDetectEntitiesV2Middlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_DetectPHI.go b/service/comprehendmedical/api_op_DetectPHI.go index 5cf05364aa2..4d5889e59cb 100644 --- a/service/comprehendmedical/api_op_DetectPHI.go +++ b/service/comprehendmedical/api_op_DetectPHI.go @@ -72,6 +72,9 @@ func addOperationDetectPHIMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDetectPHIMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_InferICD10CM.go b/service/comprehendmedical/api_op_InferICD10CM.go index b1a28fa4c3d..54f645532b8 100644 --- a/service/comprehendmedical/api_op_InferICD10CM.go +++ b/service/comprehendmedical/api_op_InferICD10CM.go @@ -70,6 +70,9 @@ func addOperationInferICD10CMMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationInferICD10CMMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_InferRxNorm.go b/service/comprehendmedical/api_op_InferRxNorm.go index 51a2d74089c..5ca1f52979a 100644 --- a/service/comprehendmedical/api_op_InferRxNorm.go +++ b/service/comprehendmedical/api_op_InferRxNorm.go @@ -70,6 +70,9 @@ func addOperationInferRxNormMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationInferRxNormMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go b/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go index 3d353157b05..2b949a1806d 100644 --- a/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go +++ b/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go @@ -62,6 +62,9 @@ func addOperationListEntitiesDetectionV2JobsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListEntitiesDetectionV2JobsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go b/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go index 7be319356ee..40d773bc3e3 100644 --- a/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go +++ b/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go @@ -62,6 +62,9 @@ func addOperationListICD10CMInferenceJobsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListICD10CMInferenceJobsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_ListPHIDetectionJobs.go b/service/comprehendmedical/api_op_ListPHIDetectionJobs.go index 14c03cc25c4..c07f5a0ac99 100644 --- a/service/comprehendmedical/api_op_ListPHIDetectionJobs.go +++ b/service/comprehendmedical/api_op_ListPHIDetectionJobs.go @@ -63,6 +63,9 @@ func addOperationListPHIDetectionJobsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListPHIDetectionJobsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go b/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go index 4a19ae044b1..3c2d965c8e2 100644 --- a/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go +++ b/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go @@ -62,6 +62,9 @@ func addOperationListRxNormInferenceJobsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListRxNormInferenceJobsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go b/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go index e2017b6d54d..ec85371fe16 100644 --- a/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go +++ b/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go @@ -87,6 +87,9 @@ func addOperationStartEntitiesDetectionV2JobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationStartEntitiesDetectionV2JobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go b/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go index 0dd5b91ed95..8f544ad7df7 100644 --- a/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go +++ b/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go @@ -87,6 +87,9 @@ func addOperationStartICD10CMInferenceJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationStartICD10CMInferenceJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StartPHIDetectionJob.go b/service/comprehendmedical/api_op_StartPHIDetectionJob.go index ef297f78a7a..ff138b5d0a4 100644 --- a/service/comprehendmedical/api_op_StartPHIDetectionJob.go +++ b/service/comprehendmedical/api_op_StartPHIDetectionJob.go @@ -86,6 +86,9 @@ func addOperationStartPHIDetectionJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationStartPHIDetectionJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StartRxNormInferenceJob.go b/service/comprehendmedical/api_op_StartRxNormInferenceJob.go index 2aff05cc802..c4ffdb81901 100644 --- a/service/comprehendmedical/api_op_StartRxNormInferenceJob.go +++ b/service/comprehendmedical/api_op_StartRxNormInferenceJob.go @@ -86,6 +86,9 @@ func addOperationStartRxNormInferenceJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationStartRxNormInferenceJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go b/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go index 9cc652edc17..17284453ce5 100644 --- a/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go +++ b/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go @@ -52,6 +52,9 @@ func addOperationStopEntitiesDetectionV2JobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStopEntitiesDetectionV2JobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go b/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go index 4f86fcc400e..c6b908b7843 100644 --- a/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go +++ b/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go @@ -53,6 +53,9 @@ func addOperationStopICD10CMInferenceJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopICD10CMInferenceJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StopPHIDetectionJob.go b/service/comprehendmedical/api_op_StopPHIDetectionJob.go index ce276bca788..5bb9178e948 100644 --- a/service/comprehendmedical/api_op_StopPHIDetectionJob.go +++ b/service/comprehendmedical/api_op_StopPHIDetectionJob.go @@ -52,6 +52,9 @@ func addOperationStopPHIDetectionJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStopPHIDetectionJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/api_op_StopRxNormInferenceJob.go b/service/comprehendmedical/api_op_StopRxNormInferenceJob.go index 46f54621cf8..43c5ea5dab5 100644 --- a/service/comprehendmedical/api_op_StopRxNormInferenceJob.go +++ b/service/comprehendmedical/api_op_StopRxNormInferenceJob.go @@ -53,6 +53,9 @@ func addOperationStopRxNormInferenceJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopRxNormInferenceJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/comprehendmedical/go.mod b/service/comprehendmedical/go.mod index 6f56bbd72b4..92297e22b5f 100644 --- a/service/comprehendmedical/go.mod +++ b/service/comprehendmedical/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/comprehendmedical go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/comprehendmedical/go.sum b/service/comprehendmedical/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/comprehendmedical/go.sum +++ b/service/comprehendmedical/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/computeoptimizer/api_client.go b/service/computeoptimizer/api_client.go index c663309ab49..0af219581b0 100644 --- a/service/computeoptimizer/api_client.go +++ b/service/computeoptimizer/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go b/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go index 070832e6fea..65e50a653c6 100644 --- a/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go +++ b/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go @@ -73,6 +73,9 @@ func addOperationDescribeRecommendationExportJobsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeRecommendationExportJobsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go b/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go index 19f268c4aed..95db79e7108 100644 --- a/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go +++ b/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go @@ -110,6 +110,9 @@ func addOperationExportAutoScalingGroupRecommendationsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationExportAutoScalingGroupRecommendationsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go b/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go index 194835a40b9..88f9ddf9b3c 100644 --- a/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go +++ b/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go @@ -109,6 +109,9 @@ func addOperationExportEC2InstanceRecommendationsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationExportEC2InstanceRecommendationsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go b/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go index bc4253ee4a1..03afc2236b6 100644 --- a/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go +++ b/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go @@ -84,6 +84,9 @@ func addOperationGetAutoScalingGroupRecommendationsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetAutoScalingGroupRecommendationsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go b/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go index 585e21282bd..e276b85bdd0 100644 --- a/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go +++ b/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go @@ -85,6 +85,9 @@ func addOperationGetEC2InstanceRecommendationsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetEC2InstanceRecommendationsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go b/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go index 09253652469..c30bc8d6899 100644 --- a/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go +++ b/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go @@ -81,6 +81,9 @@ func addOperationGetEC2RecommendationProjectedMetricsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetEC2RecommendationProjectedMetricsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_GetEnrollmentStatus.go b/service/computeoptimizer/api_op_GetEnrollmentStatus.go index 735f9532332..c9a32326243 100644 --- a/service/computeoptimizer/api_op_GetEnrollmentStatus.go +++ b/service/computeoptimizer/api_op_GetEnrollmentStatus.go @@ -60,6 +60,9 @@ func addOperationGetEnrollmentStatusMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetEnrollmentStatusMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_GetRecommendationSummaries.go b/service/computeoptimizer/api_op_GetRecommendationSummaries.go index 76397393e03..540d3484c54 100644 --- a/service/computeoptimizer/api_op_GetRecommendationSummaries.go +++ b/service/computeoptimizer/api_op_GetRecommendationSummaries.go @@ -70,6 +70,9 @@ func addOperationGetRecommendationSummariesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetRecommendationSummariesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go b/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go index d6f2abde61d..ec9a280f2b7 100644 --- a/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go +++ b/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go @@ -65,6 +65,9 @@ func addOperationUpdateEnrollmentStatusMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateEnrollmentStatusMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/computeoptimizer/go.mod b/service/computeoptimizer/go.mod index 7c298b41ba7..bdd6c7606d0 100644 --- a/service/computeoptimizer/go.mod +++ b/service/computeoptimizer/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/computeoptimizer go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/computeoptimizer/go.sum b/service/computeoptimizer/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/computeoptimizer/go.sum +++ b/service/computeoptimizer/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/configservice/api_client.go b/service/configservice/api_client.go index 33858dd12f2..f7cce19390a 100644 --- a/service/configservice/api_client.go +++ b/service/configservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/configservice/api_op_BatchGetAggregateResourceConfig.go b/service/configservice/api_op_BatchGetAggregateResourceConfig.go index c54b9496ce3..7e8a10fb6f7 100644 --- a/service/configservice/api_op_BatchGetAggregateResourceConfig.go +++ b/service/configservice/api_op_BatchGetAggregateResourceConfig.go @@ -71,6 +71,9 @@ func addOperationBatchGetAggregateResourceConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchGetAggregateResourceConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_BatchGetResourceConfig.go b/service/configservice/api_op_BatchGetResourceConfig.go index f8ca6fbee4c..e56174e9ef8 100644 --- a/service/configservice/api_op_BatchGetResourceConfig.go +++ b/service/configservice/api_op_BatchGetResourceConfig.go @@ -71,6 +71,9 @@ func addOperationBatchGetResourceConfigMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchGetResourceConfigMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteAggregationAuthorization.go b/service/configservice/api_op_DeleteAggregationAuthorization.go index 7aa66c5d98d..a4391bdad41 100644 --- a/service/configservice/api_op_DeleteAggregationAuthorization.go +++ b/service/configservice/api_op_DeleteAggregationAuthorization.go @@ -54,6 +54,9 @@ func addOperationDeleteAggregationAuthorizationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteAggregationAuthorizationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteConfigRule.go b/service/configservice/api_op_DeleteConfigRule.go index d37bd26ddbb..dfebad86f3b 100644 --- a/service/configservice/api_op_DeleteConfigRule.go +++ b/service/configservice/api_op_DeleteConfigRule.go @@ -54,6 +54,9 @@ func addOperationDeleteConfigRuleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteConfigRuleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteConfigurationAggregator.go b/service/configservice/api_op_DeleteConfigurationAggregator.go index 9c91a57437d..e33aeaea784 100644 --- a/service/configservice/api_op_DeleteConfigurationAggregator.go +++ b/service/configservice/api_op_DeleteConfigurationAggregator.go @@ -49,6 +49,9 @@ func addOperationDeleteConfigurationAggregatorMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteConfigurationAggregatorMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteConfigurationRecorder.go b/service/configservice/api_op_DeleteConfigurationRecorder.go index 189ef118667..9eaac59d0dd 100644 --- a/service/configservice/api_op_DeleteConfigurationRecorder.go +++ b/service/configservice/api_op_DeleteConfigurationRecorder.go @@ -57,6 +57,9 @@ func addOperationDeleteConfigurationRecorderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteConfigurationRecorderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteConformancePack.go b/service/configservice/api_op_DeleteConformancePack.go index e58bc102797..22ac3eaa26c 100644 --- a/service/configservice/api_op_DeleteConformancePack.go +++ b/service/configservice/api_op_DeleteConformancePack.go @@ -51,6 +51,9 @@ func addOperationDeleteConformancePackMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteConformancePackMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteDeliveryChannel.go b/service/configservice/api_op_DeleteDeliveryChannel.go index 6b44f392258..976c130c4ed 100644 --- a/service/configservice/api_op_DeleteDeliveryChannel.go +++ b/service/configservice/api_op_DeleteDeliveryChannel.go @@ -52,6 +52,9 @@ func addOperationDeleteDeliveryChannelMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteDeliveryChannelMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteEvaluationResults.go b/service/configservice/api_op_DeleteEvaluationResults.go index 369b14fb9a5..92d8ac8f021 100644 --- a/service/configservice/api_op_DeleteEvaluationResults.go +++ b/service/configservice/api_op_DeleteEvaluationResults.go @@ -55,6 +55,9 @@ func addOperationDeleteEvaluationResultsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteEvaluationResultsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteOrganizationConfigRule.go b/service/configservice/api_op_DeleteOrganizationConfigRule.go index 70353aca136..0ab4aafe77e 100644 --- a/service/configservice/api_op_DeleteOrganizationConfigRule.go +++ b/service/configservice/api_op_DeleteOrganizationConfigRule.go @@ -54,6 +54,9 @@ func addOperationDeleteOrganizationConfigRuleMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteOrganizationConfigRuleMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteOrganizationConformancePack.go b/service/configservice/api_op_DeleteOrganizationConformancePack.go index 3f1f9421a31..ae90b5e5f37 100644 --- a/service/configservice/api_op_DeleteOrganizationConformancePack.go +++ b/service/configservice/api_op_DeleteOrganizationConformancePack.go @@ -55,6 +55,9 @@ func addOperationDeleteOrganizationConformancePackMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteOrganizationConformancePackMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeletePendingAggregationRequest.go b/service/configservice/api_op_DeletePendingAggregationRequest.go index c4b197d55db..003f4267f40 100644 --- a/service/configservice/api_op_DeletePendingAggregationRequest.go +++ b/service/configservice/api_op_DeletePendingAggregationRequest.go @@ -54,6 +54,9 @@ func addOperationDeletePendingAggregationRequestMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeletePendingAggregationRequestMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteRemediationConfiguration.go b/service/configservice/api_op_DeleteRemediationConfiguration.go index 43a272ec7a0..5a3befe9724 100644 --- a/service/configservice/api_op_DeleteRemediationConfiguration.go +++ b/service/configservice/api_op_DeleteRemediationConfiguration.go @@ -52,6 +52,9 @@ func addOperationDeleteRemediationConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteRemediationConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteRemediationExceptions.go b/service/configservice/api_op_DeleteRemediationExceptions.go index 2a1b386abf5..b5ecbff6696 100644 --- a/service/configservice/api_op_DeleteRemediationExceptions.go +++ b/service/configservice/api_op_DeleteRemediationExceptions.go @@ -65,6 +65,9 @@ func addOperationDeleteRemediationExceptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteRemediationExceptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteResourceConfig.go b/service/configservice/api_op_DeleteResourceConfig.go index cc4b94845a0..c101faf0b7a 100644 --- a/service/configservice/api_op_DeleteResourceConfig.go +++ b/service/configservice/api_op_DeleteResourceConfig.go @@ -56,6 +56,9 @@ func addOperationDeleteResourceConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteResourceConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeleteRetentionConfiguration.go b/service/configservice/api_op_DeleteRetentionConfiguration.go index a2232fd41ac..5d160c0a066 100644 --- a/service/configservice/api_op_DeleteRetentionConfiguration.go +++ b/service/configservice/api_op_DeleteRetentionConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeleteRetentionConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteRetentionConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DeliverConfigSnapshot.go b/service/configservice/api_op_DeliverConfigSnapshot.go index c4354b31015..07e54b34d0c 100644 --- a/service/configservice/api_op_DeliverConfigSnapshot.go +++ b/service/configservice/api_op_DeliverConfigSnapshot.go @@ -65,6 +65,9 @@ func addOperationDeliverConfigSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeliverConfigSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go b/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go index 902d5b1246b..e6bd93be195 100644 --- a/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go +++ b/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go @@ -70,6 +70,9 @@ func addOperationDescribeAggregateComplianceByConfigRulesMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeAggregateComplianceByConfigRulesMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeAggregationAuthorizations.go b/service/configservice/api_op_DescribeAggregationAuthorizations.go index 674aeed4edb..b4c4c8cb352 100644 --- a/service/configservice/api_op_DescribeAggregationAuthorizations.go +++ b/service/configservice/api_op_DescribeAggregationAuthorizations.go @@ -62,6 +62,9 @@ func addOperationDescribeAggregationAuthorizationsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeAggregationAuthorizationsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeComplianceByConfigRule.go b/service/configservice/api_op_DescribeComplianceByConfigRule.go index cc376792163..aee756165bd 100644 --- a/service/configservice/api_op_DescribeComplianceByConfigRule.go +++ b/service/configservice/api_op_DescribeComplianceByConfigRule.go @@ -86,6 +86,9 @@ func addOperationDescribeComplianceByConfigRuleMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeComplianceByConfigRuleMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeComplianceByResource.go b/service/configservice/api_op_DescribeComplianceByResource.go index 38021d08a17..437531189d8 100644 --- a/service/configservice/api_op_DescribeComplianceByResource.go +++ b/service/configservice/api_op_DescribeComplianceByResource.go @@ -100,6 +100,9 @@ func addOperationDescribeComplianceByResourceMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeComplianceByResourceMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go b/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go index bf820b46f19..bac95a7e3e0 100644 --- a/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go +++ b/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go @@ -74,6 +74,9 @@ func addOperationDescribeConfigRuleEvaluationStatusMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeConfigRuleEvaluationStatusMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConfigRules.go b/service/configservice/api_op_DescribeConfigRules.go index 3cb29bb7b38..bc6ae8b3536 100644 --- a/service/configservice/api_op_DescribeConfigRules.go +++ b/service/configservice/api_op_DescribeConfigRules.go @@ -62,6 +62,9 @@ func addOperationDescribeConfigRulesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeConfigRulesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go b/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go index 1f47c2fe2f2..461c4df507d 100644 --- a/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go +++ b/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go @@ -79,6 +79,9 @@ func addOperationDescribeConfigurationAggregatorSourcesStatusMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeConfigurationAggregatorSourcesStatusMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConfigurationAggregators.go b/service/configservice/api_op_DescribeConfigurationAggregators.go index 1dc91b40c52..3bd2317fa5f 100644 --- a/service/configservice/api_op_DescribeConfigurationAggregators.go +++ b/service/configservice/api_op_DescribeConfigurationAggregators.go @@ -65,6 +65,9 @@ func addOperationDescribeConfigurationAggregatorsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeConfigurationAggregatorsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConfigurationRecorderStatus.go b/service/configservice/api_op_DescribeConfigurationRecorderStatus.go index 51bbe9f737c..ba910f58201 100644 --- a/service/configservice/api_op_DescribeConfigurationRecorderStatus.go +++ b/service/configservice/api_op_DescribeConfigurationRecorderStatus.go @@ -58,6 +58,9 @@ func addOperationDescribeConfigurationRecorderStatusMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeConfigurationRecorderStatusMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConfigurationRecorders.go b/service/configservice/api_op_DescribeConfigurationRecorders.go index b54420445e0..8c6b3147b69 100644 --- a/service/configservice/api_op_DescribeConfigurationRecorders.go +++ b/service/configservice/api_op_DescribeConfigurationRecorders.go @@ -56,6 +56,9 @@ func addOperationDescribeConfigurationRecordersMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeConfigurationRecordersMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConformancePackCompliance.go b/service/configservice/api_op_DescribeConformancePackCompliance.go index 3dbcabb3cea..18da0e76c17 100644 --- a/service/configservice/api_op_DescribeConformancePackCompliance.go +++ b/service/configservice/api_op_DescribeConformancePackCompliance.go @@ -76,6 +76,9 @@ func addOperationDescribeConformancePackComplianceMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeConformancePackComplianceMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConformancePackStatus.go b/service/configservice/api_op_DescribeConformancePackStatus.go index 1a52fe7dee8..18dddf99782 100644 --- a/service/configservice/api_op_DescribeConformancePackStatus.go +++ b/service/configservice/api_op_DescribeConformancePackStatus.go @@ -63,6 +63,9 @@ func addOperationDescribeConformancePackStatusMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeConformancePackStatusMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeConformancePacks.go b/service/configservice/api_op_DescribeConformancePacks.go index e14e47c1f1c..9655b67cd0f 100644 --- a/service/configservice/api_op_DescribeConformancePacks.go +++ b/service/configservice/api_op_DescribeConformancePacks.go @@ -64,6 +64,9 @@ func addOperationDescribeConformancePacksMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeConformancePacksMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeDeliveryChannelStatus.go b/service/configservice/api_op_DescribeDeliveryChannelStatus.go index c7ede06d404..b6fbed6e8fe 100644 --- a/service/configservice/api_op_DescribeDeliveryChannelStatus.go +++ b/service/configservice/api_op_DescribeDeliveryChannelStatus.go @@ -56,6 +56,9 @@ func addOperationDescribeDeliveryChannelStatusMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeDeliveryChannelStatusMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeDeliveryChannels.go b/service/configservice/api_op_DescribeDeliveryChannels.go index 29431dc0508..1003dbec2c5 100644 --- a/service/configservice/api_op_DescribeDeliveryChannels.go +++ b/service/configservice/api_op_DescribeDeliveryChannels.go @@ -56,6 +56,9 @@ func addOperationDescribeDeliveryChannelsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeDeliveryChannelsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go b/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go index 74007673b1e..fa1096af5c6 100644 --- a/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go +++ b/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go @@ -74,6 +74,9 @@ func addOperationDescribeOrganizationConfigRuleStatusesMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeOrganizationConfigRuleStatusesMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeOrganizationConfigRules.go b/service/configservice/api_op_DescribeOrganizationConfigRules.go index 34cfcc2cc18..020ae986249 100644 --- a/service/configservice/api_op_DescribeOrganizationConfigRules.go +++ b/service/configservice/api_op_DescribeOrganizationConfigRules.go @@ -71,6 +71,9 @@ func addOperationDescribeOrganizationConfigRulesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeOrganizationConfigRulesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go b/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go index 40ec78f8963..693bff909c7 100644 --- a/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go +++ b/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go @@ -74,6 +74,9 @@ func addOperationDescribeOrganizationConformancePackStatusesMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeOrganizationConformancePackStatusesMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeOrganizationConformancePacks.go b/service/configservice/api_op_DescribeOrganizationConformancePacks.go index 40a0f4e4303..13e6720687f 100644 --- a/service/configservice/api_op_DescribeOrganizationConformancePacks.go +++ b/service/configservice/api_op_DescribeOrganizationConformancePacks.go @@ -69,6 +69,9 @@ func addOperationDescribeOrganizationConformancePacksMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeOrganizationConformancePacksMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribePendingAggregationRequests.go b/service/configservice/api_op_DescribePendingAggregationRequests.go index db2eb3873c1..5bef6742872 100644 --- a/service/configservice/api_op_DescribePendingAggregationRequests.go +++ b/service/configservice/api_op_DescribePendingAggregationRequests.go @@ -60,6 +60,9 @@ func addOperationDescribePendingAggregationRequestsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribePendingAggregationRequestsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeRemediationConfigurations.go b/service/configservice/api_op_DescribeRemediationConfigurations.go index c868fd680d3..83b2d229743 100644 --- a/service/configservice/api_op_DescribeRemediationConfigurations.go +++ b/service/configservice/api_op_DescribeRemediationConfigurations.go @@ -54,6 +54,9 @@ func addOperationDescribeRemediationConfigurationsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeRemediationConfigurationsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeRemediationExceptions.go b/service/configservice/api_op_DescribeRemediationExceptions.go index 6875366912c..fb62b9abbe0 100644 --- a/service/configservice/api_op_DescribeRemediationExceptions.go +++ b/service/configservice/api_op_DescribeRemediationExceptions.go @@ -78,6 +78,9 @@ func addOperationDescribeRemediationExceptionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeRemediationExceptionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeRemediationExecutionStatus.go b/service/configservice/api_op_DescribeRemediationExecutionStatus.go index 7e6a82014b3..d4da63411d2 100644 --- a/service/configservice/api_op_DescribeRemediationExecutionStatus.go +++ b/service/configservice/api_op_DescribeRemediationExecutionStatus.go @@ -72,6 +72,9 @@ func addOperationDescribeRemediationExecutionStatusMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeRemediationExecutionStatusMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_DescribeRetentionConfigurations.go b/service/configservice/api_op_DescribeRetentionConfigurations.go index 285d243eb96..c174bb7dac9 100644 --- a/service/configservice/api_op_DescribeRetentionConfigurations.go +++ b/service/configservice/api_op_DescribeRetentionConfigurations.go @@ -65,6 +65,9 @@ func addOperationDescribeRetentionConfigurationsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeRetentionConfigurationsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go b/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go index 4882b27e6c1..c4002537958 100644 --- a/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go +++ b/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go @@ -91,6 +91,9 @@ func addOperationGetAggregateComplianceDetailsByConfigRuleMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetAggregateComplianceDetailsByConfigRuleMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go b/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go index 85f92d83179..926f4baa40d 100644 --- a/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go +++ b/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go @@ -77,6 +77,9 @@ func addOperationGetAggregateConfigRuleComplianceSummaryMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetAggregateConfigRuleComplianceSummaryMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go b/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go index a7439eb1077..2bfed1ef3f0 100644 --- a/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go +++ b/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go @@ -88,6 +88,9 @@ func addOperationGetAggregateDiscoveredResourceCountsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetAggregateDiscoveredResourceCountsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetAggregateResourceConfig.go b/service/configservice/api_op_GetAggregateResourceConfig.go index ad9f4438c77..8c8c3faba15 100644 --- a/service/configservice/api_op_GetAggregateResourceConfig.go +++ b/service/configservice/api_op_GetAggregateResourceConfig.go @@ -59,6 +59,9 @@ func addOperationGetAggregateResourceConfigMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetAggregateResourceConfigMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetComplianceDetailsByConfigRule.go b/service/configservice/api_op_GetComplianceDetailsByConfigRule.go index 2ea1e433711..e61b24c96bb 100644 --- a/service/configservice/api_op_GetComplianceDetailsByConfigRule.go +++ b/service/configservice/api_op_GetComplianceDetailsByConfigRule.go @@ -74,6 +74,9 @@ func addOperationGetComplianceDetailsByConfigRuleMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetComplianceDetailsByConfigRuleMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetComplianceDetailsByResource.go b/service/configservice/api_op_GetComplianceDetailsByResource.go index 4db01da530d..6aa2e4ea47e 100644 --- a/service/configservice/api_op_GetComplianceDetailsByResource.go +++ b/service/configservice/api_op_GetComplianceDetailsByResource.go @@ -74,6 +74,9 @@ func addOperationGetComplianceDetailsByResourceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetComplianceDetailsByResourceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetComplianceSummaryByConfigRule.go b/service/configservice/api_op_GetComplianceSummaryByConfigRule.go index eaff0fcbd47..e50dc6cfe51 100644 --- a/service/configservice/api_op_GetComplianceSummaryByConfigRule.go +++ b/service/configservice/api_op_GetComplianceSummaryByConfigRule.go @@ -51,6 +51,9 @@ func addOperationGetComplianceSummaryByConfigRuleMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetComplianceSummaryByConfigRuleMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetComplianceSummaryByResourceType.go b/service/configservice/api_op_GetComplianceSummaryByResourceType.go index 4e08208b982..8e8c6632b1f 100644 --- a/service/configservice/api_op_GetComplianceSummaryByResourceType.go +++ b/service/configservice/api_op_GetComplianceSummaryByResourceType.go @@ -61,6 +61,9 @@ func addOperationGetComplianceSummaryByResourceTypeMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetComplianceSummaryByResourceTypeMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetConformancePackComplianceDetails.go b/service/configservice/api_op_GetConformancePackComplianceDetails.go index 4c43da1a4b7..8a7d5327f1e 100644 --- a/service/configservice/api_op_GetConformancePackComplianceDetails.go +++ b/service/configservice/api_op_GetConformancePackComplianceDetails.go @@ -74,6 +74,9 @@ func addOperationGetConformancePackComplianceDetailsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetConformancePackComplianceDetailsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetConformancePackComplianceSummary.go b/service/configservice/api_op_GetConformancePackComplianceSummary.go index 644d77ea424..12fef48dfe1 100644 --- a/service/configservice/api_op_GetConformancePackComplianceSummary.go +++ b/service/configservice/api_op_GetConformancePackComplianceSummary.go @@ -65,6 +65,9 @@ func addOperationGetConformancePackComplianceSummaryMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetConformancePackComplianceSummaryMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetDiscoveredResourceCounts.go b/service/configservice/api_op_GetDiscoveredResourceCounts.go index 6c39db39f16..8586c7d6548 100644 --- a/service/configservice/api_op_GetDiscoveredResourceCounts.go +++ b/service/configservice/api_op_GetDiscoveredResourceCounts.go @@ -124,6 +124,9 @@ func addOperationGetDiscoveredResourceCountsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationGetDiscoveredResourceCountsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go b/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go index b31e8d0270b..b58d4804c3c 100644 --- a/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go +++ b/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go @@ -74,6 +74,9 @@ func addOperationGetOrganizationConfigRuleDetailedStatusMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetOrganizationConfigRuleDetailedStatusMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go b/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go index 79e717e6620..119644881a0 100644 --- a/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go +++ b/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go @@ -74,6 +74,9 @@ func addOperationGetOrganizationConformancePackDetailedStatusMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetOrganizationConformancePackDetailedStatusMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_GetResourceConfigHistory.go b/service/configservice/api_op_GetResourceConfigHistory.go index 3edbc75846b..58e5712a7e3 100644 --- a/service/configservice/api_op_GetResourceConfigHistory.go +++ b/service/configservice/api_op_GetResourceConfigHistory.go @@ -98,6 +98,9 @@ func addOperationGetResourceConfigHistoryMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationGetResourceConfigHistoryMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_ListAggregateDiscoveredResources.go b/service/configservice/api_op_ListAggregateDiscoveredResources.go index fb24740d16b..9a14078e1c4 100644 --- a/service/configservice/api_op_ListAggregateDiscoveredResources.go +++ b/service/configservice/api_op_ListAggregateDiscoveredResources.go @@ -82,6 +82,9 @@ func addOperationListAggregateDiscoveredResourcesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListAggregateDiscoveredResourcesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_ListDiscoveredResources.go b/service/configservice/api_op_ListDiscoveredResources.go index 27f7b3d40e8..33bd01d6a74 100644 --- a/service/configservice/api_op_ListDiscoveredResources.go +++ b/service/configservice/api_op_ListDiscoveredResources.go @@ -93,6 +93,9 @@ func addOperationListDiscoveredResourcesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationListDiscoveredResourcesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_ListTagsForResource.go b/service/configservice/api_op_ListTagsForResource.go index 8e52aef224d..1db425a5337 100644 --- a/service/configservice/api_op_ListTagsForResource.go +++ b/service/configservice/api_op_ListTagsForResource.go @@ -68,6 +68,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutAggregationAuthorization.go b/service/configservice/api_op_PutAggregationAuthorization.go index c675d943d27..a9b00e8a3f6 100644 --- a/service/configservice/api_op_PutAggregationAuthorization.go +++ b/service/configservice/api_op_PutAggregationAuthorization.go @@ -62,6 +62,9 @@ func addOperationPutAggregationAuthorizationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationPutAggregationAuthorizationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutConfigRule.go b/service/configservice/api_op_PutConfigRule.go index feeffc7421f..ace179365fb 100644 --- a/service/configservice/api_op_PutConfigRule.go +++ b/service/configservice/api_op_PutConfigRule.go @@ -78,6 +78,9 @@ func addOperationPutConfigRuleMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationPutConfigRuleMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutConfigurationAggregator.go b/service/configservice/api_op_PutConfigurationAggregator.go index 5a602b2b1c3..0529aa0dbb6 100644 --- a/service/configservice/api_op_PutConfigurationAggregator.go +++ b/service/configservice/api_op_PutConfigurationAggregator.go @@ -68,6 +68,9 @@ func addOperationPutConfigurationAggregatorMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutConfigurationAggregatorMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutConfigurationRecorder.go b/service/configservice/api_op_PutConfigurationRecorder.go index 6611c08c9f7..0f8fe91efca 100644 --- a/service/configservice/api_op_PutConfigurationRecorder.go +++ b/service/configservice/api_op_PutConfigurationRecorder.go @@ -57,6 +57,9 @@ func addOperationPutConfigurationRecorderMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutConfigurationRecorderMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutConformancePack.go b/service/configservice/api_op_PutConformancePack.go index 51b9f0da9fa..a7a9e08b0ed 100644 --- a/service/configservice/api_op_PutConformancePack.go +++ b/service/configservice/api_op_PutConformancePack.go @@ -81,6 +81,9 @@ func addOperationPutConformancePackMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationPutConformancePackMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutDeliveryChannel.go b/service/configservice/api_op_PutDeliveryChannel.go index 11416b4ada1..f831170bda1 100644 --- a/service/configservice/api_op_PutDeliveryChannel.go +++ b/service/configservice/api_op_PutDeliveryChannel.go @@ -59,6 +59,9 @@ func addOperationPutDeliveryChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutDeliveryChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutEvaluations.go b/service/configservice/api_op_PutEvaluations.go index cea13b60dae..e16c8fe645b 100644 --- a/service/configservice/api_op_PutEvaluations.go +++ b/service/configservice/api_op_PutEvaluations.go @@ -70,6 +70,9 @@ func addOperationPutEvaluationsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationPutEvaluationsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutOrganizationConfigRule.go b/service/configservice/api_op_PutOrganizationConfigRule.go index 0c5fab00fa8..57d82ef6442 100644 --- a/service/configservice/api_op_PutOrganizationConfigRule.go +++ b/service/configservice/api_op_PutOrganizationConfigRule.go @@ -87,6 +87,9 @@ func addOperationPutOrganizationConfigRuleMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationPutOrganizationConfigRuleMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutOrganizationConformancePack.go b/service/configservice/api_op_PutOrganizationConformancePack.go index afd0ef34b0e..a579862b29b 100644 --- a/service/configservice/api_op_PutOrganizationConformancePack.go +++ b/service/configservice/api_op_PutOrganizationConformancePack.go @@ -101,6 +101,9 @@ func addOperationPutOrganizationConformancePackMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationPutOrganizationConformancePackMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutRemediationConfigurations.go b/service/configservice/api_op_PutRemediationConfigurations.go index 7871b2e8bb8..b1d8502aeac 100644 --- a/service/configservice/api_op_PutRemediationConfigurations.go +++ b/service/configservice/api_op_PutRemediationConfigurations.go @@ -58,6 +58,9 @@ func addOperationPutRemediationConfigurationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutRemediationConfigurationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutRemediationExceptions.go b/service/configservice/api_op_PutRemediationExceptions.go index 4dffbb014ee..6a995dda139 100644 --- a/service/configservice/api_op_PutRemediationExceptions.go +++ b/service/configservice/api_op_PutRemediationExceptions.go @@ -74,6 +74,9 @@ func addOperationPutRemediationExceptionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationPutRemediationExceptionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutResourceConfig.go b/service/configservice/api_op_PutResourceConfig.go index 993d206a431..9fd0ef78f89 100644 --- a/service/configservice/api_op_PutResourceConfig.go +++ b/service/configservice/api_op_PutResourceConfig.go @@ -83,6 +83,9 @@ func addOperationPutResourceConfigMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationPutResourceConfigMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_PutRetentionConfiguration.go b/service/configservice/api_op_PutRetentionConfiguration.go index 8b2bf1e1a13..f27ff794974 100644 --- a/service/configservice/api_op_PutRetentionConfiguration.go +++ b/service/configservice/api_op_PutRetentionConfiguration.go @@ -59,6 +59,9 @@ func addOperationPutRetentionConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutRetentionConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_SelectAggregateResourceConfig.go b/service/configservice/api_op_SelectAggregateResourceConfig.go index 280b4a022c3..9b47230b9b0 100644 --- a/service/configservice/api_op_SelectAggregateResourceConfig.go +++ b/service/configservice/api_op_SelectAggregateResourceConfig.go @@ -82,6 +82,9 @@ func addOperationSelectAggregateResourceConfigMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationSelectAggregateResourceConfigMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_SelectResourceConfig.go b/service/configservice/api_op_SelectResourceConfig.go index c003db3ac47..c9841869785 100644 --- a/service/configservice/api_op_SelectResourceConfig.go +++ b/service/configservice/api_op_SelectResourceConfig.go @@ -72,6 +72,9 @@ func addOperationSelectResourceConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSelectResourceConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_StartConfigRulesEvaluation.go b/service/configservice/api_op_StartConfigRulesEvaluation.go index 9f772a071fd..a91d81aa4de 100644 --- a/service/configservice/api_op_StartConfigRulesEvaluation.go +++ b/service/configservice/api_op_StartConfigRulesEvaluation.go @@ -76,6 +76,9 @@ func addOperationStartConfigRulesEvaluationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationStartConfigRulesEvaluationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_StartConfigurationRecorder.go b/service/configservice/api_op_StartConfigurationRecorder.go index d303a703620..868c5ef978d 100644 --- a/service/configservice/api_op_StartConfigurationRecorder.go +++ b/service/configservice/api_op_StartConfigurationRecorder.go @@ -52,6 +52,9 @@ func addOperationStartConfigurationRecorderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStartConfigurationRecorderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_StartRemediationExecution.go b/service/configservice/api_op_StartRemediationExecution.go index b9ec135b634..dc9878332f9 100644 --- a/service/configservice/api_op_StartRemediationExecution.go +++ b/service/configservice/api_op_StartRemediationExecution.go @@ -68,6 +68,9 @@ func addOperationStartRemediationExecutionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationStartRemediationExecutionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_StopConfigurationRecorder.go b/service/configservice/api_op_StopConfigurationRecorder.go index 27a1a6f941e..2b661ad88af 100644 --- a/service/configservice/api_op_StopConfigurationRecorder.go +++ b/service/configservice/api_op_StopConfigurationRecorder.go @@ -51,6 +51,9 @@ func addOperationStopConfigurationRecorderMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationStopConfigurationRecorderMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_TagResource.go b/service/configservice/api_op_TagResource.go index c3f42dfbd41..c0e059c1ec4 100644 --- a/service/configservice/api_op_TagResource.go +++ b/service/configservice/api_op_TagResource.go @@ -59,6 +59,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/api_op_UntagResource.go b/service/configservice/api_op_UntagResource.go index 8a508f542c3..9534d9ecdd1 100644 --- a/service/configservice/api_op_UntagResource.go +++ b/service/configservice/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/configservice/go.mod b/service/configservice/go.mod index 425e16ce25e..b761ca74978 100644 --- a/service/configservice/go.mod +++ b/service/configservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/configservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/configservice/go.sum b/service/configservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/configservice/go.sum +++ b/service/configservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/connect/api_client.go b/service/connect/api_client.go index 73737a199e1..4236e0817c4 100644 --- a/service/connect/api_client.go +++ b/service/connect/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/connect/api_op_AssociateRoutingProfileQueues.go b/service/connect/api_op_AssociateRoutingProfileQueues.go index cfaa1b2038c..36dfcc46b27 100644 --- a/service/connect/api_op_AssociateRoutingProfileQueues.go +++ b/service/connect/api_op_AssociateRoutingProfileQueues.go @@ -59,6 +59,9 @@ func addOperationAssociateRoutingProfileQueuesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAssociateRoutingProfileQueuesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_CreateContactFlow.go b/service/connect/api_op_CreateContactFlow.go index 4e4484717e9..2a27acfdbe5 100644 --- a/service/connect/api_op_CreateContactFlow.go +++ b/service/connect/api_op_CreateContactFlow.go @@ -82,6 +82,9 @@ func addOperationCreateContactFlowMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateContactFlowMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_CreateRoutingProfile.go b/service/connect/api_op_CreateRoutingProfile.go index e95f924f471..ea96c71bb2a 100644 --- a/service/connect/api_op_CreateRoutingProfile.go +++ b/service/connect/api_op_CreateRoutingProfile.go @@ -84,6 +84,9 @@ func addOperationCreateRoutingProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateRoutingProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_CreateUser.go b/service/connect/api_op_CreateUser.go index 9a761dae1e4..a2d445cf0f1 100644 --- a/service/connect/api_op_CreateUser.go +++ b/service/connect/api_op_CreateUser.go @@ -108,6 +108,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DeleteUser.go b/service/connect/api_op_DeleteUser.go index 7593f8ebee2..9af7422fbde 100644 --- a/service/connect/api_op_DeleteUser.go +++ b/service/connect/api_op_DeleteUser.go @@ -57,6 +57,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DescribeContactFlow.go b/service/connect/api_op_DescribeContactFlow.go index 0cbe32f97e6..86e64faed58 100644 --- a/service/connect/api_op_DescribeContactFlow.go +++ b/service/connect/api_op_DescribeContactFlow.go @@ -60,6 +60,9 @@ func addOperationDescribeContactFlowMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeContactFlowMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DescribeRoutingProfile.go b/service/connect/api_op_DescribeRoutingProfile.go index 63cf30c7ba6..e6f6b339f66 100644 --- a/service/connect/api_op_DescribeRoutingProfile.go +++ b/service/connect/api_op_DescribeRoutingProfile.go @@ -58,6 +58,9 @@ func addOperationDescribeRoutingProfileMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeRoutingProfileMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DescribeUser.go b/service/connect/api_op_DescribeUser.go index fa53e581238..81a5ba0ec85 100644 --- a/service/connect/api_op_DescribeUser.go +++ b/service/connect/api_op_DescribeUser.go @@ -60,6 +60,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DescribeUserHierarchyGroup.go b/service/connect/api_op_DescribeUserHierarchyGroup.go index 78b9df34839..9cc01efa5e4 100644 --- a/service/connect/api_op_DescribeUserHierarchyGroup.go +++ b/service/connect/api_op_DescribeUserHierarchyGroup.go @@ -58,6 +58,9 @@ func addOperationDescribeUserHierarchyGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeUserHierarchyGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DescribeUserHierarchyStructure.go b/service/connect/api_op_DescribeUserHierarchyStructure.go index 8e425f1f702..b878c18c1e4 100644 --- a/service/connect/api_op_DescribeUserHierarchyStructure.go +++ b/service/connect/api_op_DescribeUserHierarchyStructure.go @@ -53,6 +53,9 @@ func addOperationDescribeUserHierarchyStructureMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeUserHierarchyStructureMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_DisassociateRoutingProfileQueues.go b/service/connect/api_op_DisassociateRoutingProfileQueues.go index 685b3ce5f23..e648ef9105c 100644 --- a/service/connect/api_op_DisassociateRoutingProfileQueues.go +++ b/service/connect/api_op_DisassociateRoutingProfileQueues.go @@ -59,6 +59,9 @@ func addOperationDisassociateRoutingProfileQueuesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDisassociateRoutingProfileQueuesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_GetContactAttributes.go b/service/connect/api_op_GetContactAttributes.go index be95a880b1d..e292ae7434c 100644 --- a/service/connect/api_op_GetContactAttributes.go +++ b/service/connect/api_op_GetContactAttributes.go @@ -57,6 +57,9 @@ func addOperationGetContactAttributesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetContactAttributesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_GetCurrentMetricData.go b/service/connect/api_op_GetCurrentMetricData.go index ebd177ea22f..8b7b0f85cfc 100644 --- a/service/connect/api_op_GetCurrentMetricData.go +++ b/service/connect/api_op_GetCurrentMetricData.go @@ -131,6 +131,9 @@ func addOperationGetCurrentMetricDataMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationGetCurrentMetricDataMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_GetFederationToken.go b/service/connect/api_op_GetFederationToken.go index 8a4f7e9212d..60409042f84 100644 --- a/service/connect/api_op_GetFederationToken.go +++ b/service/connect/api_op_GetFederationToken.go @@ -53,6 +53,9 @@ func addOperationGetFederationTokenMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetFederationTokenMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_GetMetricData.go b/service/connect/api_op_GetMetricData.go index 28f45a02768..808d87d5166 100644 --- a/service/connect/api_op_GetMetricData.go +++ b/service/connect/api_op_GetMetricData.go @@ -132,6 +132,9 @@ func addOperationGetMetricDataMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationGetMetricDataMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListContactFlows.go b/service/connect/api_op_ListContactFlows.go index 0a0a06a2612..212047301e0 100644 --- a/service/connect/api_op_ListContactFlows.go +++ b/service/connect/api_op_ListContactFlows.go @@ -72,6 +72,9 @@ func addOperationListContactFlowsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListContactFlowsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListHoursOfOperations.go b/service/connect/api_op_ListHoursOfOperations.go index b9d2e4a93eb..a91ce8e2226 100644 --- a/service/connect/api_op_ListHoursOfOperations.go +++ b/service/connect/api_op_ListHoursOfOperations.go @@ -67,6 +67,9 @@ func addOperationListHoursOfOperationsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListHoursOfOperationsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListPhoneNumbers.go b/service/connect/api_op_ListPhoneNumbers.go index bf66868665a..11f6b7a7258 100644 --- a/service/connect/api_op_ListPhoneNumbers.go +++ b/service/connect/api_op_ListPhoneNumbers.go @@ -73,6 +73,9 @@ func addOperationListPhoneNumbersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListPhoneNumbersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListPrompts.go b/service/connect/api_op_ListPrompts.go index 9f57ef1f725..9b5402a71e8 100644 --- a/service/connect/api_op_ListPrompts.go +++ b/service/connect/api_op_ListPrompts.go @@ -64,6 +64,9 @@ func addOperationListPromptsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListPromptsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListQueues.go b/service/connect/api_op_ListQueues.go index f40c71418f8..41158193eb6 100644 --- a/service/connect/api_op_ListQueues.go +++ b/service/connect/api_op_ListQueues.go @@ -69,6 +69,9 @@ func addOperationListQueuesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListQueuesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListRoutingProfileQueues.go b/service/connect/api_op_ListRoutingProfileQueues.go index 7f5c79efd8f..8d31a432f4c 100644 --- a/service/connect/api_op_ListRoutingProfileQueues.go +++ b/service/connect/api_op_ListRoutingProfileQueues.go @@ -68,6 +68,9 @@ func addOperationListRoutingProfileQueuesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListRoutingProfileQueuesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListRoutingProfiles.go b/service/connect/api_op_ListRoutingProfiles.go index e4debe72d9f..48b73a469eb 100644 --- a/service/connect/api_op_ListRoutingProfiles.go +++ b/service/connect/api_op_ListRoutingProfiles.go @@ -69,6 +69,9 @@ func addOperationListRoutingProfilesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListRoutingProfilesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListSecurityProfiles.go b/service/connect/api_op_ListSecurityProfiles.go index 272a86b6fae..457708692da 100644 --- a/service/connect/api_op_ListSecurityProfiles.go +++ b/service/connect/api_op_ListSecurityProfiles.go @@ -67,6 +67,9 @@ func addOperationListSecurityProfilesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListSecurityProfilesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListTagsForResource.go b/service/connect/api_op_ListTagsForResource.go index c1d3ffd6470..e21c78ae60b 100644 --- a/service/connect/api_op_ListTagsForResource.go +++ b/service/connect/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListUserHierarchyGroups.go b/service/connect/api_op_ListUserHierarchyGroups.go index 5f56e98d2a6..aaa3582b515 100644 --- a/service/connect/api_op_ListUserHierarchyGroups.go +++ b/service/connect/api_op_ListUserHierarchyGroups.go @@ -67,6 +67,9 @@ func addOperationListUserHierarchyGroupsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListUserHierarchyGroupsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ListUsers.go b/service/connect/api_op_ListUsers.go index ccbd0273a72..e594b5e1f6b 100644 --- a/service/connect/api_op_ListUsers.go +++ b/service/connect/api_op_ListUsers.go @@ -64,6 +64,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_ResumeContactRecording.go b/service/connect/api_op_ResumeContactRecording.go index 5baa88544e9..751dc3e9f87 100644 --- a/service/connect/api_op_ResumeContactRecording.go +++ b/service/connect/api_op_ResumeContactRecording.go @@ -61,6 +61,9 @@ func addOperationResumeContactRecordingMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationResumeContactRecordingMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_StartChatContact.go b/service/connect/api_op_StartChatContact.go index 3d711696ac4..499a31932f5 100644 --- a/service/connect/api_op_StartChatContact.go +++ b/service/connect/api_op_StartChatContact.go @@ -115,6 +115,9 @@ func addOperationStartChatContactMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationStartChatContactMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_StartContactRecording.go b/service/connect/api_op_StartContactRecording.go index 758732b778c..d69e5ad58d8 100644 --- a/service/connect/api_op_StartContactRecording.go +++ b/service/connect/api_op_StartContactRecording.go @@ -74,6 +74,9 @@ func addOperationStartContactRecordingMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationStartContactRecordingMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_StartOutboundVoiceContact.go b/service/connect/api_op_StartOutboundVoiceContact.go index f1642bda2e5..7e88b0d8c2a 100644 --- a/service/connect/api_op_StartOutboundVoiceContact.go +++ b/service/connect/api_op_StartOutboundVoiceContact.go @@ -102,6 +102,9 @@ func addOperationStartOutboundVoiceContactMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationStartOutboundVoiceContactMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_StopContact.go b/service/connect/api_op_StopContact.go index 0ce80645fb6..62d2e683912 100644 --- a/service/connect/api_op_StopContact.go +++ b/service/connect/api_op_StopContact.go @@ -53,6 +53,9 @@ func addOperationStopContactMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopContactMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_StopContactRecording.go b/service/connect/api_op_StopContactRecording.go index c3bae4a60e9..149b460f71b 100644 --- a/service/connect/api_op_StopContactRecording.go +++ b/service/connect/api_op_StopContactRecording.go @@ -65,6 +65,9 @@ func addOperationStopContactRecordingMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationStopContactRecordingMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_SuspendContactRecording.go b/service/connect/api_op_SuspendContactRecording.go index 85c1fae0d65..d2b94cce3be 100644 --- a/service/connect/api_op_SuspendContactRecording.go +++ b/service/connect/api_op_SuspendContactRecording.go @@ -64,6 +64,9 @@ func addOperationSuspendContactRecordingMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationSuspendContactRecordingMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_TagResource.go b/service/connect/api_op_TagResource.go index 4d9ef1d081a..1c91202a2d4 100644 --- a/service/connect/api_op_TagResource.go +++ b/service/connect/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UntagResource.go b/service/connect/api_op_UntagResource.go index 5c676722e2d..1ad4cdc4dd0 100644 --- a/service/connect/api_op_UntagResource.go +++ b/service/connect/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateContactAttributes.go b/service/connect/api_op_UpdateContactAttributes.go index c0dda39d39f..20aa5414068 100644 --- a/service/connect/api_op_UpdateContactAttributes.go +++ b/service/connect/api_op_UpdateContactAttributes.go @@ -80,6 +80,9 @@ func addOperationUpdateContactAttributesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateContactAttributesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateContactFlowContent.go b/service/connect/api_op_UpdateContactFlowContent.go index 447ea379b70..9e4731f9568 100644 --- a/service/connect/api_op_UpdateContactFlowContent.go +++ b/service/connect/api_op_UpdateContactFlowContent.go @@ -63,6 +63,9 @@ func addOperationUpdateContactFlowContentMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateContactFlowContentMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateContactFlowName.go b/service/connect/api_op_UpdateContactFlowName.go index 9b3d60212da..afa3890ab90 100644 --- a/service/connect/api_op_UpdateContactFlowName.go +++ b/service/connect/api_op_UpdateContactFlowName.go @@ -59,6 +59,9 @@ func addOperationUpdateContactFlowNameMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateContactFlowNameMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateRoutingProfileConcurrency.go b/service/connect/api_op_UpdateRoutingProfileConcurrency.go index d325064b7ed..7c6ad0c0308 100644 --- a/service/connect/api_op_UpdateRoutingProfileConcurrency.go +++ b/service/connect/api_op_UpdateRoutingProfileConcurrency.go @@ -60,6 +60,9 @@ func addOperationUpdateRoutingProfileConcurrencyMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateRoutingProfileConcurrencyMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateRoutingProfileDefaultOutboundQueue.go b/service/connect/api_op_UpdateRoutingProfileDefaultOutboundQueue.go index ba398ca7e71..6cf32485259 100644 --- a/service/connect/api_op_UpdateRoutingProfileDefaultOutboundQueue.go +++ b/service/connect/api_op_UpdateRoutingProfileDefaultOutboundQueue.go @@ -58,6 +58,9 @@ func addOperationUpdateRoutingProfileDefaultOutboundQueueMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateRoutingProfileDefaultOutboundQueueMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateRoutingProfileName.go b/service/connect/api_op_UpdateRoutingProfileName.go index af5b4ef43df..e14d176a8f0 100644 --- a/service/connect/api_op_UpdateRoutingProfileName.go +++ b/service/connect/api_op_UpdateRoutingProfileName.go @@ -60,6 +60,9 @@ func addOperationUpdateRoutingProfileNameMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateRoutingProfileNameMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateRoutingProfileQueues.go b/service/connect/api_op_UpdateRoutingProfileQueues.go index 0cee137c2a1..6a77b66b4b4 100644 --- a/service/connect/api_op_UpdateRoutingProfileQueues.go +++ b/service/connect/api_op_UpdateRoutingProfileQueues.go @@ -59,6 +59,9 @@ func addOperationUpdateRoutingProfileQueuesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateRoutingProfileQueuesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateUserHierarchy.go b/service/connect/api_op_UpdateUserHierarchy.go index f92b6c896e2..67cb687a1e0 100644 --- a/service/connect/api_op_UpdateUserHierarchy.go +++ b/service/connect/api_op_UpdateUserHierarchy.go @@ -56,6 +56,9 @@ func addOperationUpdateUserHierarchyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateUserHierarchyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateUserIdentityInfo.go b/service/connect/api_op_UpdateUserIdentityInfo.go index 62a78115065..86d47b8b429 100644 --- a/service/connect/api_op_UpdateUserIdentityInfo.go +++ b/service/connect/api_op_UpdateUserIdentityInfo.go @@ -67,6 +67,9 @@ func addOperationUpdateUserIdentityInfoMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateUserIdentityInfoMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateUserPhoneConfig.go b/service/connect/api_op_UpdateUserPhoneConfig.go index 612221a55bf..0e8110cc6c0 100644 --- a/service/connect/api_op_UpdateUserPhoneConfig.go +++ b/service/connect/api_op_UpdateUserPhoneConfig.go @@ -59,6 +59,9 @@ func addOperationUpdateUserPhoneConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateUserPhoneConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateUserRoutingProfile.go b/service/connect/api_op_UpdateUserRoutingProfile.go index a9b448fd583..5344f40d402 100644 --- a/service/connect/api_op_UpdateUserRoutingProfile.go +++ b/service/connect/api_op_UpdateUserRoutingProfile.go @@ -58,6 +58,9 @@ func addOperationUpdateUserRoutingProfileMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateUserRoutingProfileMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/api_op_UpdateUserSecurityProfiles.go b/service/connect/api_op_UpdateUserSecurityProfiles.go index 42ac8631838..5c7395dbfd1 100644 --- a/service/connect/api_op_UpdateUserSecurityProfiles.go +++ b/service/connect/api_op_UpdateUserSecurityProfiles.go @@ -58,6 +58,9 @@ func addOperationUpdateUserSecurityProfilesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateUserSecurityProfilesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connect/go.mod b/service/connect/go.mod index 4d34d6838fd..bb40b0eb3dd 100644 --- a/service/connect/go.mod +++ b/service/connect/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/connect go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connect/go.sum b/service/connect/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/connect/go.sum +++ b/service/connect/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/connectparticipant/api_client.go b/service/connectparticipant/api_client.go index c543c6fd346..9c1a56f023d 100644 --- a/service/connectparticipant/api_client.go +++ b/service/connectparticipant/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/connectparticipant/api_op_CreateParticipantConnection.go b/service/connectparticipant/api_op_CreateParticipantConnection.go index 6b9ecaa9915..659bd3ccf7c 100644 --- a/service/connectparticipant/api_op_CreateParticipantConnection.go +++ b/service/connectparticipant/api_op_CreateParticipantConnection.go @@ -73,6 +73,9 @@ func addOperationCreateParticipantConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateParticipantConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connectparticipant/api_op_DisconnectParticipant.go b/service/connectparticipant/api_op_DisconnectParticipant.go index edb4a160e66..f0c034d0cb3 100644 --- a/service/connectparticipant/api_op_DisconnectParticipant.go +++ b/service/connectparticipant/api_op_DisconnectParticipant.go @@ -54,6 +54,9 @@ func addOperationDisconnectParticipantMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDisconnectParticipantMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connectparticipant/api_op_GetTranscript.go b/service/connectparticipant/api_op_GetTranscript.go index 07f7dd9c4d0..df6c392f708 100644 --- a/service/connectparticipant/api_op_GetTranscript.go +++ b/service/connectparticipant/api_op_GetTranscript.go @@ -81,6 +81,9 @@ func addOperationGetTranscriptMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetTranscriptMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connectparticipant/api_op_SendEvent.go b/service/connectparticipant/api_op_SendEvent.go index 4070048a803..e41268e2eef 100644 --- a/service/connectparticipant/api_op_SendEvent.go +++ b/service/connectparticipant/api_op_SendEvent.go @@ -77,6 +77,9 @@ func addOperationSendEventMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationSendEventMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connectparticipant/api_op_SendMessage.go b/service/connectparticipant/api_op_SendMessage.go index e0b71891a57..f8018657649 100644 --- a/service/connectparticipant/api_op_SendMessage.go +++ b/service/connectparticipant/api_op_SendMessage.go @@ -72,6 +72,9 @@ func addOperationSendMessageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationSendMessageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/connectparticipant/go.mod b/service/connectparticipant/go.mod index 2ef762adac7..a7957943dfc 100644 --- a/service/connectparticipant/go.mod +++ b/service/connectparticipant/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/connectparticipant go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectparticipant/go.sum b/service/connectparticipant/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/connectparticipant/go.sum +++ b/service/connectparticipant/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/costandusagereportservice/api_client.go b/service/costandusagereportservice/api_client.go index c8a27d7fb95..266a4d87864 100644 --- a/service/costandusagereportservice/api_client.go +++ b/service/costandusagereportservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/costandusagereportservice/api_op_DeleteReportDefinition.go b/service/costandusagereportservice/api_op_DeleteReportDefinition.go index 56f536e6f5a..4148434c2cc 100644 --- a/service/costandusagereportservice/api_op_DeleteReportDefinition.go +++ b/service/costandusagereportservice/api_op_DeleteReportDefinition.go @@ -53,6 +53,9 @@ func addOperationDeleteReportDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteReportDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costandusagereportservice/api_op_DescribeReportDefinitions.go b/service/costandusagereportservice/api_op_DescribeReportDefinitions.go index 5752ae16b8d..8fce67ce14d 100644 --- a/service/costandusagereportservice/api_op_DescribeReportDefinitions.go +++ b/service/costandusagereportservice/api_op_DescribeReportDefinitions.go @@ -59,6 +59,9 @@ func addOperationDescribeReportDefinitionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeReportDefinitionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costandusagereportservice/api_op_ModifyReportDefinition.go b/service/costandusagereportservice/api_op_ModifyReportDefinition.go index db43aec9920..94676f2d152 100644 --- a/service/costandusagereportservice/api_op_ModifyReportDefinition.go +++ b/service/costandusagereportservice/api_op_ModifyReportDefinition.go @@ -57,6 +57,9 @@ func addOperationModifyReportDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationModifyReportDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costandusagereportservice/api_op_PutReportDefinition.go b/service/costandusagereportservice/api_op_PutReportDefinition.go index c6f93318bab..d6a0441ab5a 100644 --- a/service/costandusagereportservice/api_op_PutReportDefinition.go +++ b/service/costandusagereportservice/api_op_PutReportDefinition.go @@ -53,6 +53,9 @@ func addOperationPutReportDefinitionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationPutReportDefinitionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costandusagereportservice/go.mod b/service/costandusagereportservice/go.mod index c96caf6ba3c..630f29cad91 100644 --- a/service/costandusagereportservice/go.mod +++ b/service/costandusagereportservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/costandusagereportservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/costandusagereportservice/go.sum b/service/costandusagereportservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/costandusagereportservice/go.sum +++ b/service/costandusagereportservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/costexplorer/api_client.go b/service/costexplorer/api_client.go index 235ec7a1197..1462ec8d572 100644 --- a/service/costexplorer/api_client.go +++ b/service/costexplorer/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/costexplorer/api_op_CreateAnomalyMonitor.go b/service/costexplorer/api_op_CreateAnomalyMonitor.go index d15b8842d74..e4f62f63245 100644 --- a/service/costexplorer/api_op_CreateAnomalyMonitor.go +++ b/service/costexplorer/api_op_CreateAnomalyMonitor.go @@ -56,6 +56,9 @@ func addOperationCreateAnomalyMonitorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateAnomalyMonitorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_CreateAnomalySubscription.go b/service/costexplorer/api_op_CreateAnomalySubscription.go index 3e81d0a2ff6..b18e266a7da 100644 --- a/service/costexplorer/api_op_CreateAnomalySubscription.go +++ b/service/costexplorer/api_op_CreateAnomalySubscription.go @@ -58,6 +58,9 @@ func addOperationCreateAnomalySubscriptionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateAnomalySubscriptionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_CreateCostCategoryDefinition.go b/service/costexplorer/api_op_CreateCostCategoryDefinition.go index 061e09c0332..f746a0904bf 100644 --- a/service/costexplorer/api_op_CreateCostCategoryDefinition.go +++ b/service/costexplorer/api_op_CreateCostCategoryDefinition.go @@ -68,6 +68,9 @@ func addOperationCreateCostCategoryDefinitionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateCostCategoryDefinitionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_DeleteAnomalyMonitor.go b/service/costexplorer/api_op_DeleteAnomalyMonitor.go index d6a6f34bbfa..614d4534ebb 100644 --- a/service/costexplorer/api_op_DeleteAnomalyMonitor.go +++ b/service/costexplorer/api_op_DeleteAnomalyMonitor.go @@ -48,6 +48,9 @@ func addOperationDeleteAnomalyMonitorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAnomalyMonitorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_DeleteAnomalySubscription.go b/service/costexplorer/api_op_DeleteAnomalySubscription.go index 913c126ff72..4832da6df88 100644 --- a/service/costexplorer/api_op_DeleteAnomalySubscription.go +++ b/service/costexplorer/api_op_DeleteAnomalySubscription.go @@ -48,6 +48,9 @@ func addOperationDeleteAnomalySubscriptionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAnomalySubscriptionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_DeleteCostCategoryDefinition.go b/service/costexplorer/api_op_DeleteCostCategoryDefinition.go index 7c80eec067e..43da7d13c7a 100644 --- a/service/costexplorer/api_op_DeleteCostCategoryDefinition.go +++ b/service/costexplorer/api_op_DeleteCostCategoryDefinition.go @@ -57,6 +57,9 @@ func addOperationDeleteCostCategoryDefinitionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteCostCategoryDefinitionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_DescribeCostCategoryDefinition.go b/service/costexplorer/api_op_DescribeCostCategoryDefinition.go index bca88ec9938..afe54bd473b 100644 --- a/service/costexplorer/api_op_DescribeCostCategoryDefinition.go +++ b/service/costexplorer/api_op_DescribeCostCategoryDefinition.go @@ -61,6 +61,9 @@ func addOperationDescribeCostCategoryDefinitionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeCostCategoryDefinitionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetAnomalies.go b/service/costexplorer/api_op_GetAnomalies.go index de58951a28c..7ff60886620 100644 --- a/service/costexplorer/api_op_GetAnomalies.go +++ b/service/costexplorer/api_op_GetAnomalies.go @@ -80,6 +80,9 @@ func addOperationGetAnomaliesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetAnomaliesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetAnomalyMonitors.go b/service/costexplorer/api_op_GetAnomalyMonitors.go index da7ac325a8b..db616da7552 100644 --- a/service/costexplorer/api_op_GetAnomalyMonitors.go +++ b/service/costexplorer/api_op_GetAnomalyMonitors.go @@ -66,6 +66,9 @@ func addOperationGetAnomalyMonitorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetAnomalyMonitorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetAnomalySubscriptions.go b/service/costexplorer/api_op_GetAnomalySubscriptions.go index 206a15edf34..4a9c215e78c 100644 --- a/service/costexplorer/api_op_GetAnomalySubscriptions.go +++ b/service/costexplorer/api_op_GetAnomalySubscriptions.go @@ -69,6 +69,9 @@ func addOperationGetAnomalySubscriptionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetAnomalySubscriptionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetCostAndUsage.go b/service/costexplorer/api_op_GetCostAndUsage.go index 1b7a7310e25..399d80382db 100644 --- a/service/costexplorer/api_op_GetCostAndUsage.go +++ b/service/costexplorer/api_op_GetCostAndUsage.go @@ -110,6 +110,9 @@ func addOperationGetCostAndUsageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationGetCostAndUsageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetCostAndUsageWithResources.go b/service/costexplorer/api_op_GetCostAndUsageWithResources.go index 7d92ae85a21..94e7b9c217c 100644 --- a/service/costexplorer/api_op_GetCostAndUsageWithResources.go +++ b/service/costexplorer/api_op_GetCostAndUsageWithResources.go @@ -118,6 +118,9 @@ func addOperationGetCostAndUsageWithResourcesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetCostAndUsageWithResourcesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetCostForecast.go b/service/costexplorer/api_op_GetCostForecast.go index 07bd74f8d67..324ecfc9983 100644 --- a/service/costexplorer/api_op_GetCostForecast.go +++ b/service/costexplorer/api_op_GetCostForecast.go @@ -97,6 +97,9 @@ func addOperationGetCostForecastMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetCostForecastMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetDimensionValues.go b/service/costexplorer/api_op_GetDimensionValues.go index 1f4d48beba5..4fc1468f3e8 100644 --- a/service/costexplorer/api_op_GetDimensionValues.go +++ b/service/costexplorer/api_op_GetDimensionValues.go @@ -309,6 +309,9 @@ func addOperationGetDimensionValuesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -351,6 +354,9 @@ func addOperationGetDimensionValuesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetReservationCoverage.go b/service/costexplorer/api_op_GetReservationCoverage.go index c9cf652638f..db04f47eef9 100644 --- a/service/costexplorer/api_op_GetReservationCoverage.go +++ b/service/costexplorer/api_op_GetReservationCoverage.go @@ -181,6 +181,9 @@ func addOperationGetReservationCoverageMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -223,6 +226,9 @@ func addOperationGetReservationCoverageMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go b/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go index d49953f37ae..7dfc6042cb1 100644 --- a/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go +++ b/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go @@ -105,6 +105,9 @@ func addOperationGetReservationPurchaseRecommendationMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationGetReservationPurchaseRecommendationMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetReservationUtilization.go b/service/costexplorer/api_op_GetReservationUtilization.go index ccde8a0f95a..8bece00bb70 100644 --- a/service/costexplorer/api_op_GetReservationUtilization.go +++ b/service/costexplorer/api_op_GetReservationUtilization.go @@ -116,6 +116,9 @@ func addOperationGetReservationUtilizationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationGetReservationUtilizationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetRightsizingRecommendation.go b/service/costexplorer/api_op_GetRightsizingRecommendation.go index 17faabd9d13..70275996074 100644 --- a/service/costexplorer/api_op_GetRightsizingRecommendation.go +++ b/service/costexplorer/api_op_GetRightsizingRecommendation.go @@ -123,6 +123,9 @@ func addOperationGetRightsizingRecommendationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationGetRightsizingRecommendationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetSavingsPlansCoverage.go b/service/costexplorer/api_op_GetSavingsPlansCoverage.go index 9c032b0b40c..55a815e1ddb 100644 --- a/service/costexplorer/api_op_GetSavingsPlansCoverage.go +++ b/service/costexplorer/api_op_GetSavingsPlansCoverage.go @@ -119,6 +119,9 @@ func addOperationGetSavingsPlansCoverageMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationGetSavingsPlansCoverageMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go b/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go index 6f414153148..3d3c7596743 100644 --- a/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go +++ b/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go @@ -103,6 +103,9 @@ func addOperationGetSavingsPlansPurchaseRecommendationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationGetSavingsPlansPurchaseRecommendationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetSavingsPlansUtilization.go b/service/costexplorer/api_op_GetSavingsPlansUtilization.go index f069dbb8988..dc104f4ffff 100644 --- a/service/costexplorer/api_op_GetSavingsPlansUtilization.go +++ b/service/costexplorer/api_op_GetSavingsPlansUtilization.go @@ -94,6 +94,9 @@ func addOperationGetSavingsPlansUtilizationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationGetSavingsPlansUtilizationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go b/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go index f43c8ce79ab..d09935dc11d 100644 --- a/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go +++ b/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go @@ -106,6 +106,9 @@ func addOperationGetSavingsPlansUtilizationDetailsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationGetSavingsPlansUtilizationDetailsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetTags.go b/service/costexplorer/api_op_GetTags.go index 6138170d176..abffe4c6779 100644 --- a/service/costexplorer/api_op_GetTags.go +++ b/service/costexplorer/api_op_GetTags.go @@ -83,6 +83,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_GetUsageForecast.go b/service/costexplorer/api_op_GetUsageForecast.go index 24e1d9023be..7aa933fcce9 100644 --- a/service/costexplorer/api_op_GetUsageForecast.go +++ b/service/costexplorer/api_op_GetUsageForecast.go @@ -92,6 +92,9 @@ func addOperationGetUsageForecastMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetUsageForecastMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_ListCostCategoryDefinitions.go b/service/costexplorer/api_op_ListCostCategoryDefinitions.go index 062d1482eaf..ac0ec234980 100644 --- a/service/costexplorer/api_op_ListCostCategoryDefinitions.go +++ b/service/costexplorer/api_op_ListCostCategoryDefinitions.go @@ -71,6 +71,9 @@ func addOperationListCostCategoryDefinitionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListCostCategoryDefinitionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_ProvideAnomalyFeedback.go b/service/costexplorer/api_op_ProvideAnomalyFeedback.go index 67a0ac40d15..851c5073ebd 100644 --- a/service/costexplorer/api_op_ProvideAnomalyFeedback.go +++ b/service/costexplorer/api_op_ProvideAnomalyFeedback.go @@ -61,6 +61,9 @@ func addOperationProvideAnomalyFeedbackMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationProvideAnomalyFeedbackMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_UpdateAnomalyMonitor.go b/service/costexplorer/api_op_UpdateAnomalyMonitor.go index e81aa693214..8f7a4d922dd 100644 --- a/service/costexplorer/api_op_UpdateAnomalyMonitor.go +++ b/service/costexplorer/api_op_UpdateAnomalyMonitor.go @@ -58,6 +58,9 @@ func addOperationUpdateAnomalyMonitorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateAnomalyMonitorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_UpdateAnomalySubscription.go b/service/costexplorer/api_op_UpdateAnomalySubscription.go index b86c58dc318..8322662458f 100644 --- a/service/costexplorer/api_op_UpdateAnomalySubscription.go +++ b/service/costexplorer/api_op_UpdateAnomalySubscription.go @@ -71,6 +71,9 @@ func addOperationUpdateAnomalySubscriptionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateAnomalySubscriptionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/api_op_UpdateCostCategoryDefinition.go b/service/costexplorer/api_op_UpdateCostCategoryDefinition.go index db46b70f321..c52c1232a67 100644 --- a/service/costexplorer/api_op_UpdateCostCategoryDefinition.go +++ b/service/costexplorer/api_op_UpdateCostCategoryDefinition.go @@ -70,6 +70,9 @@ func addOperationUpdateCostCategoryDefinitionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateCostCategoryDefinitionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/costexplorer/go.mod b/service/costexplorer/go.mod index 4dd3e4e7744..7047431160c 100644 --- a/service/costexplorer/go.mod +++ b/service/costexplorer/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/costexplorer go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/costexplorer/go.sum b/service/costexplorer/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/costexplorer/go.sum +++ b/service/costexplorer/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/databasemigrationservice/api_client.go b/service/databasemigrationservice/api_client.go index 6eddab635fc..c717fe87478 100644 --- a/service/databasemigrationservice/api_client.go +++ b/service/databasemigrationservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/databasemigrationservice/api_op_AddTagsToResource.go b/service/databasemigrationservice/api_op_AddTagsToResource.go index 8a106d64f23..0f04cbffb53 100644 --- a/service/databasemigrationservice/api_op_AddTagsToResource.go +++ b/service/databasemigrationservice/api_op_AddTagsToResource.go @@ -63,6 +63,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go b/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go index 8de6d03c639..fb6c35d4e83 100644 --- a/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go +++ b/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go @@ -77,6 +77,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go b/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go index 986ff5afd42..ed5dbbd8afa 100644 --- a/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go +++ b/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go @@ -57,6 +57,9 @@ func addOperationCancelReplicationTaskAssessmentRunMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCancelReplicationTaskAssessmentRunMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_CreateEndpoint.go b/service/databasemigrationservice/api_op_CreateEndpoint.go index c5e33e3e586..dd0dd5fd9b6 100644 --- a/service/databasemigrationservice/api_op_CreateEndpoint.go +++ b/service/databasemigrationservice/api_op_CreateEndpoint.go @@ -258,6 +258,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -300,6 +303,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_CreateEventSubscription.go b/service/databasemigrationservice/api_op_CreateEventSubscription.go index 1385a4a8b64..61943dbbfa6 100644 --- a/service/databasemigrationservice/api_op_CreateEventSubscription.go +++ b/service/databasemigrationservice/api_op_CreateEventSubscription.go @@ -102,6 +102,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_CreateReplicationInstance.go b/service/databasemigrationservice/api_op_CreateReplicationInstance.go index c70f2363894..f17b2c3e174 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationInstance.go +++ b/service/databasemigrationservice/api_op_CreateReplicationInstance.go @@ -153,6 +153,9 @@ func addOperationCreateReplicationInstanceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -195,6 +198,9 @@ func addOperationCreateReplicationInstanceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go index ab825e4853a..a443a228a8a 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go @@ -71,6 +71,9 @@ func addOperationCreateReplicationSubnetGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateReplicationSubnetGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_CreateReplicationTask.go b/service/databasemigrationservice/api_op_CreateReplicationTask.go index 1dbe48cc856..1409b41c94b 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationTask.go +++ b/service/databasemigrationservice/api_op_CreateReplicationTask.go @@ -146,6 +146,9 @@ func addOperationCreateReplicationTaskMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationCreateReplicationTaskMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteCertificate.go b/service/databasemigrationservice/api_op_DeleteCertificate.go index ea2bec65f48..7682879a1b9 100644 --- a/service/databasemigrationservice/api_op_DeleteCertificate.go +++ b/service/databasemigrationservice/api_op_DeleteCertificate.go @@ -53,6 +53,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteConnection.go b/service/databasemigrationservice/api_op_DeleteConnection.go index 8647e954345..54d1aa59172 100644 --- a/service/databasemigrationservice/api_op_DeleteConnection.go +++ b/service/databasemigrationservice/api_op_DeleteConnection.go @@ -60,6 +60,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteEndpoint.go b/service/databasemigrationservice/api_op_DeleteEndpoint.go index d0ac0c63e29..da8f1c31346 100644 --- a/service/databasemigrationservice/api_op_DeleteEndpoint.go +++ b/service/databasemigrationservice/api_op_DeleteEndpoint.go @@ -56,6 +56,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteEventSubscription.go b/service/databasemigrationservice/api_op_DeleteEventSubscription.go index 6477337e1f3..5aeb0206100 100644 --- a/service/databasemigrationservice/api_op_DeleteEventSubscription.go +++ b/service/databasemigrationservice/api_op_DeleteEventSubscription.go @@ -55,6 +55,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteReplicationInstance.go b/service/databasemigrationservice/api_op_DeleteReplicationInstance.go index 042098f12c6..7bc5124c2e9 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationInstance.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationInstance.go @@ -56,6 +56,9 @@ func addOperationDeleteReplicationInstanceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteReplicationInstanceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go index 320c25f5505..b7dca6afd3e 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go @@ -50,6 +50,9 @@ func addOperationDeleteReplicationSubnetGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteReplicationSubnetGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteReplicationTask.go b/service/databasemigrationservice/api_op_DeleteReplicationTask.go index 35d7662b38e..45584efb968 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationTask.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationTask.go @@ -55,6 +55,9 @@ func addOperationDeleteReplicationTaskMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteReplicationTaskMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go b/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go index 7dbbf23cc46..50d31b2a4ee 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go @@ -58,6 +58,9 @@ func addOperationDeleteReplicationTaskAssessmentRunMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteReplicationTaskAssessmentRunMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeAccountAttributes.go b/service/databasemigrationservice/api_op_DescribeAccountAttributes.go index d2049c0298a..8ec9d324af4 100644 --- a/service/databasemigrationservice/api_op_DescribeAccountAttributes.go +++ b/service/databasemigrationservice/api_op_DescribeAccountAttributes.go @@ -67,6 +67,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go b/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go index 9e48f9cb44a..689a9a15746 100644 --- a/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go +++ b/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go @@ -108,6 +108,9 @@ func addOperationDescribeApplicableIndividualAssessmentsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationDescribeApplicableIndividualAssessmentsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeCertificates.go b/service/databasemigrationservice/api_op_DescribeCertificates.go index 11a19b646ac..ca866023ff0 100644 --- a/service/databasemigrationservice/api_op_DescribeCertificates.go +++ b/service/databasemigrationservice/api_op_DescribeCertificates.go @@ -66,6 +66,9 @@ func addOperationDescribeCertificatesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeCertificatesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeConnections.go b/service/databasemigrationservice/api_op_DescribeConnections.go index e8c07bcbc9e..b6a416ba8aa 100644 --- a/service/databasemigrationservice/api_op_DescribeConnections.go +++ b/service/databasemigrationservice/api_op_DescribeConnections.go @@ -72,6 +72,9 @@ func addOperationDescribeConnectionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeConnectionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeEndpointTypes.go b/service/databasemigrationservice/api_op_DescribeEndpointTypes.go index c40cbdc877c..79fa0008969 100644 --- a/service/databasemigrationservice/api_op_DescribeEndpointTypes.go +++ b/service/databasemigrationservice/api_op_DescribeEndpointTypes.go @@ -70,6 +70,9 @@ func addOperationDescribeEndpointTypesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeEndpointTypesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeEndpoints.go b/service/databasemigrationservice/api_op_DescribeEndpoints.go index 522cf6cfa93..9cfcc8811e5 100644 --- a/service/databasemigrationservice/api_op_DescribeEndpoints.go +++ b/service/databasemigrationservice/api_op_DescribeEndpoints.go @@ -70,6 +70,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeEventCategories.go b/service/databasemigrationservice/api_op_DescribeEventCategories.go index 3c5ddcf2fec..06753b42526 100644 --- a/service/databasemigrationservice/api_op_DescribeEventCategories.go +++ b/service/databasemigrationservice/api_op_DescribeEventCategories.go @@ -61,6 +61,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go b/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go index 438e3a0edd8..b5b3585e974 100644 --- a/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go +++ b/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go @@ -75,6 +75,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeEvents.go b/service/databasemigrationservice/api_op_DescribeEvents.go index 60ba5450749..ebc76f085cb 100644 --- a/service/databasemigrationservice/api_op_DescribeEvents.go +++ b/service/databasemigrationservice/api_op_DescribeEvents.go @@ -93,6 +93,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go b/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go index 8ec0298ca9f..b1da06c3f0b 100644 --- a/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go +++ b/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go @@ -67,6 +67,9 @@ func addOperationDescribeOrderableReplicationInstancesMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeOrderableReplicationInstancesMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go b/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go index df996a1ba23..05f9e991f5d 100644 --- a/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go +++ b/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go @@ -72,6 +72,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go b/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go index 023b475557a..6e3704866eb 100644 --- a/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go +++ b/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go @@ -55,6 +55,9 @@ func addOperationDescribeRefreshSchemasStatusMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeRefreshSchemasStatusMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go b/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go index 66e37e58a54..63668ef389e 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go @@ -73,6 +73,9 @@ func addOperationDescribeReplicationInstanceTaskLogsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeReplicationInstanceTaskLogsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go index 072978637bc..bc31472e6b2 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go @@ -72,6 +72,9 @@ func addOperationDescribeReplicationInstancesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeReplicationInstancesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go b/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go index 7f5fcc38447..3997b4ac3bd 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go @@ -70,6 +70,9 @@ func addOperationDescribeReplicationSubnetGroupsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeReplicationSubnetGroupsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go index a9f015a2c7c..5cbf01049fc 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go @@ -75,6 +75,9 @@ func addOperationDescribeReplicationTaskAssessmentResultsMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeReplicationTaskAssessmentResultsMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go index 21ec2ca89f5..21364726021 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go @@ -76,6 +76,9 @@ func addOperationDescribeReplicationTaskAssessmentRunsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeReplicationTaskAssessmentRunsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go b/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go index f3b85879243..55d9c5aee50 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go @@ -73,6 +73,9 @@ func addOperationDescribeReplicationTaskIndividualAssessmentsMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeReplicationTaskIndividualAssessmentsMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go index d45a5c98ce9..051d8da3e1d 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go @@ -76,6 +76,9 @@ func addOperationDescribeReplicationTasksMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeReplicationTasksMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeSchemas.go b/service/databasemigrationservice/api_op_DescribeSchemas.go index 7e194be56cd..6723b6a571d 100644 --- a/service/databasemigrationservice/api_op_DescribeSchemas.go +++ b/service/databasemigrationservice/api_op_DescribeSchemas.go @@ -70,6 +70,9 @@ func addOperationDescribeSchemasMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeSchemasMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_DescribeTableStatistics.go b/service/databasemigrationservice/api_op_DescribeTableStatistics.go index dd7b34ab508..b1620f1318c 100644 --- a/service/databasemigrationservice/api_op_DescribeTableStatistics.go +++ b/service/databasemigrationservice/api_op_DescribeTableStatistics.go @@ -83,6 +83,9 @@ func addOperationDescribeTableStatisticsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeTableStatisticsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ImportCertificate.go b/service/databasemigrationservice/api_op_ImportCertificate.go index 7cf561c030e..4bc07a90bfa 100644 --- a/service/databasemigrationservice/api_op_ImportCertificate.go +++ b/service/databasemigrationservice/api_op_ImportCertificate.go @@ -64,6 +64,9 @@ func addOperationImportCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationImportCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ListTagsForResource.go b/service/databasemigrationservice/api_op_ListTagsForResource.go index 3829cc720e6..9906101bbfc 100644 --- a/service/databasemigrationservice/api_op_ListTagsForResource.go +++ b/service/databasemigrationservice/api_op_ListTagsForResource.go @@ -59,6 +59,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ModifyEndpoint.go b/service/databasemigrationservice/api_op_ModifyEndpoint.go index 669da3af054..fe4e20cf616 100644 --- a/service/databasemigrationservice/api_op_ModifyEndpoint.go +++ b/service/databasemigrationservice/api_op_ModifyEndpoint.go @@ -234,6 +234,9 @@ func addOperationModifyEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -276,6 +279,9 @@ func addOperationModifyEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ModifyEventSubscription.go b/service/databasemigrationservice/api_op_ModifyEventSubscription.go index 249716bdeb4..fa024942056 100644 --- a/service/databasemigrationservice/api_op_ModifyEventSubscription.go +++ b/service/databasemigrationservice/api_op_ModifyEventSubscription.go @@ -71,6 +71,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ModifyReplicationInstance.go b/service/databasemigrationservice/api_op_ModifyReplicationInstance.go index 89443702f17..be02c5d615d 100644 --- a/service/databasemigrationservice/api_op_ModifyReplicationInstance.go +++ b/service/databasemigrationservice/api_op_ModifyReplicationInstance.go @@ -121,6 +121,9 @@ func addOperationModifyReplicationInstanceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationModifyReplicationInstanceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go index 1533cd3af4b..3e630c90ed4 100644 --- a/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go @@ -63,6 +63,9 @@ func addOperationModifyReplicationSubnetGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationModifyReplicationSubnetGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ModifyReplicationTask.go b/service/databasemigrationservice/api_op_ModifyReplicationTask.go index cf803ea29fd..166f5f7591f 100644 --- a/service/databasemigrationservice/api_op_ModifyReplicationTask.go +++ b/service/databasemigrationservice/api_op_ModifyReplicationTask.go @@ -117,6 +117,9 @@ func addOperationModifyReplicationTaskMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationModifyReplicationTaskMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_RebootReplicationInstance.go b/service/databasemigrationservice/api_op_RebootReplicationInstance.go index 15b19cfa5b7..48c2babaa9b 100644 --- a/service/databasemigrationservice/api_op_RebootReplicationInstance.go +++ b/service/databasemigrationservice/api_op_RebootReplicationInstance.go @@ -58,6 +58,9 @@ func addOperationRebootReplicationInstanceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRebootReplicationInstanceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_RefreshSchemas.go b/service/databasemigrationservice/api_op_RefreshSchemas.go index 2b40d6807f4..63e31a7277b 100644 --- a/service/databasemigrationservice/api_op_RefreshSchemas.go +++ b/service/databasemigrationservice/api_op_RefreshSchemas.go @@ -62,6 +62,9 @@ func addOperationRefreshSchemasMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationRefreshSchemasMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_ReloadTables.go b/service/databasemigrationservice/api_op_ReloadTables.go index 11f821ebb36..2a6981d904d 100644 --- a/service/databasemigrationservice/api_op_ReloadTables.go +++ b/service/databasemigrationservice/api_op_ReloadTables.go @@ -64,6 +64,9 @@ func addOperationReloadTablesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationReloadTablesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_RemoveTagsFromResource.go b/service/databasemigrationservice/api_op_RemoveTagsFromResource.go index 13325295c61..1adee9d751c 100644 --- a/service/databasemigrationservice/api_op_RemoveTagsFromResource.go +++ b/service/databasemigrationservice/api_op_RemoveTagsFromResource.go @@ -59,6 +59,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_StartReplicationTask.go b/service/databasemigrationservice/api_op_StartReplicationTask.go index 15832ee7760..606383009c8 100644 --- a/service/databasemigrationservice/api_op_StartReplicationTask.go +++ b/service/databasemigrationservice/api_op_StartReplicationTask.go @@ -91,6 +91,9 @@ func addOperationStartReplicationTaskMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationStartReplicationTaskMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go b/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go index c7789a89b47..abb83b785c2 100644 --- a/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go +++ b/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go @@ -56,6 +56,9 @@ func addOperationStartReplicationTaskAssessmentMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartReplicationTaskAssessmentMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go b/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go index 56cd5c5d0ab..15dff21267a 100644 --- a/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go +++ b/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go @@ -119,6 +119,9 @@ func addOperationStartReplicationTaskAssessmentRunMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationStartReplicationTaskAssessmentRunMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_StopReplicationTask.go b/service/databasemigrationservice/api_op_StopReplicationTask.go index 3bdadad28ac..5cbab8a07aa 100644 --- a/service/databasemigrationservice/api_op_StopReplicationTask.go +++ b/service/databasemigrationservice/api_op_StopReplicationTask.go @@ -55,6 +55,9 @@ func addOperationStopReplicationTaskMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStopReplicationTaskMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/api_op_TestConnection.go b/service/databasemigrationservice/api_op_TestConnection.go index 2596ba05b5c..58ef3fb93fd 100644 --- a/service/databasemigrationservice/api_op_TestConnection.go +++ b/service/databasemigrationservice/api_op_TestConnection.go @@ -60,6 +60,9 @@ func addOperationTestConnectionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationTestConnectionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/databasemigrationservice/go.mod b/service/databasemigrationservice/go.mod index 7f35cb5f63f..13ede71f3d4 100644 --- a/service/databasemigrationservice/go.mod +++ b/service/databasemigrationservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/databasemigrationservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/databasemigrationservice/go.sum b/service/databasemigrationservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/databasemigrationservice/go.sum +++ b/service/databasemigrationservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/dataexchange/api_client.go b/service/dataexchange/api_client.go index 00dee3f594e..8ba13172cff 100644 --- a/service/dataexchange/api_client.go +++ b/service/dataexchange/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/dataexchange/api_op_CancelJob.go b/service/dataexchange/api_op_CancelJob.go index a10f075dddd..7e2b3324b25 100644 --- a/service/dataexchange/api_op_CancelJob.go +++ b/service/dataexchange/api_op_CancelJob.go @@ -49,6 +49,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_CreateDataSet.go b/service/dataexchange/api_op_CreateDataSet.go index 93987b41b1d..8f8c2810d06 100644 --- a/service/dataexchange/api_op_CreateDataSet.go +++ b/service/dataexchange/api_op_CreateDataSet.go @@ -107,6 +107,9 @@ func addOperationCreateDataSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationCreateDataSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_CreateJob.go b/service/dataexchange/api_op_CreateJob.go index b8a83d7467e..c9277517960 100644 --- a/service/dataexchange/api_op_CreateJob.go +++ b/service/dataexchange/api_op_CreateJob.go @@ -81,6 +81,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_CreateRevision.go b/service/dataexchange/api_op_CreateRevision.go index 43feb5893df..c712f958ba4 100644 --- a/service/dataexchange/api_op_CreateRevision.go +++ b/service/dataexchange/api_op_CreateRevision.go @@ -95,6 +95,9 @@ func addOperationCreateRevisionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateRevisionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_DeleteAsset.go b/service/dataexchange/api_op_DeleteAsset.go index 7b24cc90a40..3795480bc4b 100644 --- a/service/dataexchange/api_op_DeleteAsset.go +++ b/service/dataexchange/api_op_DeleteAsset.go @@ -58,6 +58,9 @@ func addOperationDeleteAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_DeleteDataSet.go b/service/dataexchange/api_op_DeleteDataSet.go index 1ab824bc9a7..30ddf891f70 100644 --- a/service/dataexchange/api_op_DeleteDataSet.go +++ b/service/dataexchange/api_op_DeleteDataSet.go @@ -48,6 +48,9 @@ func addOperationDeleteDataSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDataSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_DeleteRevision.go b/service/dataexchange/api_op_DeleteRevision.go index cb2cad81721..259b27507ab 100644 --- a/service/dataexchange/api_op_DeleteRevision.go +++ b/service/dataexchange/api_op_DeleteRevision.go @@ -53,6 +53,9 @@ func addOperationDeleteRevisionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteRevisionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_GetAsset.go b/service/dataexchange/api_op_GetAsset.go index 5efec8709f7..2acb535eef9 100644 --- a/service/dataexchange/api_op_GetAsset.go +++ b/service/dataexchange/api_op_GetAsset.go @@ -96,6 +96,9 @@ func addOperationGetAssetMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationGetAssetMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_GetDataSet.go b/service/dataexchange/api_op_GetDataSet.go index b566c5a09db..dc0b6060fe7 100644 --- a/service/dataexchange/api_op_GetDataSet.go +++ b/service/dataexchange/api_op_GetDataSet.go @@ -89,6 +89,9 @@ func addOperationGetDataSetMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetDataSetMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_GetJob.go b/service/dataexchange/api_op_GetJob.go index d86289e5683..0f49e92ba45 100644 --- a/service/dataexchange/api_op_GetJob.go +++ b/service/dataexchange/api_op_GetJob.go @@ -75,6 +75,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_GetRevision.go b/service/dataexchange/api_op_GetRevision.go index 06ef21497d7..0cf17a4db16 100644 --- a/service/dataexchange/api_op_GetRevision.go +++ b/service/dataexchange/api_op_GetRevision.go @@ -90,6 +90,9 @@ func addOperationGetRevisionMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetRevisionMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_ListDataSetRevisions.go b/service/dataexchange/api_op_ListDataSetRevisions.go index 6d077ee1be1..df5deb9955f 100644 --- a/service/dataexchange/api_op_ListDataSetRevisions.go +++ b/service/dataexchange/api_op_ListDataSetRevisions.go @@ -65,6 +65,9 @@ func addOperationListDataSetRevisionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListDataSetRevisionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_ListDataSets.go b/service/dataexchange/api_op_ListDataSets.go index 623b679d066..a4bfa18ea36 100644 --- a/service/dataexchange/api_op_ListDataSets.go +++ b/service/dataexchange/api_op_ListDataSets.go @@ -65,6 +65,9 @@ func addOperationListDataSetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListDataSetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_ListJobs.go b/service/dataexchange/api_op_ListJobs.go index ed109914181..ed477c4f529 100644 --- a/service/dataexchange/api_op_ListJobs.go +++ b/service/dataexchange/api_op_ListJobs.go @@ -65,6 +65,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_ListRevisionAssets.go b/service/dataexchange/api_op_ListRevisionAssets.go index 8caa9f3ab26..b115be83eb5 100644 --- a/service/dataexchange/api_op_ListRevisionAssets.go +++ b/service/dataexchange/api_op_ListRevisionAssets.go @@ -70,6 +70,9 @@ func addOperationListRevisionAssetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListRevisionAssetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_ListTagsForResource.go b/service/dataexchange/api_op_ListTagsForResource.go index 4665fc9d20a..f5cdb364ee2 100644 --- a/service/dataexchange/api_op_ListTagsForResource.go +++ b/service/dataexchange/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_StartJob.go b/service/dataexchange/api_op_StartJob.go index a9094d4417b..77ab777ef16 100644 --- a/service/dataexchange/api_op_StartJob.go +++ b/service/dataexchange/api_op_StartJob.go @@ -48,6 +48,9 @@ func addOperationStartJobMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStartJobMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_TagResource.go b/service/dataexchange/api_op_TagResource.go index e7aa1ec9dd7..56541506d33 100644 --- a/service/dataexchange/api_op_TagResource.go +++ b/service/dataexchange/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_UntagResource.go b/service/dataexchange/api_op_UntagResource.go index 30becbf62a1..3af720fafe3 100644 --- a/service/dataexchange/api_op_UntagResource.go +++ b/service/dataexchange/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_UpdateAsset.go b/service/dataexchange/api_op_UpdateAsset.go index f325c8b3c2d..d36f61f963a 100644 --- a/service/dataexchange/api_op_UpdateAsset.go +++ b/service/dataexchange/api_op_UpdateAsset.go @@ -104,6 +104,9 @@ func addOperationUpdateAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationUpdateAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_UpdateDataSet.go b/service/dataexchange/api_op_UpdateDataSet.go index d608ccff4e2..bfa79528297 100644 --- a/service/dataexchange/api_op_UpdateDataSet.go +++ b/service/dataexchange/api_op_UpdateDataSet.go @@ -93,6 +93,9 @@ func addOperationUpdateDataSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationUpdateDataSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/api_op_UpdateRevision.go b/service/dataexchange/api_op_UpdateRevision.go index 3594bcdfa5d..72909ee75ed 100644 --- a/service/dataexchange/api_op_UpdateRevision.go +++ b/service/dataexchange/api_op_UpdateRevision.go @@ -96,6 +96,9 @@ func addOperationUpdateRevisionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationUpdateRevisionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dataexchange/go.mod b/service/dataexchange/go.mod index ffbce49ccb1..ede3b890782 100644 --- a/service/dataexchange/go.mod +++ b/service/dataexchange/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/dataexchange go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dataexchange/go.sum b/service/dataexchange/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/dataexchange/go.sum +++ b/service/dataexchange/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/datapipeline/api_client.go b/service/datapipeline/api_client.go index 5e0cd97da40..d437c66930e 100644 --- a/service/datapipeline/api_client.go +++ b/service/datapipeline/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/datapipeline/api_op_ActivatePipeline.go b/service/datapipeline/api_op_ActivatePipeline.go index 7a52104b579..f16b758f441 100644 --- a/service/datapipeline/api_op_ActivatePipeline.go +++ b/service/datapipeline/api_op_ActivatePipeline.go @@ -65,6 +65,9 @@ func addOperationActivatePipelineMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationActivatePipelineMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_AddTags.go b/service/datapipeline/api_op_AddTags.go index 2c6d3d86ebc..424d5c1d144 100644 --- a/service/datapipeline/api_op_AddTags.go +++ b/service/datapipeline/api_op_AddTags.go @@ -56,6 +56,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_CreatePipeline.go b/service/datapipeline/api_op_CreatePipeline.go index 3aa20359277..4bad92385db 100644 --- a/service/datapipeline/api_op_CreatePipeline.go +++ b/service/datapipeline/api_op_CreatePipeline.go @@ -86,6 +86,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_DeactivatePipeline.go b/service/datapipeline/api_op_DeactivatePipeline.go index 7da810f8789..430892372e2 100644 --- a/service/datapipeline/api_op_DeactivatePipeline.go +++ b/service/datapipeline/api_op_DeactivatePipeline.go @@ -59,6 +59,9 @@ func addOperationDeactivatePipelineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeactivatePipelineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_DeletePipeline.go b/service/datapipeline/api_op_DeletePipeline.go index 5ea42ce4c37..0014968b015 100644 --- a/service/datapipeline/api_op_DeletePipeline.go +++ b/service/datapipeline/api_op_DeletePipeline.go @@ -54,6 +54,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_DescribeObjects.go b/service/datapipeline/api_op_DescribeObjects.go index ca4aba58161..66f30862b2c 100644 --- a/service/datapipeline/api_op_DescribeObjects.go +++ b/service/datapipeline/api_op_DescribeObjects.go @@ -83,6 +83,9 @@ func addOperationDescribeObjectsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeObjectsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_DescribePipelines.go b/service/datapipeline/api_op_DescribePipelines.go index 4cb12e99e78..eb1ce46c29d 100644 --- a/service/datapipeline/api_op_DescribePipelines.go +++ b/service/datapipeline/api_op_DescribePipelines.go @@ -64,6 +64,9 @@ func addOperationDescribePipelinesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribePipelinesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_EvaluateExpression.go b/service/datapipeline/api_op_EvaluateExpression.go index 155330826b5..99ccc57e496 100644 --- a/service/datapipeline/api_op_EvaluateExpression.go +++ b/service/datapipeline/api_op_EvaluateExpression.go @@ -68,6 +68,9 @@ func addOperationEvaluateExpressionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationEvaluateExpressionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_GetPipelineDefinition.go b/service/datapipeline/api_op_GetPipelineDefinition.go index 1bc0472d51e..2f3db96ccf6 100644 --- a/service/datapipeline/api_op_GetPipelineDefinition.go +++ b/service/datapipeline/api_op_GetPipelineDefinition.go @@ -68,6 +68,9 @@ func addOperationGetPipelineDefinitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetPipelineDefinitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_ListPipelines.go b/service/datapipeline/api_op_ListPipelines.go index c4447269522..48d1f720137 100644 --- a/service/datapipeline/api_op_ListPipelines.go +++ b/service/datapipeline/api_op_ListPipelines.go @@ -70,6 +70,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_PollForTask.go b/service/datapipeline/api_op_PollForTask.go index 596336da295..dcee34bd40b 100644 --- a/service/datapipeline/api_op_PollForTask.go +++ b/service/datapipeline/api_op_PollForTask.go @@ -86,6 +86,9 @@ func addOperationPollForTaskMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationPollForTaskMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_PutPipelineDefinition.go b/service/datapipeline/api_op_PutPipelineDefinition.go index 30c9ae0b09d..059e60c2386 100644 --- a/service/datapipeline/api_op_PutPipelineDefinition.go +++ b/service/datapipeline/api_op_PutPipelineDefinition.go @@ -97,6 +97,9 @@ func addOperationPutPipelineDefinitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationPutPipelineDefinitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_QueryObjects.go b/service/datapipeline/api_op_QueryObjects.go index 609ba515848..5d90d772ca9 100644 --- a/service/datapipeline/api_op_QueryObjects.go +++ b/service/datapipeline/api_op_QueryObjects.go @@ -87,6 +87,9 @@ func addOperationQueryObjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationQueryObjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_RemoveTags.go b/service/datapipeline/api_op_RemoveTags.go index 81f897f085a..9ef54a8f409 100644 --- a/service/datapipeline/api_op_RemoveTags.go +++ b/service/datapipeline/api_op_RemoveTags.go @@ -55,6 +55,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_ReportTaskProgress.go b/service/datapipeline/api_op_ReportTaskProgress.go index 1eeb9e07707..d07330204e0 100644 --- a/service/datapipeline/api_op_ReportTaskProgress.go +++ b/service/datapipeline/api_op_ReportTaskProgress.go @@ -69,6 +69,9 @@ func addOperationReportTaskProgressMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationReportTaskProgressMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go b/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go index 59598a71cfd..363f541b8ad 100644 --- a/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go +++ b/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go @@ -72,6 +72,9 @@ func addOperationReportTaskRunnerHeartbeatMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationReportTaskRunnerHeartbeatMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_SetStatus.go b/service/datapipeline/api_op_SetStatus.go index 246b4199edf..1e201f3e1c7 100644 --- a/service/datapipeline/api_op_SetStatus.go +++ b/service/datapipeline/api_op_SetStatus.go @@ -65,6 +65,9 @@ func addOperationSetStatusMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSetStatusMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_SetTaskStatus.go b/service/datapipeline/api_op_SetTaskStatus.go index 6d8a9d19488..951ebaafe0e 100644 --- a/service/datapipeline/api_op_SetTaskStatus.go +++ b/service/datapipeline/api_op_SetTaskStatus.go @@ -80,6 +80,9 @@ func addOperationSetTaskStatusMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationSetTaskStatusMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/api_op_ValidatePipelineDefinition.go b/service/datapipeline/api_op_ValidatePipelineDefinition.go index e176243aa14..605a6cdd4e6 100644 --- a/service/datapipeline/api_op_ValidatePipelineDefinition.go +++ b/service/datapipeline/api_op_ValidatePipelineDefinition.go @@ -75,6 +75,9 @@ func addOperationValidatePipelineDefinitionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationValidatePipelineDefinitionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datapipeline/go.mod b/service/datapipeline/go.mod index b22384f2388..1fe228314ca 100644 --- a/service/datapipeline/go.mod +++ b/service/datapipeline/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/datapipeline go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/datapipeline/go.sum b/service/datapipeline/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/datapipeline/go.sum +++ b/service/datapipeline/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/datasync/api_client.go b/service/datasync/api_client.go index 2b4cacd7e29..b9487df89ac 100644 --- a/service/datasync/api_client.go +++ b/service/datasync/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/datasync/api_op_CancelTaskExecution.go b/service/datasync/api_op_CancelTaskExecution.go index 47fd835fdf9..497e79398a1 100644 --- a/service/datasync/api_op_CancelTaskExecution.go +++ b/service/datasync/api_op_CancelTaskExecution.go @@ -56,6 +56,9 @@ func addOperationCancelTaskExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCancelTaskExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateAgent.go b/service/datasync/api_op_CreateAgent.go index 1c417f4118a..e45797fef60 100644 --- a/service/datasync/api_op_CreateAgent.go +++ b/service/datasync/api_op_CreateAgent.go @@ -108,6 +108,9 @@ func addOperationCreateAgentMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateAgentMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateLocationEfs.go b/service/datasync/api_op_CreateLocationEfs.go index 8ae8a11f3c9..078eeeefaff 100644 --- a/service/datasync/api_op_CreateLocationEfs.go +++ b/service/datasync/api_op_CreateLocationEfs.go @@ -90,6 +90,9 @@ func addOperationCreateLocationEfsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateLocationEfsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateLocationFsxWindows.go b/service/datasync/api_op_CreateLocationFsxWindows.go index 4785677b1ce..3343dd71178 100644 --- a/service/datasync/api_op_CreateLocationFsxWindows.go +++ b/service/datasync/api_op_CreateLocationFsxWindows.go @@ -86,6 +86,9 @@ func addOperationCreateLocationFsxWindowsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateLocationFsxWindowsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateLocationNfs.go b/service/datasync/api_op_CreateLocationNfs.go index 21930dda6e6..4607df473c8 100644 --- a/service/datasync/api_op_CreateLocationNfs.go +++ b/service/datasync/api_op_CreateLocationNfs.go @@ -103,6 +103,9 @@ func addOperationCreateLocationNfsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateLocationNfsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateLocationObjectStorage.go b/service/datasync/api_op_CreateLocationObjectStorage.go index 53e52ec746e..03a65f47e0f 100644 --- a/service/datasync/api_op_CreateLocationObjectStorage.go +++ b/service/datasync/api_op_CreateLocationObjectStorage.go @@ -103,6 +103,9 @@ func addOperationCreateLocationObjectStorageMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateLocationObjectStorageMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateLocationS3.go b/service/datasync/api_op_CreateLocationS3.go index adfe4db805f..b4bf4fbc8fb 100644 --- a/service/datasync/api_op_CreateLocationS3.go +++ b/service/datasync/api_op_CreateLocationS3.go @@ -91,6 +91,9 @@ func addOperationCreateLocationS3Middlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateLocationS3Middlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateLocationSmb.go b/service/datasync/api_op_CreateLocationSmb.go index 0415f7531dd..36345ad3be8 100644 --- a/service/datasync/api_op_CreateLocationSmb.go +++ b/service/datasync/api_op_CreateLocationSmb.go @@ -106,6 +106,9 @@ func addOperationCreateLocationSmbMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationCreateLocationSmbMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_CreateTask.go b/service/datasync/api_op_CreateTask.go index 9722d877605..f961909192a 100644 --- a/service/datasync/api_op_CreateTask.go +++ b/service/datasync/api_op_CreateTask.go @@ -104,6 +104,9 @@ func addOperationCreateTaskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateTaskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DeleteAgent.go b/service/datasync/api_op_DeleteAgent.go index cb39f4b46d1..b84a5c0ac6f 100644 --- a/service/datasync/api_op_DeleteAgent.go +++ b/service/datasync/api_op_DeleteAgent.go @@ -53,6 +53,9 @@ func addOperationDeleteAgentMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteAgentMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DeleteLocation.go b/service/datasync/api_op_DeleteLocation.go index a7137a04841..c29371dce3a 100644 --- a/service/datasync/api_op_DeleteLocation.go +++ b/service/datasync/api_op_DeleteLocation.go @@ -49,6 +49,9 @@ func addOperationDeleteLocationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteLocationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DeleteTask.go b/service/datasync/api_op_DeleteTask.go index 35498cd42b0..4ef342f5cff 100644 --- a/service/datasync/api_op_DeleteTask.go +++ b/service/datasync/api_op_DeleteTask.go @@ -49,6 +49,9 @@ func addOperationDeleteTaskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteTaskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeAgent.go b/service/datasync/api_op_DescribeAgent.go index 9210b62006e..6e4412e2ee4 100644 --- a/service/datasync/api_op_DescribeAgent.go +++ b/service/datasync/api_op_DescribeAgent.go @@ -81,6 +81,9 @@ func addOperationDescribeAgentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeAgentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeLocationEfs.go b/service/datasync/api_op_DescribeLocationEfs.go index 63b88abda20..69832de3e51 100644 --- a/service/datasync/api_op_DescribeLocationEfs.go +++ b/service/datasync/api_op_DescribeLocationEfs.go @@ -68,6 +68,9 @@ func addOperationDescribeLocationEfsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeLocationEfsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeLocationFsxWindows.go b/service/datasync/api_op_DescribeLocationFsxWindows.go index 3fc60a17252..2775ef9bcc7 100644 --- a/service/datasync/api_op_DescribeLocationFsxWindows.go +++ b/service/datasync/api_op_DescribeLocationFsxWindows.go @@ -72,6 +72,9 @@ func addOperationDescribeLocationFsxWindowsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeLocationFsxWindowsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeLocationNfs.go b/service/datasync/api_op_DescribeLocationNfs.go index c1f4fc433b3..743602dd06e 100644 --- a/service/datasync/api_op_DescribeLocationNfs.go +++ b/service/datasync/api_op_DescribeLocationNfs.go @@ -69,6 +69,9 @@ func addOperationDescribeLocationNfsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeLocationNfsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeLocationObjectStorage.go b/service/datasync/api_op_DescribeLocationObjectStorage.go index a1dd2018638..2fefbdd4489 100644 --- a/service/datasync/api_op_DescribeLocationObjectStorage.go +++ b/service/datasync/api_op_DescribeLocationObjectStorage.go @@ -86,6 +86,9 @@ func addOperationDescribeLocationObjectStorageMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeLocationObjectStorageMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeLocationS3.go b/service/datasync/api_op_DescribeLocationS3.go index 480d486d37e..84180e5bcf3 100644 --- a/service/datasync/api_op_DescribeLocationS3.go +++ b/service/datasync/api_op_DescribeLocationS3.go @@ -81,6 +81,9 @@ func addOperationDescribeLocationS3Middlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeLocationS3Middlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeLocationSmb.go b/service/datasync/api_op_DescribeLocationSmb.go index f808035621f..945b499f297 100644 --- a/service/datasync/api_op_DescribeLocationSmb.go +++ b/service/datasync/api_op_DescribeLocationSmb.go @@ -77,6 +77,9 @@ func addOperationDescribeLocationSmbMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeLocationSmbMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeTask.go b/service/datasync/api_op_DescribeTask.go index 92829da62a3..f605d008635 100644 --- a/service/datasync/api_op_DescribeTask.go +++ b/service/datasync/api_op_DescribeTask.go @@ -115,6 +115,9 @@ func addOperationDescribeTaskMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationDescribeTaskMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_DescribeTaskExecution.go b/service/datasync/api_op_DescribeTaskExecution.go index b8faf0f22e6..e335c7dd019 100644 --- a/service/datasync/api_op_DescribeTaskExecution.go +++ b/service/datasync/api_op_DescribeTaskExecution.go @@ -120,6 +120,9 @@ func addOperationDescribeTaskExecutionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationDescribeTaskExecutionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_ListAgents.go b/service/datasync/api_op_ListAgents.go index 08d783c41f2..767bba3a6f3 100644 --- a/service/datasync/api_op_ListAgents.go +++ b/service/datasync/api_op_ListAgents.go @@ -68,6 +68,9 @@ func addOperationListAgentsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAgentsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_ListLocations.go b/service/datasync/api_op_ListLocations.go index 1d240f6992c..8458c32b944 100644 --- a/service/datasync/api_op_ListLocations.go +++ b/service/datasync/api_op_ListLocations.go @@ -69,6 +69,9 @@ func addOperationListLocationsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListLocationsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_ListTagsForResource.go b/service/datasync/api_op_ListTagsForResource.go index f6693705e59..60cf8493523 100644 --- a/service/datasync/api_op_ListTagsForResource.go +++ b/service/datasync/api_op_ListTagsForResource.go @@ -66,6 +66,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_ListTaskExecutions.go b/service/datasync/api_op_ListTaskExecutions.go index 3f10feaa250..aa40802a741 100644 --- a/service/datasync/api_op_ListTaskExecutions.go +++ b/service/datasync/api_op_ListTaskExecutions.go @@ -64,6 +64,9 @@ func addOperationListTaskExecutionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTaskExecutionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_ListTasks.go b/service/datasync/api_op_ListTasks.go index 8277801edc0..acb6a880b7b 100644 --- a/service/datasync/api_op_ListTasks.go +++ b/service/datasync/api_op_ListTasks.go @@ -67,6 +67,9 @@ func addOperationListTasksMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListTasksMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_StartTaskExecution.go b/service/datasync/api_op_StartTaskExecution.go index dafa1a26871..830f07f1220 100644 --- a/service/datasync/api_op_StartTaskExecution.go +++ b/service/datasync/api_op_StartTaskExecution.go @@ -76,6 +76,9 @@ func addOperationStartTaskExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationStartTaskExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_TagResource.go b/service/datasync/api_op_TagResource.go index c3f67cea999..b58831a656c 100644 --- a/service/datasync/api_op_TagResource.go +++ b/service/datasync/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_UntagResource.go b/service/datasync/api_op_UntagResource.go index fa36fed1923..93805e13ffc 100644 --- a/service/datasync/api_op_UntagResource.go +++ b/service/datasync/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_UpdateAgent.go b/service/datasync/api_op_UpdateAgent.go index 36b9d360192..4b6ee6aac2f 100644 --- a/service/datasync/api_op_UpdateAgent.go +++ b/service/datasync/api_op_UpdateAgent.go @@ -52,6 +52,9 @@ func addOperationUpdateAgentMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUpdateAgentMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/api_op_UpdateTask.go b/service/datasync/api_op_UpdateTask.go index a37e3fa6ca4..a65fe567801 100644 --- a/service/datasync/api_op_UpdateTask.go +++ b/service/datasync/api_op_UpdateTask.go @@ -79,6 +79,9 @@ func addOperationUpdateTaskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateTaskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/datasync/go.mod b/service/datasync/go.mod index 0b06211f2ca..a1ba71e25b6 100644 --- a/service/datasync/go.mod +++ b/service/datasync/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/datasync go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/datasync/go.sum b/service/datasync/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/datasync/go.sum +++ b/service/datasync/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/dax/api_client.go b/service/dax/api_client.go index a408500c595..21650537157 100644 --- a/service/dax/api_client.go +++ b/service/dax/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/dax/api_op_CreateCluster.go b/service/dax/api_op_CreateCluster.go index 11f06430414..24a0a389941 100644 --- a/service/dax/api_op_CreateCluster.go +++ b/service/dax/api_op_CreateCluster.go @@ -143,6 +143,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -185,6 +188,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_CreateParameterGroup.go b/service/dax/api_op_CreateParameterGroup.go index 81bcaf92235..7361118d9cc 100644 --- a/service/dax/api_op_CreateParameterGroup.go +++ b/service/dax/api_op_CreateParameterGroup.go @@ -58,6 +58,9 @@ func addOperationCreateParameterGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateParameterGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_CreateSubnetGroup.go b/service/dax/api_op_CreateSubnetGroup.go index 38eef8c2805..7d558f0c384 100644 --- a/service/dax/api_op_CreateSubnetGroup.go +++ b/service/dax/api_op_CreateSubnetGroup.go @@ -61,6 +61,9 @@ func addOperationCreateSubnetGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateSubnetGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DecreaseReplicationFactor.go b/service/dax/api_op_DecreaseReplicationFactor.go index 4530509529d..8f579b46e5e 100644 --- a/service/dax/api_op_DecreaseReplicationFactor.go +++ b/service/dax/api_op_DecreaseReplicationFactor.go @@ -67,6 +67,9 @@ func addOperationDecreaseReplicationFactorMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDecreaseReplicationFactorMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DeleteCluster.go b/service/dax/api_op_DeleteCluster.go index 3450c1a3f26..dbdac05de7c 100644 --- a/service/dax/api_op_DeleteCluster.go +++ b/service/dax/api_op_DeleteCluster.go @@ -56,6 +56,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DeleteParameterGroup.go b/service/dax/api_op_DeleteParameterGroup.go index 4f73686b07d..885936331dd 100644 --- a/service/dax/api_op_DeleteParameterGroup.go +++ b/service/dax/api_op_DeleteParameterGroup.go @@ -54,6 +54,9 @@ func addOperationDeleteParameterGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteParameterGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DeleteSubnetGroup.go b/service/dax/api_op_DeleteSubnetGroup.go index 917214734f2..3208e85db88 100644 --- a/service/dax/api_op_DeleteSubnetGroup.go +++ b/service/dax/api_op_DeleteSubnetGroup.go @@ -54,6 +54,9 @@ func addOperationDeleteSubnetGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteSubnetGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DescribeClusters.go b/service/dax/api_op_DescribeClusters.go index c05e30bc2d9..0e30d56ee41 100644 --- a/service/dax/api_op_DescribeClusters.go +++ b/service/dax/api_op_DescribeClusters.go @@ -76,6 +76,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DescribeDefaultParameters.go b/service/dax/api_op_DescribeDefaultParameters.go index a9049d82683..db8e983e0c4 100644 --- a/service/dax/api_op_DescribeDefaultParameters.go +++ b/service/dax/api_op_DescribeDefaultParameters.go @@ -62,6 +62,9 @@ func addOperationDescribeDefaultParametersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeDefaultParametersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DescribeEvents.go b/service/dax/api_op_DescribeEvents.go index 8e3d5066595..5ec90d8f841 100644 --- a/service/dax/api_op_DescribeEvents.go +++ b/service/dax/api_op_DescribeEvents.go @@ -86,6 +86,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DescribeParameterGroups.go b/service/dax/api_op_DescribeParameterGroups.go index b7a9153d607..956bb1513bb 100644 --- a/service/dax/api_op_DescribeParameterGroups.go +++ b/service/dax/api_op_DescribeParameterGroups.go @@ -67,6 +67,9 @@ func addOperationDescribeParameterGroupsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeParameterGroupsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DescribeParameters.go b/service/dax/api_op_DescribeParameters.go index 89376297fac..cc27edb63fa 100644 --- a/service/dax/api_op_DescribeParameters.go +++ b/service/dax/api_op_DescribeParameters.go @@ -72,6 +72,9 @@ func addOperationDescribeParametersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeParametersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_DescribeSubnetGroups.go b/service/dax/api_op_DescribeSubnetGroups.go index 35225576e1e..3b034217938 100644 --- a/service/dax/api_op_DescribeSubnetGroups.go +++ b/service/dax/api_op_DescribeSubnetGroups.go @@ -67,6 +67,9 @@ func addOperationDescribeSubnetGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeSubnetGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_IncreaseReplicationFactor.go b/service/dax/api_op_IncreaseReplicationFactor.go index 50dc8904c94..be7d9f562e4 100644 --- a/service/dax/api_op_IncreaseReplicationFactor.go +++ b/service/dax/api_op_IncreaseReplicationFactor.go @@ -63,6 +63,9 @@ func addOperationIncreaseReplicationFactorMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationIncreaseReplicationFactorMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_ListTags.go b/service/dax/api_op_ListTags.go index 2346ef09ce5..c44cc4e3d5a 100644 --- a/service/dax/api_op_ListTags.go +++ b/service/dax/api_op_ListTags.go @@ -63,6 +63,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_RebootNode.go b/service/dax/api_op_RebootNode.go index 5a4d9fe5242..b96748adc62 100644 --- a/service/dax/api_op_RebootNode.go +++ b/service/dax/api_op_RebootNode.go @@ -60,6 +60,9 @@ func addOperationRebootNodeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRebootNodeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_TagResource.go b/service/dax/api_op_TagResource.go index cb303a98993..88e946abeb9 100644 --- a/service/dax/api_op_TagResource.go +++ b/service/dax/api_op_TagResource.go @@ -59,6 +59,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_UntagResource.go b/service/dax/api_op_UntagResource.go index 45376575d6a..fe29b3f659f 100644 --- a/service/dax/api_op_UntagResource.go +++ b/service/dax/api_op_UntagResource.go @@ -60,6 +60,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_UpdateCluster.go b/service/dax/api_op_UpdateCluster.go index 3de8c39ab26..d8153c6daed 100644 --- a/service/dax/api_op_UpdateCluster.go +++ b/service/dax/api_op_UpdateCluster.go @@ -77,6 +77,9 @@ func addOperationUpdateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_UpdateParameterGroup.go b/service/dax/api_op_UpdateParameterGroup.go index da3e8fd1c4d..a27e1bb4a96 100644 --- a/service/dax/api_op_UpdateParameterGroup.go +++ b/service/dax/api_op_UpdateParameterGroup.go @@ -60,6 +60,9 @@ func addOperationUpdateParameterGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateParameterGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/api_op_UpdateSubnetGroup.go b/service/dax/api_op_UpdateSubnetGroup.go index 59264bbab65..adc780a151a 100644 --- a/service/dax/api_op_UpdateSubnetGroup.go +++ b/service/dax/api_op_UpdateSubnetGroup.go @@ -59,6 +59,9 @@ func addOperationUpdateSubnetGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateSubnetGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dax/go.mod b/service/dax/go.mod index 5d31d2829e3..7f975f2e1eb 100644 --- a/service/dax/go.mod +++ b/service/dax/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/dax go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dax/go.sum b/service/dax/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/dax/go.sum +++ b/service/dax/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/detective/api_client.go b/service/detective/api_client.go index 88d4f6dc02b..a7881373720 100644 --- a/service/detective/api_client.go +++ b/service/detective/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/detective/api_op_AcceptInvitation.go b/service/detective/api_op_AcceptInvitation.go index 0d35c876520..0615e846514 100644 --- a/service/detective/api_op_AcceptInvitation.go +++ b/service/detective/api_op_AcceptInvitation.go @@ -52,6 +52,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_CreateGraph.go b/service/detective/api_op_CreateGraph.go index 44dd102efc3..68024047e52 100644 --- a/service/detective/api_op_CreateGraph.go +++ b/service/detective/api_op_CreateGraph.go @@ -60,6 +60,9 @@ func addOperationCreateGraphMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateGraphMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_CreateMembers.go b/service/detective/api_op_CreateMembers.go index 174c92ac7a9..14516c74f0e 100644 --- a/service/detective/api_op_CreateMembers.go +++ b/service/detective/api_op_CreateMembers.go @@ -87,6 +87,9 @@ func addOperationCreateMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_DeleteGraph.go b/service/detective/api_op_DeleteGraph.go index 4321ec177dd..6e2cae95880 100644 --- a/service/detective/api_op_DeleteGraph.go +++ b/service/detective/api_op_DeleteGraph.go @@ -50,6 +50,9 @@ func addOperationDeleteGraphMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteGraphMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_DeleteMembers.go b/service/detective/api_op_DeleteMembers.go index f6b437d1ed9..4c3685a968c 100644 --- a/service/detective/api_op_DeleteMembers.go +++ b/service/detective/api_op_DeleteMembers.go @@ -68,6 +68,9 @@ func addOperationDeleteMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_DisassociateMembership.go b/service/detective/api_op_DisassociateMembership.go index 4b74c4cafe1..90aa6dc6d15 100644 --- a/service/detective/api_op_DisassociateMembership.go +++ b/service/detective/api_op_DisassociateMembership.go @@ -50,6 +50,9 @@ func addOperationDisassociateMembershipMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDisassociateMembershipMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_GetMembers.go b/service/detective/api_op_GetMembers.go index 6fe7a920dbf..9a246b68173 100644 --- a/service/detective/api_op_GetMembers.go +++ b/service/detective/api_op_GetMembers.go @@ -67,6 +67,9 @@ func addOperationGetMembersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetMembersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_ListGraphs.go b/service/detective/api_op_ListGraphs.go index 07623994071..210f03d013c 100644 --- a/service/detective/api_op_ListGraphs.go +++ b/service/detective/api_op_ListGraphs.go @@ -64,6 +64,9 @@ func addOperationListGraphsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListGraphsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_ListInvitations.go b/service/detective/api_op_ListInvitations.go index dfc0e5cc686..9b3a66bbcc3 100644 --- a/service/detective/api_op_ListInvitations.go +++ b/service/detective/api_op_ListInvitations.go @@ -68,6 +68,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_ListMembers.go b/service/detective/api_op_ListMembers.go index 5b99ad8ad6c..b0d7732c27f 100644 --- a/service/detective/api_op_ListMembers.go +++ b/service/detective/api_op_ListMembers.go @@ -71,6 +71,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_RejectInvitation.go b/service/detective/api_op_RejectInvitation.go index 82ba63dad91..d3906437989 100644 --- a/service/detective/api_op_RejectInvitation.go +++ b/service/detective/api_op_RejectInvitation.go @@ -50,6 +50,9 @@ func addOperationRejectInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationRejectInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/api_op_StartMonitoringMember.go b/service/detective/api_op_StartMonitoringMember.go index a7ea8bd6b4c..bec3262b66a 100644 --- a/service/detective/api_op_StartMonitoringMember.go +++ b/service/detective/api_op_StartMonitoringMember.go @@ -62,6 +62,9 @@ func addOperationStartMonitoringMemberMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationStartMonitoringMemberMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/detective/go.mod b/service/detective/go.mod index b9ef69c0575..6e9b1aaa437 100644 --- a/service/detective/go.mod +++ b/service/detective/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/detective go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/detective/go.sum b/service/detective/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/detective/go.sum +++ b/service/detective/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/devicefarm/api_client.go b/service/devicefarm/api_client.go index 36fc4714fc7..a62c8c3789a 100644 --- a/service/devicefarm/api_client.go +++ b/service/devicefarm/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/devicefarm/api_op_CreateDevicePool.go b/service/devicefarm/api_op_CreateDevicePool.go index 4ca60503e3f..df49e54e653 100644 --- a/service/devicefarm/api_op_CreateDevicePool.go +++ b/service/devicefarm/api_op_CreateDevicePool.go @@ -76,6 +76,9 @@ func addOperationCreateDevicePoolMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateDevicePoolMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateInstanceProfile.go b/service/devicefarm/api_op_CreateInstanceProfile.go index 8debe873062..3545b62dabb 100644 --- a/service/devicefarm/api_op_CreateInstanceProfile.go +++ b/service/devicefarm/api_op_CreateInstanceProfile.go @@ -70,6 +70,9 @@ func addOperationCreateInstanceProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateInstanceProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateNetworkProfile.go b/service/devicefarm/api_op_CreateNetworkProfile.go index afe665defaa..c595023341d 100644 --- a/service/devicefarm/api_op_CreateNetworkProfile.go +++ b/service/devicefarm/api_op_CreateNetworkProfile.go @@ -93,6 +93,9 @@ func addOperationCreateNetworkProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateNetworkProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateProject.go b/service/devicefarm/api_op_CreateProject.go index 5abd555b68f..9ccc1ecd400 100644 --- a/service/devicefarm/api_op_CreateProject.go +++ b/service/devicefarm/api_op_CreateProject.go @@ -60,6 +60,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateRemoteAccessSession.go b/service/devicefarm/api_op_CreateRemoteAccessSession.go index 97153865879..31c6c1fbe9e 100644 --- a/service/devicefarm/api_op_CreateRemoteAccessSession.go +++ b/service/devicefarm/api_op_CreateRemoteAccessSession.go @@ -119,6 +119,9 @@ func addOperationCreateRemoteAccessSessionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationCreateRemoteAccessSessionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateTestGridProject.go b/service/devicefarm/api_op_CreateTestGridProject.go index c06db9fb8c4..170bcf6c5fd 100644 --- a/service/devicefarm/api_op_CreateTestGridProject.go +++ b/service/devicefarm/api_op_CreateTestGridProject.go @@ -57,6 +57,9 @@ func addOperationCreateTestGridProjectMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateTestGridProjectMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateTestGridUrl.go b/service/devicefarm/api_op_CreateTestGridUrl.go index 6df22ab225d..aea90a54f77 100644 --- a/service/devicefarm/api_op_CreateTestGridUrl.go +++ b/service/devicefarm/api_op_CreateTestGridUrl.go @@ -64,6 +64,9 @@ func addOperationCreateTestGridUrlMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateTestGridUrlMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateUpload.go b/service/devicefarm/api_op_CreateUpload.go index 1623345fd85..e9aeb42f922 100644 --- a/service/devicefarm/api_op_CreateUpload.go +++ b/service/devicefarm/api_op_CreateUpload.go @@ -152,6 +152,9 @@ func addOperationCreateUploadMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationCreateUploadMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_CreateVPCEConfiguration.go b/service/devicefarm/api_op_CreateVPCEConfiguration.go index 1d4781dce1e..876e765c221 100644 --- a/service/devicefarm/api_op_CreateVPCEConfiguration.go +++ b/service/devicefarm/api_op_CreateVPCEConfiguration.go @@ -71,6 +71,9 @@ func addOperationCreateVPCEConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateVPCEConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteDevicePool.go b/service/devicefarm/api_op_DeleteDevicePool.go index ca83b1837a4..57ac102ad7d 100644 --- a/service/devicefarm/api_op_DeleteDevicePool.go +++ b/service/devicefarm/api_op_DeleteDevicePool.go @@ -52,6 +52,9 @@ func addOperationDeleteDevicePoolMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteDevicePoolMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteInstanceProfile.go b/service/devicefarm/api_op_DeleteInstanceProfile.go index b4d859e5c8d..0ed9354997b 100644 --- a/service/devicefarm/api_op_DeleteInstanceProfile.go +++ b/service/devicefarm/api_op_DeleteInstanceProfile.go @@ -49,6 +49,9 @@ func addOperationDeleteInstanceProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteInstanceProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteNetworkProfile.go b/service/devicefarm/api_op_DeleteNetworkProfile.go index a552d32bfaf..46137db8bfd 100644 --- a/service/devicefarm/api_op_DeleteNetworkProfile.go +++ b/service/devicefarm/api_op_DeleteNetworkProfile.go @@ -48,6 +48,9 @@ func addOperationDeleteNetworkProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteNetworkProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteProject.go b/service/devicefarm/api_op_DeleteProject.go index bf3cded26f0..0dd4f0c0f82 100644 --- a/service/devicefarm/api_op_DeleteProject.go +++ b/service/devicefarm/api_op_DeleteProject.go @@ -51,6 +51,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteRemoteAccessSession.go b/service/devicefarm/api_op_DeleteRemoteAccessSession.go index acf4af720dd..68b2fd150e8 100644 --- a/service/devicefarm/api_op_DeleteRemoteAccessSession.go +++ b/service/devicefarm/api_op_DeleteRemoteAccessSession.go @@ -52,6 +52,9 @@ func addOperationDeleteRemoteAccessSessionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteRemoteAccessSessionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteRun.go b/service/devicefarm/api_op_DeleteRun.go index e162a637459..a3a77b1a1d2 100644 --- a/service/devicefarm/api_op_DeleteRun.go +++ b/service/devicefarm/api_op_DeleteRun.go @@ -51,6 +51,9 @@ func addOperationDeleteRunMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteRunMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteTestGridProject.go b/service/devicefarm/api_op_DeleteTestGridProject.go index dda0a5284c6..b50df375f31 100644 --- a/service/devicefarm/api_op_DeleteTestGridProject.go +++ b/service/devicefarm/api_op_DeleteTestGridProject.go @@ -51,6 +51,9 @@ func addOperationDeleteTestGridProjectMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteTestGridProjectMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteUpload.go b/service/devicefarm/api_op_DeleteUpload.go index b271c20f401..896f421466c 100644 --- a/service/devicefarm/api_op_DeleteUpload.go +++ b/service/devicefarm/api_op_DeleteUpload.go @@ -50,6 +50,9 @@ func addOperationDeleteUploadMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteUploadMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_DeleteVPCEConfiguration.go b/service/devicefarm/api_op_DeleteVPCEConfiguration.go index e1b9a8ba2bc..13a1e60f3ef 100644 --- a/service/devicefarm/api_op_DeleteVPCEConfiguration.go +++ b/service/devicefarm/api_op_DeleteVPCEConfiguration.go @@ -49,6 +49,9 @@ func addOperationDeleteVPCEConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteVPCEConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetAccountSettings.go b/service/devicefarm/api_op_GetAccountSettings.go index 0749b939b39..58f26b3079c 100644 --- a/service/devicefarm/api_op_GetAccountSettings.go +++ b/service/devicefarm/api_op_GetAccountSettings.go @@ -52,6 +52,9 @@ func addOperationGetAccountSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationGetAccountSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetDevice.go b/service/devicefarm/api_op_GetDevice.go index 042efba51d6..eb396a30864 100644 --- a/service/devicefarm/api_op_GetDevice.go +++ b/service/devicefarm/api_op_GetDevice.go @@ -55,6 +55,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetDeviceMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetDeviceInstance.go b/service/devicefarm/api_op_GetDeviceInstance.go index 0ae8c435a6a..dd3ee8af79a 100644 --- a/service/devicefarm/api_op_GetDeviceInstance.go +++ b/service/devicefarm/api_op_GetDeviceInstance.go @@ -55,6 +55,9 @@ func addOperationGetDeviceInstanceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetDeviceInstanceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetDevicePool.go b/service/devicefarm/api_op_GetDevicePool.go index d08f42e06f2..c025030c974 100644 --- a/service/devicefarm/api_op_GetDevicePool.go +++ b/service/devicefarm/api_op_GetDevicePool.go @@ -55,6 +55,9 @@ func addOperationGetDevicePoolMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetDevicePoolMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetDevicePoolCompatibility.go b/service/devicefarm/api_op_GetDevicePoolCompatibility.go index 499e804c3e0..5313c938ac4 100644 --- a/service/devicefarm/api_op_GetDevicePoolCompatibility.go +++ b/service/devicefarm/api_op_GetDevicePoolCompatibility.go @@ -113,6 +113,9 @@ func addOperationGetDevicePoolCompatibilityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationGetDevicePoolCompatibilityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetInstanceProfile.go b/service/devicefarm/api_op_GetInstanceProfile.go index db2b666abb1..c493c9c0da8 100644 --- a/service/devicefarm/api_op_GetInstanceProfile.go +++ b/service/devicefarm/api_op_GetInstanceProfile.go @@ -53,6 +53,9 @@ func addOperationGetInstanceProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetInstanceProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetJob.go b/service/devicefarm/api_op_GetJob.go index 206f26ed2fe..053779415c2 100644 --- a/service/devicefarm/api_op_GetJob.go +++ b/service/devicefarm/api_op_GetJob.go @@ -55,6 +55,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetNetworkProfile.go b/service/devicefarm/api_op_GetNetworkProfile.go index d8889facc29..37daac09431 100644 --- a/service/devicefarm/api_op_GetNetworkProfile.go +++ b/service/devicefarm/api_op_GetNetworkProfile.go @@ -53,6 +53,9 @@ func addOperationGetNetworkProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetNetworkProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetOfferingStatus.go b/service/devicefarm/api_op_GetOfferingStatus.go index 24da8b33665..256c8977e66 100644 --- a/service/devicefarm/api_op_GetOfferingStatus.go +++ b/service/devicefarm/api_op_GetOfferingStatus.go @@ -67,6 +67,9 @@ func addOperationGetOfferingStatusMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetOfferingStatusMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetProject.go b/service/devicefarm/api_op_GetProject.go index 531e6cb3863..c13df78ba62 100644 --- a/service/devicefarm/api_op_GetProject.go +++ b/service/devicefarm/api_op_GetProject.go @@ -55,6 +55,9 @@ func addOperationGetProjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetProjectMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetRemoteAccessSession.go b/service/devicefarm/api_op_GetRemoteAccessSession.go index fd7f68e0a23..42d6b9e256b 100644 --- a/service/devicefarm/api_op_GetRemoteAccessSession.go +++ b/service/devicefarm/api_op_GetRemoteAccessSession.go @@ -58,6 +58,9 @@ func addOperationGetRemoteAccessSessionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetRemoteAccessSessionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetRun.go b/service/devicefarm/api_op_GetRun.go index da63b77f079..1fdae7378fb 100644 --- a/service/devicefarm/api_op_GetRun.go +++ b/service/devicefarm/api_op_GetRun.go @@ -55,6 +55,9 @@ func addOperationGetRunMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetRunMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetSuite.go b/service/devicefarm/api_op_GetSuite.go index 5eb4198ecac..b7314252c48 100644 --- a/service/devicefarm/api_op_GetSuite.go +++ b/service/devicefarm/api_op_GetSuite.go @@ -55,6 +55,9 @@ func addOperationGetSuiteMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetSuiteMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetTest.go b/service/devicefarm/api_op_GetTest.go index a9d29a3d704..7c4ef5c1152 100644 --- a/service/devicefarm/api_op_GetTest.go +++ b/service/devicefarm/api_op_GetTest.go @@ -55,6 +55,9 @@ func addOperationGetTestMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetTestMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetTestGridProject.go b/service/devicefarm/api_op_GetTestGridProject.go index 515d8f32d5a..355807725d4 100644 --- a/service/devicefarm/api_op_GetTestGridProject.go +++ b/service/devicefarm/api_op_GetTestGridProject.go @@ -54,6 +54,9 @@ func addOperationGetTestGridProjectMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetTestGridProjectMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetTestGridSession.go b/service/devicefarm/api_op_GetTestGridSession.go index 410505bfaaa..1baf5470319 100644 --- a/service/devicefarm/api_op_GetTestGridSession.go +++ b/service/devicefarm/api_op_GetTestGridSession.go @@ -66,6 +66,9 @@ func addOperationGetTestGridSessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetTestGridSessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetUpload.go b/service/devicefarm/api_op_GetUpload.go index 41f5cd0c6c2..4a53397bee8 100644 --- a/service/devicefarm/api_op_GetUpload.go +++ b/service/devicefarm/api_op_GetUpload.go @@ -55,6 +55,9 @@ func addOperationGetUploadMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetUploadMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_GetVPCEConfiguration.go b/service/devicefarm/api_op_GetVPCEConfiguration.go index b3684e93fc8..628a2682854 100644 --- a/service/devicefarm/api_op_GetVPCEConfiguration.go +++ b/service/devicefarm/api_op_GetVPCEConfiguration.go @@ -55,6 +55,9 @@ func addOperationGetVPCEConfigurationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetVPCEConfigurationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_InstallToRemoteAccessSession.go b/service/devicefarm/api_op_InstallToRemoteAccessSession.go index 6a2fe92dd3f..123bb6c7be5 100644 --- a/service/devicefarm/api_op_InstallToRemoteAccessSession.go +++ b/service/devicefarm/api_op_InstallToRemoteAccessSession.go @@ -65,6 +65,9 @@ func addOperationInstallToRemoteAccessSessionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationInstallToRemoteAccessSessionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListArtifacts.go b/service/devicefarm/api_op_ListArtifacts.go index 4e3408ff705..1f5b28a8fbb 100644 --- a/service/devicefarm/api_op_ListArtifacts.go +++ b/service/devicefarm/api_op_ListArtifacts.go @@ -75,6 +75,9 @@ func addOperationListArtifactsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListArtifactsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListDeviceInstances.go b/service/devicefarm/api_op_ListDeviceInstances.go index f832edc3cf2..6c9ac80f7b9 100644 --- a/service/devicefarm/api_op_ListDeviceInstances.go +++ b/service/devicefarm/api_op_ListDeviceInstances.go @@ -61,6 +61,9 @@ func addOperationListDeviceInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListDeviceInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListDevicePools.go b/service/devicefarm/api_op_ListDevicePools.go index 080cd87de60..d1bd383da55 100644 --- a/service/devicefarm/api_op_ListDevicePools.go +++ b/service/devicefarm/api_op_ListDevicePools.go @@ -73,6 +73,9 @@ func addOperationListDevicePoolsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListDevicePoolsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListDevices.go b/service/devicefarm/api_op_ListDevices.go index 75cccd40712..b75fb042b63 100644 --- a/service/devicefarm/api_op_ListDevices.go +++ b/service/devicefarm/api_op_ListDevices.go @@ -137,6 +137,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListInstanceProfiles.go b/service/devicefarm/api_op_ListInstanceProfiles.go index 9bec0873570..ae94accaf18 100644 --- a/service/devicefarm/api_op_ListInstanceProfiles.go +++ b/service/devicefarm/api_op_ListInstanceProfiles.go @@ -60,6 +60,9 @@ func addOperationListInstanceProfilesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListInstanceProfilesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListJobs.go b/service/devicefarm/api_op_ListJobs.go index 0cfc4a6c957..679af4174e5 100644 --- a/service/devicefarm/api_op_ListJobs.go +++ b/service/devicefarm/api_op_ListJobs.go @@ -64,6 +64,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListNetworkProfiles.go b/service/devicefarm/api_op_ListNetworkProfiles.go index 32b8d21d7d9..6e57194a496 100644 --- a/service/devicefarm/api_op_ListNetworkProfiles.go +++ b/service/devicefarm/api_op_ListNetworkProfiles.go @@ -66,6 +66,9 @@ func addOperationListNetworkProfilesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListNetworkProfilesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListOfferingPromotions.go b/service/devicefarm/api_op_ListOfferingPromotions.go index 690f3678484..1c52aaa7940 100644 --- a/service/devicefarm/api_op_ListOfferingPromotions.go +++ b/service/devicefarm/api_op_ListOfferingPromotions.go @@ -60,6 +60,9 @@ func addOperationListOfferingPromotionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListOfferingPromotionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListOfferingTransactions.go b/service/devicefarm/api_op_ListOfferingTransactions.go index 8dbb67a4558..2090f6a1dba 100644 --- a/service/devicefarm/api_op_ListOfferingTransactions.go +++ b/service/devicefarm/api_op_ListOfferingTransactions.go @@ -64,6 +64,9 @@ func addOperationListOfferingTransactionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListOfferingTransactionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListOfferings.go b/service/devicefarm/api_op_ListOfferings.go index abbb068f723..403abc8ee1a 100644 --- a/service/devicefarm/api_op_ListOfferings.go +++ b/service/devicefarm/api_op_ListOfferings.go @@ -63,6 +63,9 @@ func addOperationListOfferingsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListOfferingsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListProjects.go b/service/devicefarm/api_op_ListProjects.go index a6f8fc93bd6..c040d4e52d4 100644 --- a/service/devicefarm/api_op_ListProjects.go +++ b/service/devicefarm/api_op_ListProjects.go @@ -64,6 +64,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListRemoteAccessSessions.go b/service/devicefarm/api_op_ListRemoteAccessSessions.go index fbb82c67335..118464d77c5 100644 --- a/service/devicefarm/api_op_ListRemoteAccessSessions.go +++ b/service/devicefarm/api_op_ListRemoteAccessSessions.go @@ -66,6 +66,9 @@ func addOperationListRemoteAccessSessionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListRemoteAccessSessionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListRuns.go b/service/devicefarm/api_op_ListRuns.go index f1be3af3ddd..616efa43e32 100644 --- a/service/devicefarm/api_op_ListRuns.go +++ b/service/devicefarm/api_op_ListRuns.go @@ -64,6 +64,9 @@ func addOperationListRunsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListRunsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListSamples.go b/service/devicefarm/api_op_ListSamples.go index 4d0eb9a04fc..fee958b06fd 100644 --- a/service/devicefarm/api_op_ListSamples.go +++ b/service/devicefarm/api_op_ListSamples.go @@ -64,6 +64,9 @@ func addOperationListSamplesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListSamplesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListSuites.go b/service/devicefarm/api_op_ListSuites.go index 8c73dff3112..408736e9713 100644 --- a/service/devicefarm/api_op_ListSuites.go +++ b/service/devicefarm/api_op_ListSuites.go @@ -64,6 +64,9 @@ func addOperationListSuitesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListSuitesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListTagsForResource.go b/service/devicefarm/api_op_ListTagsForResource.go index 151ae84270d..d0971ee43ed 100644 --- a/service/devicefarm/api_op_ListTagsForResource.go +++ b/service/devicefarm/api_op_ListTagsForResource.go @@ -58,6 +58,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListTestGridProjects.go b/service/devicefarm/api_op_ListTestGridProjects.go index 239842d3d35..406a0368276 100644 --- a/service/devicefarm/api_op_ListTestGridProjects.go +++ b/service/devicefarm/api_op_ListTestGridProjects.go @@ -58,6 +58,9 @@ func addOperationListTestGridProjectsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTestGridProjectsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListTestGridSessionActions.go b/service/devicefarm/api_op_ListTestGridSessionActions.go index 5997cecc876..00a560c99c1 100644 --- a/service/devicefarm/api_op_ListTestGridSessionActions.go +++ b/service/devicefarm/api_op_ListTestGridSessionActions.go @@ -62,6 +62,9 @@ func addOperationListTestGridSessionActionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTestGridSessionActionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListTestGridSessionArtifacts.go b/service/devicefarm/api_op_ListTestGridSessionArtifacts.go index 6893e577d8b..28612964178 100644 --- a/service/devicefarm/api_op_ListTestGridSessionArtifacts.go +++ b/service/devicefarm/api_op_ListTestGridSessionArtifacts.go @@ -65,6 +65,9 @@ func addOperationListTestGridSessionArtifactsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListTestGridSessionArtifactsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListTestGridSessions.go b/service/devicefarm/api_op_ListTestGridSessions.go index 70b9fe2e31b..320b5d2632e 100644 --- a/service/devicefarm/api_op_ListTestGridSessions.go +++ b/service/devicefarm/api_op_ListTestGridSessions.go @@ -78,6 +78,9 @@ func addOperationListTestGridSessionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListTestGridSessionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListTests.go b/service/devicefarm/api_op_ListTests.go index c9309110585..05d9f70d007 100644 --- a/service/devicefarm/api_op_ListTests.go +++ b/service/devicefarm/api_op_ListTests.go @@ -64,6 +64,9 @@ func addOperationListTestsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListTestsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListUniqueProblems.go b/service/devicefarm/api_op_ListUniqueProblems.go index 7a6d1886170..0d8e2253000 100644 --- a/service/devicefarm/api_op_ListUniqueProblems.go +++ b/service/devicefarm/api_op_ListUniqueProblems.go @@ -83,6 +83,9 @@ func addOperationListUniqueProblemsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListUniqueProblemsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListUploads.go b/service/devicefarm/api_op_ListUploads.go index 583e1e757dc..7dc52b87a6a 100644 --- a/service/devicefarm/api_op_ListUploads.go +++ b/service/devicefarm/api_op_ListUploads.go @@ -145,6 +145,9 @@ func addOperationListUploadsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationListUploadsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ListVPCEConfigurations.go b/service/devicefarm/api_op_ListVPCEConfigurations.go index 387d3af1eba..0e82af2af6d 100644 --- a/service/devicefarm/api_op_ListVPCEConfigurations.go +++ b/service/devicefarm/api_op_ListVPCEConfigurations.go @@ -62,6 +62,9 @@ func addOperationListVPCEConfigurationsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListVPCEConfigurationsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_PurchaseOffering.go b/service/devicefarm/api_op_PurchaseOffering.go index 9605a2760e3..b4b3846651b 100644 --- a/service/devicefarm/api_op_PurchaseOffering.go +++ b/service/devicefarm/api_op_PurchaseOffering.go @@ -63,6 +63,9 @@ func addOperationPurchaseOfferingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPurchaseOfferingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_RenewOffering.go b/service/devicefarm/api_op_RenewOffering.go index c98d8858343..7774fa4baf3 100644 --- a/service/devicefarm/api_op_RenewOffering.go +++ b/service/devicefarm/api_op_RenewOffering.go @@ -60,6 +60,9 @@ func addOperationRenewOfferingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationRenewOfferingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_ScheduleRun.go b/service/devicefarm/api_op_ScheduleRun.go index 9d355c71536..7bf15e6b327 100644 --- a/service/devicefarm/api_op_ScheduleRun.go +++ b/service/devicefarm/api_op_ScheduleRun.go @@ -82,6 +82,9 @@ func addOperationScheduleRunMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationScheduleRunMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_StopJob.go b/service/devicefarm/api_op_StopJob.go index fe7c09acc17..f98baf4259e 100644 --- a/service/devicefarm/api_op_StopJob.go +++ b/service/devicefarm/api_op_StopJob.go @@ -57,6 +57,9 @@ func addOperationStopJobMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationStopJobMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_StopRemoteAccessSession.go b/service/devicefarm/api_op_StopRemoteAccessSession.go index 8f5b4f3cd3a..b012d318f3c 100644 --- a/service/devicefarm/api_op_StopRemoteAccessSession.go +++ b/service/devicefarm/api_op_StopRemoteAccessSession.go @@ -57,6 +57,9 @@ func addOperationStopRemoteAccessSessionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationStopRemoteAccessSessionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_StopRun.go b/service/devicefarm/api_op_StopRun.go index fbe347315b6..1a059193bbd 100644 --- a/service/devicefarm/api_op_StopRun.go +++ b/service/devicefarm/api_op_StopRun.go @@ -59,6 +59,9 @@ func addOperationStopRunMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationStopRunMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_TagResource.go b/service/devicefarm/api_op_TagResource.go index a3f6d920051..cf80df0a2b3 100644 --- a/service/devicefarm/api_op_TagResource.go +++ b/service/devicefarm/api_op_TagResource.go @@ -62,6 +62,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UntagResource.go b/service/devicefarm/api_op_UntagResource.go index b20a51ebb8e..361399c2f53 100644 --- a/service/devicefarm/api_op_UntagResource.go +++ b/service/devicefarm/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateDeviceInstance.go b/service/devicefarm/api_op_UpdateDeviceInstance.go index d37ff6f0cc1..cdb6445bbfd 100644 --- a/service/devicefarm/api_op_UpdateDeviceInstance.go +++ b/service/devicefarm/api_op_UpdateDeviceInstance.go @@ -59,6 +59,9 @@ func addOperationUpdateDeviceInstanceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateDeviceInstanceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateDevicePool.go b/service/devicefarm/api_op_UpdateDevicePool.go index 033ed949987..3229d1bfc14 100644 --- a/service/devicefarm/api_op_UpdateDevicePool.go +++ b/service/devicefarm/api_op_UpdateDevicePool.go @@ -84,6 +84,9 @@ func addOperationUpdateDevicePoolMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateDevicePoolMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateInstanceProfile.go b/service/devicefarm/api_op_UpdateInstanceProfile.go index fe384456272..93208851526 100644 --- a/service/devicefarm/api_op_UpdateInstanceProfile.go +++ b/service/devicefarm/api_op_UpdateInstanceProfile.go @@ -72,6 +72,9 @@ func addOperationUpdateInstanceProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateInstanceProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateNetworkProfile.go b/service/devicefarm/api_op_UpdateNetworkProfile.go index f7b031a6916..dbf9959178c 100644 --- a/service/devicefarm/api_op_UpdateNetworkProfile.go +++ b/service/devicefarm/api_op_UpdateNetworkProfile.go @@ -93,6 +93,9 @@ func addOperationUpdateNetworkProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationUpdateNetworkProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateProject.go b/service/devicefarm/api_op_UpdateProject.go index ddd59debb78..9056e50195a 100644 --- a/service/devicefarm/api_op_UpdateProject.go +++ b/service/devicefarm/api_op_UpdateProject.go @@ -61,6 +61,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateTestGridProject.go b/service/devicefarm/api_op_UpdateTestGridProject.go index fa8dd51c2e7..b108315bb58 100644 --- a/service/devicefarm/api_op_UpdateTestGridProject.go +++ b/service/devicefarm/api_op_UpdateTestGridProject.go @@ -59,6 +59,9 @@ func addOperationUpdateTestGridProjectMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateTestGridProjectMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateUpload.go b/service/devicefarm/api_op_UpdateUpload.go index b154bca4a6e..015c1e52a56 100644 --- a/service/devicefarm/api_op_UpdateUpload.go +++ b/service/devicefarm/api_op_UpdateUpload.go @@ -64,6 +64,9 @@ func addOperationUpdateUploadMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateUploadMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/api_op_UpdateVPCEConfiguration.go b/service/devicefarm/api_op_UpdateVPCEConfiguration.go index 921361bd67e..8310a850451 100644 --- a/service/devicefarm/api_op_UpdateVPCEConfiguration.go +++ b/service/devicefarm/api_op_UpdateVPCEConfiguration.go @@ -71,6 +71,9 @@ func addOperationUpdateVPCEConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateVPCEConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/devicefarm/go.mod b/service/devicefarm/go.mod index 76d664bba2e..05f6f758e26 100644 --- a/service/devicefarm/go.mod +++ b/service/devicefarm/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/devicefarm go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/devicefarm/go.sum b/service/devicefarm/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/devicefarm/go.sum +++ b/service/devicefarm/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/directconnect/api_client.go b/service/directconnect/api_client.go index b69a0f520df..1689f9ce9f1 100644 --- a/service/directconnect/api_client.go +++ b/service/directconnect/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go b/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go index ae12eaad84f..c116232d800 100644 --- a/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go +++ b/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go @@ -72,6 +72,9 @@ func addOperationAcceptDirectConnectGatewayAssociationProposalMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationAcceptDirectConnectGatewayAssociationProposalMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AllocateConnectionOnInterconnect.go b/service/directconnect/api_op_AllocateConnectionOnInterconnect.go index 11575c9d1ae..064da3222e3 100644 --- a/service/directconnect/api_op_AllocateConnectionOnInterconnect.go +++ b/service/directconnect/api_op_AllocateConnectionOnInterconnect.go @@ -161,6 +161,9 @@ func addOperationAllocateConnectionOnInterconnectMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -203,6 +206,9 @@ func addOperationAllocateConnectionOnInterconnectMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AllocateHostedConnection.go b/service/directconnect/api_op_AllocateHostedConnection.go index 6327c3c105a..2db02388337 100644 --- a/service/directconnect/api_op_AllocateHostedConnection.go +++ b/service/directconnect/api_op_AllocateHostedConnection.go @@ -166,6 +166,9 @@ func addOperationAllocateHostedConnectionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -208,6 +211,9 @@ func addOperationAllocateHostedConnectionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AllocatePrivateVirtualInterface.go b/service/directconnect/api_op_AllocatePrivateVirtualInterface.go index d85424c15bf..ee236749bc3 100644 --- a/service/directconnect/api_op_AllocatePrivateVirtualInterface.go +++ b/service/directconnect/api_op_AllocatePrivateVirtualInterface.go @@ -177,6 +177,9 @@ func addOperationAllocatePrivateVirtualInterfaceMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -219,6 +222,9 @@ func addOperationAllocatePrivateVirtualInterfaceMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AllocatePublicVirtualInterface.go b/service/directconnect/api_op_AllocatePublicVirtualInterface.go index 7aac092ff67..2e10ef60cc8 100644 --- a/service/directconnect/api_op_AllocatePublicVirtualInterface.go +++ b/service/directconnect/api_op_AllocatePublicVirtualInterface.go @@ -182,6 +182,9 @@ func addOperationAllocatePublicVirtualInterfaceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -224,6 +227,9 @@ func addOperationAllocatePublicVirtualInterfaceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AllocateTransitVirtualInterface.go b/service/directconnect/api_op_AllocateTransitVirtualInterface.go index 00c25d569c7..27f4fa57873 100644 --- a/service/directconnect/api_op_AllocateTransitVirtualInterface.go +++ b/service/directconnect/api_op_AllocateTransitVirtualInterface.go @@ -70,6 +70,9 @@ func addOperationAllocateTransitVirtualInterfaceMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAllocateTransitVirtualInterfaceMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AssociateConnectionWithLag.go b/service/directconnect/api_op_AssociateConnectionWithLag.go index f849ae7dab6..e02a3d32661 100644 --- a/service/directconnect/api_op_AssociateConnectionWithLag.go +++ b/service/directconnect/api_op_AssociateConnectionWithLag.go @@ -152,6 +152,9 @@ func addOperationAssociateConnectionWithLagMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationAssociateConnectionWithLagMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AssociateHostedConnection.go b/service/directconnect/api_op_AssociateHostedConnection.go index 2344a6c0bee..4e466145442 100644 --- a/service/directconnect/api_op_AssociateHostedConnection.go +++ b/service/directconnect/api_op_AssociateHostedConnection.go @@ -144,6 +144,9 @@ func addOperationAssociateHostedConnectionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationAssociateHostedConnectionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_AssociateVirtualInterface.go b/service/directconnect/api_op_AssociateVirtualInterface.go index 9cc12cae016..d2b4e99a86b 100644 --- a/service/directconnect/api_op_AssociateVirtualInterface.go +++ b/service/directconnect/api_op_AssociateVirtualInterface.go @@ -179,6 +179,9 @@ func addOperationAssociateVirtualInterfaceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -221,6 +224,9 @@ func addOperationAssociateVirtualInterfaceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_ConfirmConnection.go b/service/directconnect/api_op_ConfirmConnection.go index d2306ca8b50..e4fcb5fa04e 100644 --- a/service/directconnect/api_op_ConfirmConnection.go +++ b/service/directconnect/api_op_ConfirmConnection.go @@ -85,6 +85,9 @@ func addOperationConfirmConnectionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationConfirmConnectionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go b/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go index 20e5d96b825..645bd9110c8 100644 --- a/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go +++ b/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go @@ -96,6 +96,9 @@ func addOperationConfirmPrivateVirtualInterfaceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationConfirmPrivateVirtualInterfaceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_ConfirmPublicVirtualInterface.go b/service/directconnect/api_op_ConfirmPublicVirtualInterface.go index a792eeebcb7..5d66b6a01fe 100644 --- a/service/directconnect/api_op_ConfirmPublicVirtualInterface.go +++ b/service/directconnect/api_op_ConfirmPublicVirtualInterface.go @@ -89,6 +89,9 @@ func addOperationConfirmPublicVirtualInterfaceMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationConfirmPublicVirtualInterfaceMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_ConfirmTransitVirtualInterface.go b/service/directconnect/api_op_ConfirmTransitVirtualInterface.go index 9b55b3b66c1..d6ced8c14e1 100644 --- a/service/directconnect/api_op_ConfirmTransitVirtualInterface.go +++ b/service/directconnect/api_op_ConfirmTransitVirtualInterface.go @@ -94,6 +94,9 @@ func addOperationConfirmTransitVirtualInterfaceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationConfirmTransitVirtualInterfaceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateBGPPeer.go b/service/directconnect/api_op_CreateBGPPeer.go index 08f452aa070..d5c03ea732e 100644 --- a/service/directconnect/api_op_CreateBGPPeer.go +++ b/service/directconnect/api_op_CreateBGPPeer.go @@ -63,6 +63,9 @@ func addOperationCreateBGPPeerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateBGPPeerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateConnection.go b/service/directconnect/api_op_CreateConnection.go index 7b96555e996..5541c88243f 100644 --- a/service/directconnect/api_op_CreateConnection.go +++ b/service/directconnect/api_op_CreateConnection.go @@ -161,6 +161,9 @@ func addOperationCreateConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -203,6 +206,9 @@ func addOperationCreateConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateDirectConnectGateway.go b/service/directconnect/api_op_CreateDirectConnectGateway.go index 47bdc6bd591..e35bbc8fe05 100644 --- a/service/directconnect/api_op_CreateDirectConnectGateway.go +++ b/service/directconnect/api_op_CreateDirectConnectGateway.go @@ -65,6 +65,9 @@ func addOperationCreateDirectConnectGatewayMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateDirectConnectGatewayMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go b/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go index df8e9db11aa..6e416af1480 100644 --- a/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go +++ b/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go @@ -68,6 +68,9 @@ func addOperationCreateDirectConnectGatewayAssociationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateDirectConnectGatewayAssociationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go b/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go index 9e3292f87af..ab215ef36e9 100644 --- a/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go +++ b/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go @@ -72,6 +72,9 @@ func addOperationCreateDirectConnectGatewayAssociationProposalMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateDirectConnectGatewayAssociationProposalMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateInterconnect.go b/service/directconnect/api_op_CreateInterconnect.go index 00c6bba239b..77fb3ec39cc 100644 --- a/service/directconnect/api_op_CreateInterconnect.go +++ b/service/directconnect/api_op_CreateInterconnect.go @@ -151,6 +151,9 @@ func addOperationCreateInterconnectMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -193,6 +196,9 @@ func addOperationCreateInterconnectMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateLag.go b/service/directconnect/api_op_CreateLag.go index 7b43c876eda..8fa6ca4ef49 100644 --- a/service/directconnect/api_op_CreateLag.go +++ b/service/directconnect/api_op_CreateLag.go @@ -173,6 +173,9 @@ func addOperationCreateLagMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -215,6 +218,9 @@ func addOperationCreateLagMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreatePrivateVirtualInterface.go b/service/directconnect/api_op_CreatePrivateVirtualInterface.go index 91a82e79dfb..1d41b9dfc3a 100644 --- a/service/directconnect/api_op_CreatePrivateVirtualInterface.go +++ b/service/directconnect/api_op_CreatePrivateVirtualInterface.go @@ -181,6 +181,9 @@ func addOperationCreatePrivateVirtualInterfaceMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -223,6 +226,9 @@ func addOperationCreatePrivateVirtualInterfaceMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreatePublicVirtualInterface.go b/service/directconnect/api_op_CreatePublicVirtualInterface.go index 0c75a896e15..56405743037 100644 --- a/service/directconnect/api_op_CreatePublicVirtualInterface.go +++ b/service/directconnect/api_op_CreatePublicVirtualInterface.go @@ -174,6 +174,9 @@ func addOperationCreatePublicVirtualInterfaceMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -216,6 +219,9 @@ func addOperationCreatePublicVirtualInterfaceMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_CreateTransitVirtualInterface.go b/service/directconnect/api_op_CreateTransitVirtualInterface.go index 8a1cd67ad10..64873fe7a5a 100644 --- a/service/directconnect/api_op_CreateTransitVirtualInterface.go +++ b/service/directconnect/api_op_CreateTransitVirtualInterface.go @@ -72,6 +72,9 @@ func addOperationCreateTransitVirtualInterfaceMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateTransitVirtualInterfaceMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteBGPPeer.go b/service/directconnect/api_op_DeleteBGPPeer.go index eacd661192b..733d8bcbf64 100644 --- a/service/directconnect/api_op_DeleteBGPPeer.go +++ b/service/directconnect/api_op_DeleteBGPPeer.go @@ -63,6 +63,9 @@ func addOperationDeleteBGPPeerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteBGPPeerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteConnection.go b/service/directconnect/api_op_DeleteConnection.go index f0de9d83ae0..38f7c9b5b54 100644 --- a/service/directconnect/api_op_DeleteConnection.go +++ b/service/directconnect/api_op_DeleteConnection.go @@ -137,6 +137,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteDirectConnectGateway.go b/service/directconnect/api_op_DeleteDirectConnectGateway.go index 802dbd454fc..42b03a160f7 100644 --- a/service/directconnect/api_op_DeleteDirectConnectGateway.go +++ b/service/directconnect/api_op_DeleteDirectConnectGateway.go @@ -55,6 +55,9 @@ func addOperationDeleteDirectConnectGatewayMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteDirectConnectGatewayMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go index dad212ba140..46a6eceeacc 100644 --- a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go +++ b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go @@ -61,6 +61,9 @@ func addOperationDeleteDirectConnectGatewayAssociationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteDirectConnectGatewayAssociationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go index 7f1de92c614..9604fa2e74a 100644 --- a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go +++ b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go @@ -54,6 +54,9 @@ func addOperationDeleteDirectConnectGatewayAssociationProposalMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteDirectConnectGatewayAssociationProposalMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteInterconnect.go b/service/directconnect/api_op_DeleteInterconnect.go index eb5951c9508..91ce3d281a7 100644 --- a/service/directconnect/api_op_DeleteInterconnect.go +++ b/service/directconnect/api_op_DeleteInterconnect.go @@ -75,6 +75,9 @@ func addOperationDeleteInterconnectMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteInterconnectMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteLag.go b/service/directconnect/api_op_DeleteLag.go index f9a76e6d9c8..536303b4d10 100644 --- a/service/directconnect/api_op_DeleteLag.go +++ b/service/directconnect/api_op_DeleteLag.go @@ -127,6 +127,9 @@ func addOperationDeleteLagMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationDeleteLagMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DeleteVirtualInterface.go b/service/directconnect/api_op_DeleteVirtualInterface.go index aeed5516155..9ea7b188d31 100644 --- a/service/directconnect/api_op_DeleteVirtualInterface.go +++ b/service/directconnect/api_op_DeleteVirtualInterface.go @@ -87,6 +87,9 @@ func addOperationDeleteVirtualInterfaceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDeleteVirtualInterfaceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeConnectionLoa.go b/service/directconnect/api_op_DescribeConnectionLoa.go index b412881f806..44725e81748 100644 --- a/service/directconnect/api_op_DescribeConnectionLoa.go +++ b/service/directconnect/api_op_DescribeConnectionLoa.go @@ -68,6 +68,9 @@ func addOperationDescribeConnectionLoaMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeConnectionLoaMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeConnections.go b/service/directconnect/api_op_DescribeConnections.go index 198b2126d1a..3656a0bd463 100644 --- a/service/directconnect/api_op_DescribeConnections.go +++ b/service/directconnect/api_op_DescribeConnections.go @@ -51,6 +51,9 @@ func addOperationDescribeConnectionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDescribeConnectionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go b/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go index 69f66298b62..ef8795d6136 100644 --- a/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go +++ b/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go @@ -55,6 +55,9 @@ func addOperationDescribeConnectionsOnInterconnectMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeConnectionsOnInterconnectMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go index e9d68fdc590..6edf9fdad49 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go +++ b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go @@ -70,6 +70,9 @@ func addOperationDescribeDirectConnectGatewayAssociationProposalsMiddlewares(sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeDirectConnectGatewayAssociationProposalsMiddlewares(sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go index 73275946369..32037807939 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go +++ b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go @@ -78,6 +78,9 @@ func addOperationDescribeDirectConnectGatewayAssociationsMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeDirectConnectGatewayAssociationsMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go b/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go index 07411bc76a6..c6113325778 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go +++ b/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go @@ -71,6 +71,9 @@ func addOperationDescribeDirectConnectGatewayAttachmentsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeDirectConnectGatewayAttachmentsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeDirectConnectGateways.go b/service/directconnect/api_op_DescribeDirectConnectGateways.go index 09d2a8bd7b5..71317e7291c 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGateways.go +++ b/service/directconnect/api_op_DescribeDirectConnectGateways.go @@ -63,6 +63,9 @@ func addOperationDescribeDirectConnectGatewaysMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeDirectConnectGatewaysMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeHostedConnections.go b/service/directconnect/api_op_DescribeHostedConnections.go index 364a355d67e..b3e29c41faf 100644 --- a/service/directconnect/api_op_DescribeHostedConnections.go +++ b/service/directconnect/api_op_DescribeHostedConnections.go @@ -55,6 +55,9 @@ func addOperationDescribeHostedConnectionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeHostedConnectionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeInterconnectLoa.go b/service/directconnect/api_op_DescribeInterconnectLoa.go index 78bde1881a8..a9a1319f9a3 100644 --- a/service/directconnect/api_op_DescribeInterconnectLoa.go +++ b/service/directconnect/api_op_DescribeInterconnectLoa.go @@ -68,6 +68,9 @@ func addOperationDescribeInterconnectLoaMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeInterconnectLoaMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeInterconnects.go b/service/directconnect/api_op_DescribeInterconnects.go index 99d31c7f584..72d3bdfdc6b 100644 --- a/service/directconnect/api_op_DescribeInterconnects.go +++ b/service/directconnect/api_op_DescribeInterconnects.go @@ -52,6 +52,9 @@ func addOperationDescribeInterconnectsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDescribeInterconnectsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeLags.go b/service/directconnect/api_op_DescribeLags.go index cb66d4210fe..fec51947819 100644 --- a/service/directconnect/api_op_DescribeLags.go +++ b/service/directconnect/api_op_DescribeLags.go @@ -51,6 +51,9 @@ func addOperationDescribeLagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDescribeLagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeLoa.go b/service/directconnect/api_op_DescribeLoa.go index 5e834892277..21e14db68a2 100644 --- a/service/directconnect/api_op_DescribeLoa.go +++ b/service/directconnect/api_op_DescribeLoa.go @@ -74,6 +74,9 @@ func addOperationDescribeLoaMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeLoaMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeLocations.go b/service/directconnect/api_op_DescribeLocations.go index 42ece877b29..3f22ee91e68 100644 --- a/service/directconnect/api_op_DescribeLocations.go +++ b/service/directconnect/api_op_DescribeLocations.go @@ -50,6 +50,9 @@ func addOperationDescribeLocationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDescribeLocationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeTags.go b/service/directconnect/api_op_DescribeTags.go index 39007b80d2e..e1bb2316f4b 100644 --- a/service/directconnect/api_op_DescribeTags.go +++ b/service/directconnect/api_op_DescribeTags.go @@ -53,6 +53,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeVirtualGateways.go b/service/directconnect/api_op_DescribeVirtualGateways.go index eabbff03775..d5e78551235 100644 --- a/service/directconnect/api_op_DescribeVirtualGateways.go +++ b/service/directconnect/api_op_DescribeVirtualGateways.go @@ -50,6 +50,9 @@ func addOperationDescribeVirtualGatewaysMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDescribeVirtualGatewaysMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DescribeVirtualInterfaces.go b/service/directconnect/api_op_DescribeVirtualInterfaces.go index c48aa234de9..cd4d7548c9a 100644 --- a/service/directconnect/api_op_DescribeVirtualInterfaces.go +++ b/service/directconnect/api_op_DescribeVirtualInterfaces.go @@ -59,6 +59,9 @@ func addOperationDescribeVirtualInterfacesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeVirtualInterfacesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_DisassociateConnectionFromLag.go b/service/directconnect/api_op_DisassociateConnectionFromLag.go index 26b7c11b975..069e064e7a8 100644 --- a/service/directconnect/api_op_DisassociateConnectionFromLag.go +++ b/service/directconnect/api_op_DisassociateConnectionFromLag.go @@ -148,6 +148,9 @@ func addOperationDisassociateConnectionFromLagMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationDisassociateConnectionFromLagMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go b/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go index 134663b099f..bbea938d183 100644 --- a/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go +++ b/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go @@ -73,6 +73,9 @@ func addOperationListVirtualInterfaceTestHistoryMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListVirtualInterfaceTestHistoryMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_StartBgpFailoverTest.go b/service/directconnect/api_op_StartBgpFailoverTest.go index 2f71cdf93b7..a23c1c79ac9 100644 --- a/service/directconnect/api_op_StartBgpFailoverTest.go +++ b/service/directconnect/api_op_StartBgpFailoverTest.go @@ -68,6 +68,9 @@ func addOperationStartBgpFailoverTestMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationStartBgpFailoverTestMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_StopBgpFailoverTest.go b/service/directconnect/api_op_StopBgpFailoverTest.go index 11bfe002f40..3a685070b2d 100644 --- a/service/directconnect/api_op_StopBgpFailoverTest.go +++ b/service/directconnect/api_op_StopBgpFailoverTest.go @@ -53,6 +53,9 @@ func addOperationStopBgpFailoverTestMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopBgpFailoverTestMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_TagResource.go b/service/directconnect/api_op_TagResource.go index c0f63fa5734..d09de1a0884 100644 --- a/service/directconnect/api_op_TagResource.go +++ b/service/directconnect/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_UntagResource.go b/service/directconnect/api_op_UntagResource.go index 0bd7c255417..826fee3b7d9 100644 --- a/service/directconnect/api_op_UntagResource.go +++ b/service/directconnect/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go b/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go index 94296a8b712..f73c0509579 100644 --- a/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go +++ b/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go @@ -59,6 +59,9 @@ func addOperationUpdateDirectConnectGatewayAssociationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateDirectConnectGatewayAssociationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_UpdateLag.go b/service/directconnect/api_op_UpdateLag.go index d9a55607077..62b838b2bea 100644 --- a/service/directconnect/api_op_UpdateLag.go +++ b/service/directconnect/api_op_UpdateLag.go @@ -147,6 +147,9 @@ func addOperationUpdateLagMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -189,6 +192,9 @@ func addOperationUpdateLagMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go b/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go index 137e601f4f4..d3b5399a625 100644 --- a/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go +++ b/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go @@ -175,6 +175,9 @@ func addOperationUpdateVirtualInterfaceAttributesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -217,6 +220,9 @@ func addOperationUpdateVirtualInterfaceAttributesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directconnect/go.mod b/service/directconnect/go.mod index f05aa183b97..c510b82e7d6 100644 --- a/service/directconnect/go.mod +++ b/service/directconnect/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/directconnect go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/directconnect/go.sum b/service/directconnect/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/directconnect/go.sum +++ b/service/directconnect/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/directoryservice/api_client.go b/service/directoryservice/api_client.go index c43391a67ed..b55c438265f 100644 --- a/service/directoryservice/api_client.go +++ b/service/directoryservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/directoryservice/api_op_AcceptSharedDirectory.go b/service/directoryservice/api_op_AcceptSharedDirectory.go index 2b38869ddfb..8b349f606d0 100644 --- a/service/directoryservice/api_op_AcceptSharedDirectory.go +++ b/service/directoryservice/api_op_AcceptSharedDirectory.go @@ -55,6 +55,9 @@ func addOperationAcceptSharedDirectoryMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAcceptSharedDirectoryMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_AddIpRoutes.go b/service/directoryservice/api_op_AddIpRoutes.go index 3e6b3d698df..bfca3b64793 100644 --- a/service/directoryservice/api_op_AddIpRoutes.go +++ b/service/directoryservice/api_op_AddIpRoutes.go @@ -127,6 +127,9 @@ func addOperationAddIpRoutesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationAddIpRoutesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_AddTagsToResource.go b/service/directoryservice/api_op_AddTagsToResource.go index 9a1148d3985..c3c843e834a 100644 --- a/service/directoryservice/api_op_AddTagsToResource.go +++ b/service/directoryservice/api_op_AddTagsToResource.go @@ -56,6 +56,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CancelSchemaExtension.go b/service/directoryservice/api_op_CancelSchemaExtension.go index cd52b5cb55f..05a92a7bff0 100644 --- a/service/directoryservice/api_op_CancelSchemaExtension.go +++ b/service/directoryservice/api_op_CancelSchemaExtension.go @@ -56,6 +56,9 @@ func addOperationCancelSchemaExtensionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCancelSchemaExtensionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ConnectDirectory.go b/service/directoryservice/api_op_ConnectDirectory.go index c3067808393..eb73c7b6840 100644 --- a/service/directoryservice/api_op_ConnectDirectory.go +++ b/service/directoryservice/api_op_ConnectDirectory.go @@ -85,6 +85,9 @@ func addOperationConnectDirectoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationConnectDirectoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateAlias.go b/service/directoryservice/api_op_CreateAlias.go index 18452ef9b2d..fc15071e06f 100644 --- a/service/directoryservice/api_op_CreateAlias.go +++ b/service/directoryservice/api_op_CreateAlias.go @@ -67,6 +67,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateComputer.go b/service/directoryservice/api_op_CreateComputer.go index 1b2de7c36a4..d6b64606f51 100644 --- a/service/directoryservice/api_op_CreateComputer.go +++ b/service/directoryservice/api_op_CreateComputer.go @@ -75,6 +75,9 @@ func addOperationCreateComputerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateComputerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateConditionalForwarder.go b/service/directoryservice/api_op_CreateConditionalForwarder.go index 07fc97098ef..77182c65409 100644 --- a/service/directoryservice/api_op_CreateConditionalForwarder.go +++ b/service/directoryservice/api_op_CreateConditionalForwarder.go @@ -66,6 +66,9 @@ func addOperationCreateConditionalForwarderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateConditionalForwarderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateDirectory.go b/service/directoryservice/api_op_CreateDirectory.go index c8dbef47ba8..bbc421280f9 100644 --- a/service/directoryservice/api_op_CreateDirectory.go +++ b/service/directoryservice/api_op_CreateDirectory.go @@ -88,6 +88,9 @@ func addOperationCreateDirectoryMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateDirectoryMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateLogSubscription.go b/service/directoryservice/api_op_CreateLogSubscription.go index bcb248990cf..08a929a18ec 100644 --- a/service/directoryservice/api_op_CreateLogSubscription.go +++ b/service/directoryservice/api_op_CreateLogSubscription.go @@ -56,6 +56,9 @@ func addOperationCreateLogSubscriptionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateLogSubscriptionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateMicrosoftAD.go b/service/directoryservice/api_op_CreateMicrosoftAD.go index a71847c0a93..ff4b657b696 100644 --- a/service/directoryservice/api_op_CreateMicrosoftAD.go +++ b/service/directoryservice/api_op_CreateMicrosoftAD.go @@ -93,6 +93,9 @@ func addOperationCreateMicrosoftADMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateMicrosoftADMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateSnapshot.go b/service/directoryservice/api_op_CreateSnapshot.go index 665977b83f1..9c004cccbb9 100644 --- a/service/directoryservice/api_op_CreateSnapshot.go +++ b/service/directoryservice/api_op_CreateSnapshot.go @@ -58,6 +58,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_CreateTrust.go b/service/directoryservice/api_op_CreateTrust.go index 44421259473..7e3bab6540d 100644 --- a/service/directoryservice/api_op_CreateTrust.go +++ b/service/directoryservice/api_op_CreateTrust.go @@ -95,6 +95,9 @@ func addOperationCreateTrustMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateTrustMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeleteConditionalForwarder.go b/service/directoryservice/api_op_DeleteConditionalForwarder.go index 97025b2612c..9f5cc7d5c68 100644 --- a/service/directoryservice/api_op_DeleteConditionalForwarder.go +++ b/service/directoryservice/api_op_DeleteConditionalForwarder.go @@ -56,6 +56,9 @@ func addOperationDeleteConditionalForwarderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteConditionalForwarderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeleteDirectory.go b/service/directoryservice/api_op_DeleteDirectory.go index 85f9bbf6faf..00e489faf55 100644 --- a/service/directoryservice/api_op_DeleteDirectory.go +++ b/service/directoryservice/api_op_DeleteDirectory.go @@ -59,6 +59,9 @@ func addOperationDeleteDirectoryMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteDirectoryMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeleteLogSubscription.go b/service/directoryservice/api_op_DeleteLogSubscription.go index 358a100b260..48709e99617 100644 --- a/service/directoryservice/api_op_DeleteLogSubscription.go +++ b/service/directoryservice/api_op_DeleteLogSubscription.go @@ -48,6 +48,9 @@ func addOperationDeleteLogSubscriptionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteLogSubscriptionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeleteSnapshot.go b/service/directoryservice/api_op_DeleteSnapshot.go index f93ba428e3d..96d3dcbc6fb 100644 --- a/service/directoryservice/api_op_DeleteSnapshot.go +++ b/service/directoryservice/api_op_DeleteSnapshot.go @@ -54,6 +54,9 @@ func addOperationDeleteSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeleteTrust.go b/service/directoryservice/api_op_DeleteTrust.go index ea6e66b65ac..e84195619eb 100644 --- a/service/directoryservice/api_op_DeleteTrust.go +++ b/service/directoryservice/api_op_DeleteTrust.go @@ -59,6 +59,9 @@ func addOperationDeleteTrustMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTrustMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeregisterCertificate.go b/service/directoryservice/api_op_DeregisterCertificate.go index c77edf41fe2..32a6168cdb5 100644 --- a/service/directoryservice/api_op_DeregisterCertificate.go +++ b/service/directoryservice/api_op_DeregisterCertificate.go @@ -54,6 +54,9 @@ func addOperationDeregisterCertificateMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeregisterCertificateMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DeregisterEventTopic.go b/service/directoryservice/api_op_DeregisterEventTopic.go index 205a42cd26a..3f564ff5860 100644 --- a/service/directoryservice/api_op_DeregisterEventTopic.go +++ b/service/directoryservice/api_op_DeregisterEventTopic.go @@ -56,6 +56,9 @@ func addOperationDeregisterEventTopicMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeregisterEventTopicMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeCertificate.go b/service/directoryservice/api_op_DescribeCertificate.go index 0c326ca8489..7c95bfd1818 100644 --- a/service/directoryservice/api_op_DescribeCertificate.go +++ b/service/directoryservice/api_op_DescribeCertificate.go @@ -61,6 +61,9 @@ func addOperationDescribeCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeConditionalForwarders.go b/service/directoryservice/api_op_DescribeConditionalForwarders.go index a0b2cc63268..bc2c4270e20 100644 --- a/service/directoryservice/api_op_DescribeConditionalForwarders.go +++ b/service/directoryservice/api_op_DescribeConditionalForwarders.go @@ -62,6 +62,9 @@ func addOperationDescribeConditionalForwardersMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeConditionalForwardersMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeDirectories.go b/service/directoryservice/api_op_DescribeDirectories.go index 9b2694cbddd..ad12368cdac 100644 --- a/service/directoryservice/api_op_DescribeDirectories.go +++ b/service/directoryservice/api_op_DescribeDirectories.go @@ -80,6 +80,9 @@ func addOperationDescribeDirectoriesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeDirectoriesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeDomainControllers.go b/service/directoryservice/api_op_DescribeDomainControllers.go index 3ee3774eeec..b1ab3306adf 100644 --- a/service/directoryservice/api_op_DescribeDomainControllers.go +++ b/service/directoryservice/api_op_DescribeDomainControllers.go @@ -70,6 +70,9 @@ func addOperationDescribeDomainControllersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeDomainControllersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeEventTopics.go b/service/directoryservice/api_op_DescribeEventTopics.go index 1c096b854b6..aa496c0cba6 100644 --- a/service/directoryservice/api_op_DescribeEventTopics.go +++ b/service/directoryservice/api_op_DescribeEventTopics.go @@ -62,6 +62,9 @@ func addOperationDescribeEventTopicsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeEventTopicsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeLDAPSSettings.go b/service/directoryservice/api_op_DescribeLDAPSSettings.go index 1e794e61dbb..b61efca3f7f 100644 --- a/service/directoryservice/api_op_DescribeLDAPSSettings.go +++ b/service/directoryservice/api_op_DescribeLDAPSSettings.go @@ -68,6 +68,9 @@ func addOperationDescribeLDAPSSettingsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeLDAPSSettingsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeSharedDirectories.go b/service/directoryservice/api_op_DescribeSharedDirectories.go index bae01fda688..ca8f5c30645 100644 --- a/service/directoryservice/api_op_DescribeSharedDirectories.go +++ b/service/directoryservice/api_op_DescribeSharedDirectories.go @@ -68,6 +68,9 @@ func addOperationDescribeSharedDirectoriesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeSharedDirectoriesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeSnapshots.go b/service/directoryservice/api_op_DescribeSnapshots.go index d837edaf6c4..4f7c490206b 100644 --- a/service/directoryservice/api_op_DescribeSnapshots.go +++ b/service/directoryservice/api_op_DescribeSnapshots.go @@ -77,6 +77,9 @@ func addOperationDescribeSnapshotsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeSnapshotsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DescribeTrusts.go b/service/directoryservice/api_op_DescribeTrusts.go index 14202aba03b..fe325808708 100644 --- a/service/directoryservice/api_op_DescribeTrusts.go +++ b/service/directoryservice/api_op_DescribeTrusts.go @@ -79,6 +79,9 @@ func addOperationDescribeTrustsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeTrustsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DisableLDAPS.go b/service/directoryservice/api_op_DisableLDAPS.go index b6245f47e25..c439ee77989 100644 --- a/service/directoryservice/api_op_DisableLDAPS.go +++ b/service/directoryservice/api_op_DisableLDAPS.go @@ -55,6 +55,9 @@ func addOperationDisableLDAPSMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisableLDAPSMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DisableRadius.go b/service/directoryservice/api_op_DisableRadius.go index d72d4fe04d5..640328fd536 100644 --- a/service/directoryservice/api_op_DisableRadius.go +++ b/service/directoryservice/api_op_DisableRadius.go @@ -51,6 +51,9 @@ func addOperationDisableRadiusMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDisableRadiusMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_DisableSso.go b/service/directoryservice/api_op_DisableSso.go index 3f58bd49068..1a577bf6fa3 100644 --- a/service/directoryservice/api_op_DisableSso.go +++ b/service/directoryservice/api_op_DisableSso.go @@ -64,6 +64,9 @@ func addOperationDisableSsoMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDisableSsoMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_EnableLDAPS.go b/service/directoryservice/api_op_EnableLDAPS.go index 20a179f595a..71dcf6ad2df 100644 --- a/service/directoryservice/api_op_EnableLDAPS.go +++ b/service/directoryservice/api_op_EnableLDAPS.go @@ -55,6 +55,9 @@ func addOperationEnableLDAPSMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationEnableLDAPSMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_EnableRadius.go b/service/directoryservice/api_op_EnableRadius.go index 7fe37cef906..4af9d8a55dc 100644 --- a/service/directoryservice/api_op_EnableRadius.go +++ b/service/directoryservice/api_op_EnableRadius.go @@ -57,6 +57,9 @@ func addOperationEnableRadiusMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationEnableRadiusMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_EnableSso.go b/service/directoryservice/api_op_EnableSso.go index 369e6904681..2950ccbbad0 100644 --- a/service/directoryservice/api_op_EnableSso.go +++ b/service/directoryservice/api_op_EnableSso.go @@ -66,6 +66,9 @@ func addOperationEnableSsoMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationEnableSsoMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_GetDirectoryLimits.go b/service/directoryservice/api_op_GetDirectoryLimits.go index a053acc1c55..aff4a8625d9 100644 --- a/service/directoryservice/api_op_GetDirectoryLimits.go +++ b/service/directoryservice/api_op_GetDirectoryLimits.go @@ -51,6 +51,9 @@ func addOperationGetDirectoryLimitsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetDirectoryLimitsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_GetSnapshotLimits.go b/service/directoryservice/api_op_GetSnapshotLimits.go index 78cba0f0500..7b5bf0488ef 100644 --- a/service/directoryservice/api_op_GetSnapshotLimits.go +++ b/service/directoryservice/api_op_GetSnapshotLimits.go @@ -56,6 +56,9 @@ func addOperationGetSnapshotLimitsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetSnapshotLimitsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ListCertificates.go b/service/directoryservice/api_op_ListCertificates.go index b3c5dd5d54f..4418308a762 100644 --- a/service/directoryservice/api_op_ListCertificates.go +++ b/service/directoryservice/api_op_ListCertificates.go @@ -68,6 +68,9 @@ func addOperationListCertificatesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListCertificatesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ListIpRoutes.go b/service/directoryservice/api_op_ListIpRoutes.go index 0229590cdcc..d60b0eec0ef 100644 --- a/service/directoryservice/api_op_ListIpRoutes.go +++ b/service/directoryservice/api_op_ListIpRoutes.go @@ -67,6 +67,9 @@ func addOperationListIpRoutesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListIpRoutesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ListLogSubscriptions.go b/service/directoryservice/api_op_ListLogSubscriptions.go index 713bb60e685..7b25c287cfb 100644 --- a/service/directoryservice/api_op_ListLogSubscriptions.go +++ b/service/directoryservice/api_op_ListLogSubscriptions.go @@ -63,6 +63,9 @@ func addOperationListLogSubscriptionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListLogSubscriptionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ListSchemaExtensions.go b/service/directoryservice/api_op_ListSchemaExtensions.go index 27b7615728f..c6c75c076db 100644 --- a/service/directoryservice/api_op_ListSchemaExtensions.go +++ b/service/directoryservice/api_op_ListSchemaExtensions.go @@ -66,6 +66,9 @@ func addOperationListSchemaExtensionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListSchemaExtensionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ListTagsForResource.go b/service/directoryservice/api_op_ListTagsForResource.go index 557023d048d..a3b18b45955 100644 --- a/service/directoryservice/api_op_ListTagsForResource.go +++ b/service/directoryservice/api_op_ListTagsForResource.go @@ -62,6 +62,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_RegisterCertificate.go b/service/directoryservice/api_op_RegisterCertificate.go index c5bc8bfb78d..843aa24d1c3 100644 --- a/service/directoryservice/api_op_RegisterCertificate.go +++ b/service/directoryservice/api_op_RegisterCertificate.go @@ -57,6 +57,9 @@ func addOperationRegisterCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationRegisterCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_RegisterEventTopic.go b/service/directoryservice/api_op_RegisterEventTopic.go index 4c257e86a2d..0fda11287b8 100644 --- a/service/directoryservice/api_op_RegisterEventTopic.go +++ b/service/directoryservice/api_op_RegisterEventTopic.go @@ -60,6 +60,9 @@ func addOperationRegisterEventTopicMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRegisterEventTopicMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_RejectSharedDirectory.go b/service/directoryservice/api_op_RejectSharedDirectory.go index 66e972999b8..c19f9eda67b 100644 --- a/service/directoryservice/api_op_RejectSharedDirectory.go +++ b/service/directoryservice/api_op_RejectSharedDirectory.go @@ -54,6 +54,9 @@ func addOperationRejectSharedDirectoryMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationRejectSharedDirectoryMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_RemoveIpRoutes.go b/service/directoryservice/api_op_RemoveIpRoutes.go index 0ae84a78872..b38e7a0d647 100644 --- a/service/directoryservice/api_op_RemoveIpRoutes.go +++ b/service/directoryservice/api_op_RemoveIpRoutes.go @@ -53,6 +53,9 @@ func addOperationRemoveIpRoutesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationRemoveIpRoutesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_RemoveTagsFromResource.go b/service/directoryservice/api_op_RemoveTagsFromResource.go index 22aec483949..19d425abde3 100644 --- a/service/directoryservice/api_op_RemoveTagsFromResource.go +++ b/service/directoryservice/api_op_RemoveTagsFromResource.go @@ -53,6 +53,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ResetUserPassword.go b/service/directoryservice/api_op_ResetUserPassword.go index 14951c430f6..facccee1c34 100644 --- a/service/directoryservice/api_op_ResetUserPassword.go +++ b/service/directoryservice/api_op_ResetUserPassword.go @@ -73,6 +73,9 @@ func addOperationResetUserPasswordMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationResetUserPasswordMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_RestoreFromSnapshot.go b/service/directoryservice/api_op_RestoreFromSnapshot.go index d98a4f82469..cb19bef6f29 100644 --- a/service/directoryservice/api_op_RestoreFromSnapshot.go +++ b/service/directoryservice/api_op_RestoreFromSnapshot.go @@ -56,6 +56,9 @@ func addOperationRestoreFromSnapshotMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRestoreFromSnapshotMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_ShareDirectory.go b/service/directoryservice/api_op_ShareDirectory.go index 10b7907a137..0fe5788f86c 100644 --- a/service/directoryservice/api_op_ShareDirectory.go +++ b/service/directoryservice/api_op_ShareDirectory.go @@ -85,6 +85,9 @@ func addOperationShareDirectoryMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationShareDirectoryMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_StartSchemaExtension.go b/service/directoryservice/api_op_StartSchemaExtension.go index bb2762f5ec1..a2ef8b7806f 100644 --- a/service/directoryservice/api_op_StartSchemaExtension.go +++ b/service/directoryservice/api_op_StartSchemaExtension.go @@ -71,6 +71,9 @@ func addOperationStartSchemaExtensionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationStartSchemaExtensionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_UnshareDirectory.go b/service/directoryservice/api_op_UnshareDirectory.go index 2dbad5da444..ff6be152b74 100644 --- a/service/directoryservice/api_op_UnshareDirectory.go +++ b/service/directoryservice/api_op_UnshareDirectory.go @@ -61,6 +61,9 @@ func addOperationUnshareDirectoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUnshareDirectoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_UpdateConditionalForwarder.go b/service/directoryservice/api_op_UpdateConditionalForwarder.go index a1a06ef8bc5..648d67e28e2 100644 --- a/service/directoryservice/api_op_UpdateConditionalForwarder.go +++ b/service/directoryservice/api_op_UpdateConditionalForwarder.go @@ -63,6 +63,9 @@ func addOperationUpdateConditionalForwarderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateConditionalForwarderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go b/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go index b361096028e..a25af10ad0a 100644 --- a/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go +++ b/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go @@ -59,6 +59,9 @@ func addOperationUpdateNumberOfDomainControllersMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateNumberOfDomainControllersMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_UpdateRadius.go b/service/directoryservice/api_op_UpdateRadius.go index 0e0ce0344b1..48ea76d0be3 100644 --- a/service/directoryservice/api_op_UpdateRadius.go +++ b/service/directoryservice/api_op_UpdateRadius.go @@ -58,6 +58,9 @@ func addOperationUpdateRadiusMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateRadiusMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_UpdateTrust.go b/service/directoryservice/api_op_UpdateTrust.go index 84f72fcaf82..66412dd61ea 100644 --- a/service/directoryservice/api_op_UpdateTrust.go +++ b/service/directoryservice/api_op_UpdateTrust.go @@ -60,6 +60,9 @@ func addOperationUpdateTrustMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateTrustMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/api_op_VerifyTrust.go b/service/directoryservice/api_op_VerifyTrust.go index 2901604e3cc..da5d341278f 100644 --- a/service/directoryservice/api_op_VerifyTrust.go +++ b/service/directoryservice/api_op_VerifyTrust.go @@ -57,6 +57,9 @@ func addOperationVerifyTrustMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationVerifyTrustMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/directoryservice/go.mod b/service/directoryservice/go.mod index 57ea59275d1..6898ba344eb 100644 --- a/service/directoryservice/go.mod +++ b/service/directoryservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/directoryservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/directoryservice/go.sum b/service/directoryservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/directoryservice/go.sum +++ b/service/directoryservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/dlm/api_client.go b/service/dlm/api_client.go index a83c9058654..3738332335d 100644 --- a/service/dlm/api_client.go +++ b/service/dlm/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/dlm/api_op_CreateLifecyclePolicy.go b/service/dlm/api_op_CreateLifecyclePolicy.go index ac2640fac13..f991c26bd72 100644 --- a/service/dlm/api_op_CreateLifecyclePolicy.go +++ b/service/dlm/api_op_CreateLifecyclePolicy.go @@ -74,6 +74,9 @@ func addOperationCreateLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_DeleteLifecyclePolicy.go b/service/dlm/api_op_DeleteLifecyclePolicy.go index 46cb22fb158..9afd67ce1c7 100644 --- a/service/dlm/api_op_DeleteLifecyclePolicy.go +++ b/service/dlm/api_op_DeleteLifecyclePolicy.go @@ -49,6 +49,9 @@ func addOperationDeleteLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_GetLifecyclePolicies.go b/service/dlm/api_op_GetLifecyclePolicies.go index cecb5781b94..dcacfffb7c7 100644 --- a/service/dlm/api_op_GetLifecyclePolicies.go +++ b/service/dlm/api_op_GetLifecyclePolicies.go @@ -66,6 +66,9 @@ func addOperationGetLifecyclePoliciesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetLifecyclePoliciesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_GetLifecyclePolicy.go b/service/dlm/api_op_GetLifecyclePolicy.go index 0c5a53e5f7a..75be830caba 100644 --- a/service/dlm/api_op_GetLifecyclePolicy.go +++ b/service/dlm/api_op_GetLifecyclePolicy.go @@ -53,6 +53,9 @@ func addOperationGetLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_ListTagsForResource.go b/service/dlm/api_op_ListTagsForResource.go index 6db34fd3678..57d4b4e3bb0 100644 --- a/service/dlm/api_op_ListTagsForResource.go +++ b/service/dlm/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_TagResource.go b/service/dlm/api_op_TagResource.go index 5f22c18670e..8aece42adff 100644 --- a/service/dlm/api_op_TagResource.go +++ b/service/dlm/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_UntagResource.go b/service/dlm/api_op_UntagResource.go index 63f8cf5f41f..6efe00fce28 100644 --- a/service/dlm/api_op_UntagResource.go +++ b/service/dlm/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/api_op_UpdateLifecyclePolicy.go b/service/dlm/api_op_UpdateLifecyclePolicy.go index baf66c2c9d8..ed7a67b4096 100644 --- a/service/dlm/api_op_UpdateLifecyclePolicy.go +++ b/service/dlm/api_op_UpdateLifecyclePolicy.go @@ -63,6 +63,9 @@ func addOperationUpdateLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dlm/go.mod b/service/dlm/go.mod index 4884c9b0a12..910d4da6ba2 100644 --- a/service/dlm/go.mod +++ b/service/dlm/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/dlm go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dlm/go.sum b/service/dlm/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/dlm/go.sum +++ b/service/dlm/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/docdb/api_client.go b/service/docdb/api_client.go index b7e514bad46..fe2faeef18a 100644 --- a/service/docdb/api_client.go +++ b/service/docdb/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/docdb/api_op_AddTagsToResource.go b/service/docdb/api_op_AddTagsToResource.go index aaf9e41c1b4..a8c7bf2d6b9 100644 --- a/service/docdb/api_op_AddTagsToResource.go +++ b/service/docdb/api_op_AddTagsToResource.go @@ -59,6 +59,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ApplyPendingMaintenanceAction.go b/service/docdb/api_op_ApplyPendingMaintenanceAction.go index eb5219100dd..dd4aa227df5 100644 --- a/service/docdb/api_op_ApplyPendingMaintenanceAction.go +++ b/service/docdb/api_op_ApplyPendingMaintenanceAction.go @@ -77,6 +77,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CopyDBClusterParameterGroup.go b/service/docdb/api_op_CopyDBClusterParameterGroup.go index 46441db120d..8351fb273b7 100644 --- a/service/docdb/api_op_CopyDBClusterParameterGroup.go +++ b/service/docdb/api_op_CopyDBClusterParameterGroup.go @@ -92,6 +92,9 @@ func addOperationCopyDBClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCopyDBClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CopyDBClusterSnapshot.go b/service/docdb/api_op_CopyDBClusterSnapshot.go index f9eb3fceb31..b310c94272c 100644 --- a/service/docdb/api_op_CopyDBClusterSnapshot.go +++ b/service/docdb/api_op_CopyDBClusterSnapshot.go @@ -141,6 +141,9 @@ func addOperationCopyDBClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationCopyDBClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CreateDBCluster.go b/service/docdb/api_op_CreateDBCluster.go index 46538061d8b..f8fe64822f4 100644 --- a/service/docdb/api_op_CreateDBCluster.go +++ b/service/docdb/api_op_CreateDBCluster.go @@ -179,6 +179,9 @@ func addOperationCreateDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -221,6 +224,9 @@ func addOperationCreateDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CreateDBClusterParameterGroup.go b/service/docdb/api_op_CreateDBClusterParameterGroup.go index a1f5aad0a6c..524d615719c 100644 --- a/service/docdb/api_op_CreateDBClusterParameterGroup.go +++ b/service/docdb/api_op_CreateDBClusterParameterGroup.go @@ -87,6 +87,9 @@ func addOperationCreateDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CreateDBClusterSnapshot.go b/service/docdb/api_op_CreateDBClusterSnapshot.go index cd073cb1880..d303b784715 100644 --- a/service/docdb/api_op_CreateDBClusterSnapshot.go +++ b/service/docdb/api_op_CreateDBClusterSnapshot.go @@ -79,6 +79,9 @@ func addOperationCreateDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CreateDBInstance.go b/service/docdb/api_op_CreateDBInstance.go index 07170eebef6..fc38b158577 100644 --- a/service/docdb/api_op_CreateDBInstance.go +++ b/service/docdb/api_op_CreateDBInstance.go @@ -105,6 +105,9 @@ func addOperationCreateDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_CreateDBSubnetGroup.go b/service/docdb/api_op_CreateDBSubnetGroup.go index 5532f297110..8a9c18cdc08 100644 --- a/service/docdb/api_op_CreateDBSubnetGroup.go +++ b/service/docdb/api_op_CreateDBSubnetGroup.go @@ -70,6 +70,9 @@ func addOperationCreateDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DeleteDBCluster.go b/service/docdb/api_op_DeleteDBCluster.go index f46aeb204c5..f67aec96c17 100644 --- a/service/docdb/api_op_DeleteDBCluster.go +++ b/service/docdb/api_op_DeleteDBCluster.go @@ -79,6 +79,9 @@ func addOperationDeleteDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DeleteDBClusterParameterGroup.go b/service/docdb/api_op_DeleteDBClusterParameterGroup.go index 54710736a6f..3a031766460 100644 --- a/service/docdb/api_op_DeleteDBClusterParameterGroup.go +++ b/service/docdb/api_op_DeleteDBClusterParameterGroup.go @@ -58,6 +58,9 @@ func addOperationDeleteDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DeleteDBClusterSnapshot.go b/service/docdb/api_op_DeleteDBClusterSnapshot.go index 80f6a028262..43035a72482 100644 --- a/service/docdb/api_op_DeleteDBClusterSnapshot.go +++ b/service/docdb/api_op_DeleteDBClusterSnapshot.go @@ -57,6 +57,9 @@ func addOperationDeleteDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DeleteDBInstance.go b/service/docdb/api_op_DeleteDBInstance.go index 4e018c2c265..5cc018de57c 100644 --- a/service/docdb/api_op_DeleteDBInstance.go +++ b/service/docdb/api_op_DeleteDBInstance.go @@ -57,6 +57,9 @@ func addOperationDeleteDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DeleteDBSubnetGroup.go b/service/docdb/api_op_DeleteDBSubnetGroup.go index 0c8d4946b4f..846b07e7a8d 100644 --- a/service/docdb/api_op_DeleteDBSubnetGroup.go +++ b/service/docdb/api_op_DeleteDBSubnetGroup.go @@ -52,6 +52,9 @@ func addOperationDeleteDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeCertificates.go b/service/docdb/api_op_DescribeCertificates.go index 7b02c62e007..94a04221490 100644 --- a/service/docdb/api_op_DescribeCertificates.go +++ b/service/docdb/api_op_DescribeCertificates.go @@ -81,6 +81,9 @@ func addOperationDescribeCertificatesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeCertificatesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBClusterParameterGroups.go b/service/docdb/api_op_DescribeDBClusterParameterGroups.go index 726bd728706..05ff66e8245 100644 --- a/service/docdb/api_op_DescribeDBClusterParameterGroups.go +++ b/service/docdb/api_op_DescribeDBClusterParameterGroups.go @@ -78,6 +78,9 @@ func addOperationDescribeDBClusterParameterGroupsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeDBClusterParameterGroupsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBClusterParameters.go b/service/docdb/api_op_DescribeDBClusterParameters.go index a66fb7b26cf..378e41c3dad 100644 --- a/service/docdb/api_op_DescribeDBClusterParameters.go +++ b/service/docdb/api_op_DescribeDBClusterParameters.go @@ -82,6 +82,9 @@ func addOperationDescribeDBClusterParametersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeDBClusterParametersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go b/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go index 840b5847178..c5eea8062c6 100644 --- a/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go +++ b/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go @@ -61,6 +61,9 @@ func addOperationDescribeDBClusterSnapshotAttributesMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeDBClusterSnapshotAttributesMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBClusterSnapshots.go b/service/docdb/api_op_DescribeDBClusterSnapshots.go index 0a5304a6177..d1e312166dd 100644 --- a/service/docdb/api_op_DescribeDBClusterSnapshots.go +++ b/service/docdb/api_op_DescribeDBClusterSnapshots.go @@ -125,6 +125,9 @@ func addOperationDescribeDBClusterSnapshotsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationDescribeDBClusterSnapshotsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBClusters.go b/service/docdb/api_op_DescribeDBClusters.go index 9f5af748191..8a96aa38a17 100644 --- a/service/docdb/api_op_DescribeDBClusters.go +++ b/service/docdb/api_op_DescribeDBClusters.go @@ -87,6 +87,9 @@ func addOperationDescribeDBClustersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeDBClustersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBEngineVersions.go b/service/docdb/api_op_DescribeDBEngineVersions.go index 8ca0c963266..64afea738f4 100644 --- a/service/docdb/api_op_DescribeDBEngineVersions.go +++ b/service/docdb/api_op_DescribeDBEngineVersions.go @@ -95,6 +95,9 @@ func addOperationDescribeDBEngineVersionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeDBEngineVersionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBInstances.go b/service/docdb/api_op_DescribeDBInstances.go index 14556b2170b..7a19972f6c5 100644 --- a/service/docdb/api_op_DescribeDBInstances.go +++ b/service/docdb/api_op_DescribeDBInstances.go @@ -88,6 +88,9 @@ func addOperationDescribeDBInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeDBInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeDBSubnetGroups.go b/service/docdb/api_op_DescribeDBSubnetGroups.go index 3b079b87221..97a18cfcc75 100644 --- a/service/docdb/api_op_DescribeDBSubnetGroups.go +++ b/service/docdb/api_op_DescribeDBSubnetGroups.go @@ -74,6 +74,9 @@ func addOperationDescribeDBSubnetGroupsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeDBSubnetGroupsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go b/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go index d697807b5a6..9e07cb882d5 100644 --- a/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go +++ b/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go @@ -71,6 +71,9 @@ func addOperationDescribeEngineDefaultClusterParametersMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeEngineDefaultClusterParametersMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeEventCategories.go b/service/docdb/api_op_DescribeEventCategories.go index b39a738bb9e..c26c6a625e7 100644 --- a/service/docdb/api_op_DescribeEventCategories.go +++ b/service/docdb/api_op_DescribeEventCategories.go @@ -58,6 +58,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeEvents.go b/service/docdb/api_op_DescribeEvents.go index 3222be3b6f7..e3bac6dba83 100644 --- a/service/docdb/api_op_DescribeEvents.go +++ b/service/docdb/api_op_DescribeEvents.go @@ -115,6 +115,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go b/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go index 62e40ce709e..316acdfe0b6 100644 --- a/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go +++ b/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go @@ -90,6 +90,9 @@ func addOperationDescribeOrderableDBInstanceOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeOrderableDBInstanceOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_DescribePendingMaintenanceActions.go b/service/docdb/api_op_DescribePendingMaintenanceActions.go index 5c001d58717..60e35951a4b 100644 --- a/service/docdb/api_op_DescribePendingMaintenanceActions.go +++ b/service/docdb/api_op_DescribePendingMaintenanceActions.go @@ -82,6 +82,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_FailoverDBCluster.go b/service/docdb/api_op_FailoverDBCluster.go index 4d7bdf6a509..db3ff78b362 100644 --- a/service/docdb/api_op_FailoverDBCluster.go +++ b/service/docdb/api_op_FailoverDBCluster.go @@ -65,6 +65,9 @@ func addOperationFailoverDBClusterMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationFailoverDBClusterMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ListTagsForResource.go b/service/docdb/api_op_ListTagsForResource.go index f4ba8cf58d2..f338c3887f0 100644 --- a/service/docdb/api_op_ListTagsForResource.go +++ b/service/docdb/api_op_ListTagsForResource.go @@ -59,6 +59,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ModifyDBCluster.go b/service/docdb/api_op_ModifyDBCluster.go index ce2f4b5a9a4..6f065504b70 100644 --- a/service/docdb/api_op_ModifyDBCluster.go +++ b/service/docdb/api_op_ModifyDBCluster.go @@ -146,6 +146,9 @@ func addOperationModifyDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationModifyDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ModifyDBClusterParameterGroup.go b/service/docdb/api_op_ModifyDBClusterParameterGroup.go index 9aaa669190d..5bfcb008cda 100644 --- a/service/docdb/api_op_ModifyDBClusterParameterGroup.go +++ b/service/docdb/api_op_ModifyDBClusterParameterGroup.go @@ -82,6 +82,9 @@ func addOperationModifyDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationModifyDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go b/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go index f079f44e76e..34f203d02d2 100644 --- a/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go +++ b/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go @@ -89,6 +89,9 @@ func addOperationModifyDBClusterSnapshotAttributeMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationModifyDBClusterSnapshotAttributeMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ModifyDBInstance.go b/service/docdb/api_op_ModifyDBInstance.go index 4e95cb15f47..591183d1e95 100644 --- a/service/docdb/api_op_ModifyDBInstance.go +++ b/service/docdb/api_op_ModifyDBInstance.go @@ -119,6 +119,9 @@ func addOperationModifyDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationModifyDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ModifyDBSubnetGroup.go b/service/docdb/api_op_ModifyDBSubnetGroup.go index 26f08889f48..97e8c6f7711 100644 --- a/service/docdb/api_op_ModifyDBSubnetGroup.go +++ b/service/docdb/api_op_ModifyDBSubnetGroup.go @@ -65,6 +65,9 @@ func addOperationModifyDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationModifyDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_RebootDBInstance.go b/service/docdb/api_op_RebootDBInstance.go index 9ee1a751abc..ffdba934cc0 100644 --- a/service/docdb/api_op_RebootDBInstance.go +++ b/service/docdb/api_op_RebootDBInstance.go @@ -66,6 +66,9 @@ func addOperationRebootDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRebootDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_RemoveTagsFromResource.go b/service/docdb/api_op_RemoveTagsFromResource.go index 1d327f9979d..27eadeef71e 100644 --- a/service/docdb/api_op_RemoveTagsFromResource.go +++ b/service/docdb/api_op_RemoveTagsFromResource.go @@ -55,6 +55,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_ResetDBClusterParameterGroup.go b/service/docdb/api_op_ResetDBClusterParameterGroup.go index a7b6f257d0e..acb967b1d45 100644 --- a/service/docdb/api_op_ResetDBClusterParameterGroup.go +++ b/service/docdb/api_op_ResetDBClusterParameterGroup.go @@ -82,6 +82,9 @@ func addOperationResetDBClusterParameterGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationResetDBClusterParameterGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_RestoreDBClusterFromSnapshot.go b/service/docdb/api_op_RestoreDBClusterFromSnapshot.go index 65759dc920e..e4357212a5d 100644 --- a/service/docdb/api_op_RestoreDBClusterFromSnapshot.go +++ b/service/docdb/api_op_RestoreDBClusterFromSnapshot.go @@ -135,6 +135,9 @@ func addOperationRestoreDBClusterFromSnapshotMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationRestoreDBClusterFromSnapshotMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_RestoreDBClusterToPointInTime.go b/service/docdb/api_op_RestoreDBClusterToPointInTime.go index e89fa5043be..1e37c324090 100644 --- a/service/docdb/api_op_RestoreDBClusterToPointInTime.go +++ b/service/docdb/api_op_RestoreDBClusterToPointInTime.go @@ -143,6 +143,9 @@ func addOperationRestoreDBClusterToPointInTimeMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -185,6 +188,9 @@ func addOperationRestoreDBClusterToPointInTimeMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_StartDBCluster.go b/service/docdb/api_op_StartDBCluster.go index c6fa9dd7da3..f4d95510eed 100644 --- a/service/docdb/api_op_StartDBCluster.go +++ b/service/docdb/api_op_StartDBCluster.go @@ -55,6 +55,9 @@ func addOperationStartDBClusterMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStartDBClusterMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/api_op_StopDBCluster.go b/service/docdb/api_op_StopDBCluster.go index 94aa9000fc5..2e998f16a01 100644 --- a/service/docdb/api_op_StopDBCluster.go +++ b/service/docdb/api_op_StopDBCluster.go @@ -56,6 +56,9 @@ func addOperationStopDBClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopDBClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/docdb/go.mod b/service/docdb/go.mod index a7b32e92910..0c1c4fb37b8 100644 --- a/service/docdb/go.mod +++ b/service/docdb/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/docdb go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/docdb/go.sum b/service/docdb/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/docdb/go.sum +++ b/service/docdb/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/dynamodb/api_client.go b/service/dynamodb/api_client.go index 5a7b77132be..b9caea47327 100644 --- a/service/dynamodb/api_client.go +++ b/service/dynamodb/api_client.go @@ -13,6 +13,7 @@ import ( ddbcust "github.com/aws/aws-sdk-go-v2/service/dynamodb/internal/customizations" acceptencodingcust "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -34,6 +35,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -61,6 +64,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -85,6 +91,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -139,14 +148,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -185,15 +207,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -206,7 +228,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -231,3 +254,12 @@ func addValidateResponseChecksum(stack *middleware.Stack, options Options) error func addAcceptEncodingGzip(stack *middleware.Stack, options Options) error { return acceptencodingcust.AddAcceptEncodingGzip(stack, acceptencodingcust.AddAcceptEncodingGzipOptions{Enable: options.EnableAcceptEncodingGzip}) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/dynamodb/api_op_BatchGetItem.go b/service/dynamodb/api_op_BatchGetItem.go index 140644e22d3..d74579b76d6 100644 --- a/service/dynamodb/api_op_BatchGetItem.go +++ b/service/dynamodb/api_op_BatchGetItem.go @@ -213,6 +213,9 @@ func addOperationBatchGetItemMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -261,6 +264,9 @@ func addOperationBatchGetItemMiddlewares(stack *middleware.Stack, options Option if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_BatchWriteItem.go b/service/dynamodb/api_op_BatchWriteItem.go index 336d24b4249..f80fe694974 100644 --- a/service/dynamodb/api_op_BatchWriteItem.go +++ b/service/dynamodb/api_op_BatchWriteItem.go @@ -220,6 +220,9 @@ func addOperationBatchWriteItemMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -268,6 +271,9 @@ func addOperationBatchWriteItemMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_CreateBackup.go b/service/dynamodb/api_op_CreateBackup.go index e07a5544f17..18b78f2ddac 100644 --- a/service/dynamodb/api_op_CreateBackup.go +++ b/service/dynamodb/api_op_CreateBackup.go @@ -80,6 +80,9 @@ func addOperationCreateBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateBackupMiddlewares(stack *middleware.Stack, options Option if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_CreateGlobalTable.go b/service/dynamodb/api_op_CreateGlobalTable.go index 7644e4910b9..1d8f9a46916 100644 --- a/service/dynamodb/api_op_CreateGlobalTable.go +++ b/service/dynamodb/api_op_CreateGlobalTable.go @@ -102,6 +102,9 @@ func addOperationCreateGlobalTableMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateGlobalTableMiddlewares(stack *middleware.Stack, options O if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_CreateTable.go b/service/dynamodb/api_op_CreateTable.go index 73ebec641af..f196e67ad1a 100644 --- a/service/dynamodb/api_op_CreateTable.go +++ b/service/dynamodb/api_op_CreateTable.go @@ -237,6 +237,9 @@ func addOperationCreateTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -285,6 +288,9 @@ func addOperationCreateTableMiddlewares(stack *middleware.Stack, options Options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DeleteBackup.go b/service/dynamodb/api_op_DeleteBackup.go index 0c294e1957c..ec986558026 100644 --- a/service/dynamodb/api_op_DeleteBackup.go +++ b/service/dynamodb/api_op_DeleteBackup.go @@ -54,6 +54,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DeleteItem.go b/service/dynamodb/api_op_DeleteItem.go index 552a4b84190..f0c3297060b 100644 --- a/service/dynamodb/api_op_DeleteItem.go +++ b/service/dynamodb/api_op_DeleteItem.go @@ -226,6 +226,9 @@ func addOperationDeleteItemMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -274,6 +277,9 @@ func addOperationDeleteItemMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DeleteTable.go b/service/dynamodb/api_op_DeleteTable.go index 43c4a45429a..c6eedf31da1 100644 --- a/service/dynamodb/api_op_DeleteTable.go +++ b/service/dynamodb/api_op_DeleteTable.go @@ -67,6 +67,9 @@ func addOperationDeleteTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteTableMiddlewares(stack *middleware.Stack, options Options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeBackup.go b/service/dynamodb/api_op_DescribeBackup.go index 620eeb83944..968b7e853f2 100644 --- a/service/dynamodb/api_op_DescribeBackup.go +++ b/service/dynamodb/api_op_DescribeBackup.go @@ -54,6 +54,9 @@ func addOperationDescribeBackupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeBackupMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeContinuousBackups.go b/service/dynamodb/api_op_DescribeContinuousBackups.go index 94bd3833eb7..21e56f77360 100644 --- a/service/dynamodb/api_op_DescribeContinuousBackups.go +++ b/service/dynamodb/api_op_DescribeContinuousBackups.go @@ -63,6 +63,9 @@ func addOperationDescribeContinuousBackupsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeContinuousBackupsMiddlewares(stack *middleware.Stack, o if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeContributorInsights.go b/service/dynamodb/api_op_DescribeContributorInsights.go index 2696b599169..30afe24fdcd 100644 --- a/service/dynamodb/api_op_DescribeContributorInsights.go +++ b/service/dynamodb/api_op_DescribeContributorInsights.go @@ -89,6 +89,9 @@ func addOperationDescribeContributorInsightsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeContributorInsightsMiddlewares(stack *middleware.Stack, if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeEndpoints.go b/service/dynamodb/api_op_DescribeEndpoints.go index 7a9c466846a..775e9404317 100644 --- a/service/dynamodb/api_op_DescribeEndpoints.go +++ b/service/dynamodb/api_op_DescribeEndpoints.go @@ -50,6 +50,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeGlobalTable.go b/service/dynamodb/api_op_DescribeGlobalTable.go index fdd2eb713b2..1990162515a 100644 --- a/service/dynamodb/api_op_DescribeGlobalTable.go +++ b/service/dynamodb/api_op_DescribeGlobalTable.go @@ -60,6 +60,9 @@ func addOperationDescribeGlobalTableMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeGlobalTableMiddlewares(stack *middleware.Stack, options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeGlobalTableSettings.go b/service/dynamodb/api_op_DescribeGlobalTableSettings.go index e8f8537ebfc..0d3dc70ef8b 100644 --- a/service/dynamodb/api_op_DescribeGlobalTableSettings.go +++ b/service/dynamodb/api_op_DescribeGlobalTableSettings.go @@ -59,6 +59,9 @@ func addOperationDescribeGlobalTableSettingsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeGlobalTableSettingsMiddlewares(stack *middleware.Stack, if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeLimits.go b/service/dynamodb/api_op_DescribeLimits.go index 15d40af5517..c063cc8a763 100644 --- a/service/dynamodb/api_op_DescribeLimits.go +++ b/service/dynamodb/api_op_DescribeLimits.go @@ -117,6 +117,9 @@ func addOperationDescribeLimitsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationDescribeLimitsMiddlewares(stack *middleware.Stack, options Opti if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeTable.go b/service/dynamodb/api_op_DescribeTable.go index 3ee90324576..ec73042954b 100644 --- a/service/dynamodb/api_op_DescribeTable.go +++ b/service/dynamodb/api_op_DescribeTable.go @@ -61,6 +61,9 @@ func addOperationDescribeTableMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeTableMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go b/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go index 9ac526a585a..6b4f0f4e708 100644 --- a/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go +++ b/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go @@ -56,6 +56,9 @@ func addOperationDescribeTableReplicaAutoScalingMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeTableReplicaAutoScalingMiddlewares(stack *middleware.St if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_DescribeTimeToLive.go b/service/dynamodb/api_op_DescribeTimeToLive.go index 002554f8308..95d033e582f 100644 --- a/service/dynamodb/api_op_DescribeTimeToLive.go +++ b/service/dynamodb/api_op_DescribeTimeToLive.go @@ -53,6 +53,9 @@ func addOperationDescribeTimeToLiveMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeTimeToLiveMiddlewares(stack *middleware.Stack, options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_GetItem.go b/service/dynamodb/api_op_GetItem.go index 0517f740509..06123ab0fe4 100644 --- a/service/dynamodb/api_op_GetItem.go +++ b/service/dynamodb/api_op_GetItem.go @@ -159,6 +159,9 @@ func addOperationGetItemMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -207,6 +210,9 @@ func addOperationGetItemMiddlewares(stack *middleware.Stack, options Options) (e if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_ListBackups.go b/service/dynamodb/api_op_ListBackups.go index 18049eccd89..5dc9f4accfc 100644 --- a/service/dynamodb/api_op_ListBackups.go +++ b/service/dynamodb/api_op_ListBackups.go @@ -98,6 +98,9 @@ func addOperationListBackupsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationListBackupsMiddlewares(stack *middleware.Stack, options Options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_ListContributorInsights.go b/service/dynamodb/api_op_ListContributorInsights.go index e38b90a84ae..636c0d0395a 100644 --- a/service/dynamodb/api_op_ListContributorInsights.go +++ b/service/dynamodb/api_op_ListContributorInsights.go @@ -61,6 +61,9 @@ func addOperationListContributorInsightsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListContributorInsightsMiddlewares(stack *middleware.Stack, opt if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_ListGlobalTables.go b/service/dynamodb/api_op_ListGlobalTables.go index f99a19cff61..a2d7c021c2e 100644 --- a/service/dynamodb/api_op_ListGlobalTables.go +++ b/service/dynamodb/api_op_ListGlobalTables.go @@ -67,6 +67,9 @@ func addOperationListGlobalTablesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListGlobalTablesMiddlewares(stack *middleware.Stack, options Op if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_ListTables.go b/service/dynamodb/api_op_ListTables.go index 32441d1234e..de0519c4985 100644 --- a/service/dynamodb/api_op_ListTables.go +++ b/service/dynamodb/api_op_ListTables.go @@ -71,6 +71,9 @@ func addOperationListTablesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListTablesMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_ListTagsOfResource.go b/service/dynamodb/api_op_ListTagsOfResource.go index f7144a68091..ef090e9d485 100644 --- a/service/dynamodb/api_op_ListTagsOfResource.go +++ b/service/dynamodb/api_op_ListTagsOfResource.go @@ -67,6 +67,9 @@ func addOperationListTagsOfResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListTagsOfResourceMiddlewares(stack *middleware.Stack, options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_PutItem.go b/service/dynamodb/api_op_PutItem.go index 1316f201a23..41ee3dd8e5f 100644 --- a/service/dynamodb/api_op_PutItem.go +++ b/service/dynamodb/api_op_PutItem.go @@ -287,6 +287,9 @@ func addOperationPutItemMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -335,6 +338,9 @@ func addOperationPutItemMiddlewares(stack *middleware.Stack, options Options) (e if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_Query.go b/service/dynamodb/api_op_Query.go index 88a7a62b677..3be730f0166 100644 --- a/service/dynamodb/api_op_Query.go +++ b/service/dynamodb/api_op_Query.go @@ -401,6 +401,9 @@ func addOperationQueryMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -449,6 +452,9 @@ func addOperationQueryMiddlewares(stack *middleware.Stack, options Options) (err if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_RestoreTableFromBackup.go b/service/dynamodb/api_op_RestoreTableFromBackup.go index b6dae2c1038..431dc67f49f 100644 --- a/service/dynamodb/api_op_RestoreTableFromBackup.go +++ b/service/dynamodb/api_op_RestoreTableFromBackup.go @@ -94,6 +94,9 @@ func addOperationRestoreTableFromBackupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationRestoreTableFromBackupMiddlewares(stack *middleware.Stack, opti if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_RestoreTableToPointInTime.go b/service/dynamodb/api_op_RestoreTableToPointInTime.go index 08750557eb2..fb934ed8515 100644 --- a/service/dynamodb/api_op_RestoreTableToPointInTime.go +++ b/service/dynamodb/api_op_RestoreTableToPointInTime.go @@ -124,6 +124,9 @@ func addOperationRestoreTableToPointInTimeMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationRestoreTableToPointInTimeMiddlewares(stack *middleware.Stack, o if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_Scan.go b/service/dynamodb/api_op_Scan.go index 6d4b78b2df6..1512c8e4a01 100644 --- a/service/dynamodb/api_op_Scan.go +++ b/service/dynamodb/api_op_Scan.go @@ -325,6 +325,9 @@ func addOperationScanMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -373,6 +376,9 @@ func addOperationScanMiddlewares(stack *middleware.Stack, options Options) (err if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_TagResource.go b/service/dynamodb/api_op_TagResource.go index 4a34af809cb..b7c62bb2cdf 100644 --- a/service/dynamodb/api_op_TagResource.go +++ b/service/dynamodb/api_op_TagResource.go @@ -61,6 +61,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_TransactGetItems.go b/service/dynamodb/api_op_TransactGetItems.go index 6863766ec98..38894d59ac0 100644 --- a/service/dynamodb/api_op_TransactGetItems.go +++ b/service/dynamodb/api_op_TransactGetItems.go @@ -90,6 +90,9 @@ func addOperationTransactGetItemsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationTransactGetItemsMiddlewares(stack *middleware.Stack, options Op if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_TransactWriteItems.go b/service/dynamodb/api_op_TransactWriteItems.go index ed0ee74a4e2..cad4afaca83 100644 --- a/service/dynamodb/api_op_TransactWriteItems.go +++ b/service/dynamodb/api_op_TransactWriteItems.go @@ -160,6 +160,9 @@ func addOperationTransactWriteItemsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -211,6 +214,9 @@ func addOperationTransactWriteItemsMiddlewares(stack *middleware.Stack, options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UntagResource.go b/service/dynamodb/api_op_UntagResource.go index 62c247710df..180e73c28b5 100644 --- a/service/dynamodb/api_op_UntagResource.go +++ b/service/dynamodb/api_op_UntagResource.go @@ -59,6 +59,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateContinuousBackups.go b/service/dynamodb/api_op_UpdateContinuousBackups.go index 5ca4c7553d7..8d8c9689ea3 100644 --- a/service/dynamodb/api_op_UpdateContinuousBackups.go +++ b/service/dynamodb/api_op_UpdateContinuousBackups.go @@ -67,6 +67,9 @@ func addOperationUpdateContinuousBackupsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateContinuousBackupsMiddlewares(stack *middleware.Stack, opt if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateContributorInsights.go b/service/dynamodb/api_op_UpdateContributorInsights.go index 21198e3c9c1..47447068380 100644 --- a/service/dynamodb/api_op_UpdateContributorInsights.go +++ b/service/dynamodb/api_op_UpdateContributorInsights.go @@ -67,6 +67,9 @@ func addOperationUpdateContributorInsightsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateContributorInsightsMiddlewares(stack *middleware.Stack, o if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateGlobalTable.go b/service/dynamodb/api_op_UpdateGlobalTable.go index e8d1e4b78a6..424bb701aa6 100644 --- a/service/dynamodb/api_op_UpdateGlobalTable.go +++ b/service/dynamodb/api_op_UpdateGlobalTable.go @@ -74,6 +74,9 @@ func addOperationUpdateGlobalTableMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateGlobalTableMiddlewares(stack *middleware.Stack, options O if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateGlobalTableSettings.go b/service/dynamodb/api_op_UpdateGlobalTableSettings.go index 179e2069499..2950f78161d 100644 --- a/service/dynamodb/api_op_UpdateGlobalTableSettings.go +++ b/service/dynamodb/api_op_UpdateGlobalTableSettings.go @@ -85,6 +85,9 @@ func addOperationUpdateGlobalTableSettingsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationUpdateGlobalTableSettingsMiddlewares(stack *middleware.Stack, o if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateItem.go b/service/dynamodb/api_op_UpdateItem.go index f2850f1048f..58a536ebcf6 100644 --- a/service/dynamodb/api_op_UpdateItem.go +++ b/service/dynamodb/api_op_UpdateItem.go @@ -312,6 +312,9 @@ func addOperationUpdateItemMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -360,6 +363,9 @@ func addOperationUpdateItemMiddlewares(stack *middleware.Stack, options Options) if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateTable.go b/service/dynamodb/api_op_UpdateTable.go index 09e8c5d6926..f05b6914807 100644 --- a/service/dynamodb/api_op_UpdateTable.go +++ b/service/dynamodb/api_op_UpdateTable.go @@ -133,6 +133,9 @@ func addOperationUpdateTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationUpdateTableMiddlewares(stack *middleware.Stack, options Options if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go b/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go index b54f7b0c19a..b8afafe5399 100644 --- a/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go +++ b/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go @@ -68,6 +68,9 @@ func addOperationUpdateTableReplicaAutoScalingMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateTableReplicaAutoScalingMiddlewares(stack *middleware.Stac if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/api_op_UpdateTimeToLive.go b/service/dynamodb/api_op_UpdateTimeToLive.go index 83db8bdebd6..fb0c3af3cbd 100644 --- a/service/dynamodb/api_op_UpdateTimeToLive.go +++ b/service/dynamodb/api_op_UpdateTimeToLive.go @@ -78,6 +78,9 @@ func addOperationUpdateTimeToLiveMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateTimeToLiveMiddlewares(stack *middleware.Stack, options Op if err = addAcceptEncodingGzip(stack, options); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodb/go.mod b/service/dynamodb/go.mod index 093734460a5..4a1dcd7b9af 100644 --- a/service/dynamodb/go.mod +++ b/service/dynamodb/go.mod @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/dynamodb go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c + github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dynamodb/go.sum b/service/dynamodb/go.sum index 7e305fdc6d2..f37194ca529 100644 --- a/service/dynamodb/go.sum +++ b/service/dynamodb/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= diff --git a/service/dynamodbstreams/api_client.go b/service/dynamodbstreams/api_client.go index 7ea82fb3338..11b246a4bc8 100644 --- a/service/dynamodbstreams/api_client.go +++ b/service/dynamodbstreams/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/dynamodbstreams/api_op_DescribeStream.go b/service/dynamodbstreams/api_op_DescribeStream.go index 14fd8117696..d8eee29ac4d 100644 --- a/service/dynamodbstreams/api_op_DescribeStream.go +++ b/service/dynamodbstreams/api_op_DescribeStream.go @@ -71,6 +71,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodbstreams/api_op_GetRecords.go b/service/dynamodbstreams/api_op_GetRecords.go index 2b71cb00621..28aec852e27 100644 --- a/service/dynamodbstreams/api_op_GetRecords.go +++ b/service/dynamodbstreams/api_op_GetRecords.go @@ -72,6 +72,9 @@ func addOperationGetRecordsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetRecordsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodbstreams/api_op_GetShardIterator.go b/service/dynamodbstreams/api_op_GetShardIterator.go index 7694f653840..9cc131d3842 100644 --- a/service/dynamodbstreams/api_op_GetShardIterator.go +++ b/service/dynamodbstreams/api_op_GetShardIterator.go @@ -90,6 +90,9 @@ func addOperationGetShardIteratorMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetShardIteratorMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodbstreams/api_op_ListStreams.go b/service/dynamodbstreams/api_op_ListStreams.go index 7a9c4709225..85c57c9d717 100644 --- a/service/dynamodbstreams/api_op_ListStreams.go +++ b/service/dynamodbstreams/api_op_ListStreams.go @@ -74,6 +74,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/dynamodbstreams/go.mod b/service/dynamodbstreams/go.mod index 2f6e0435fc7..1dbd883df99 100644 --- a/service/dynamodbstreams/go.mod +++ b/service/dynamodbstreams/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/dynamodbstreams go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dynamodbstreams/go.sum b/service/dynamodbstreams/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/dynamodbstreams/go.sum +++ b/service/dynamodbstreams/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ebs/api_client.go b/service/ebs/api_client.go index 30509dd71f9..577884540f2 100644 --- a/service/ebs/api_client.go +++ b/service/ebs/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ebs/api_op_CompleteSnapshot.go b/service/ebs/api_op_CompleteSnapshot.go index 7a76cef1851..d8879a47cff 100644 --- a/service/ebs/api_op_CompleteSnapshot.go +++ b/service/ebs/api_op_CompleteSnapshot.go @@ -75,6 +75,9 @@ func addOperationCompleteSnapshotMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCompleteSnapshotMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ebs/api_op_GetSnapshotBlock.go b/service/ebs/api_op_GetSnapshotBlock.go index 0ba8658d5c6..053befedc06 100644 --- a/service/ebs/api_op_GetSnapshotBlock.go +++ b/service/ebs/api_op_GetSnapshotBlock.go @@ -75,6 +75,9 @@ func addOperationGetSnapshotBlockMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetSnapshotBlockMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ebs/api_op_ListChangedBlocks.go b/service/ebs/api_op_ListChangedBlocks.go index 93ace06c78a..b3df978f1ec 100644 --- a/service/ebs/api_op_ListChangedBlocks.go +++ b/service/ebs/api_op_ListChangedBlocks.go @@ -85,6 +85,9 @@ func addOperationListChangedBlocksMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListChangedBlocksMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ebs/api_op_ListSnapshotBlocks.go b/service/ebs/api_op_ListSnapshotBlocks.go index d989db58c30..f3ae9016f8d 100644 --- a/service/ebs/api_op_ListSnapshotBlocks.go +++ b/service/ebs/api_op_ListSnapshotBlocks.go @@ -77,6 +77,9 @@ func addOperationListSnapshotBlocksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListSnapshotBlocksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ebs/api_op_PutSnapshotBlock.go b/service/ebs/api_op_PutSnapshotBlock.go index e89ae5f220d..960885c2da3 100644 --- a/service/ebs/api_op_PutSnapshotBlock.go +++ b/service/ebs/api_op_PutSnapshotBlock.go @@ -103,6 +103,9 @@ func addOperationPutSnapshotBlockMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationPutSnapshotBlockMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ebs/api_op_StartSnapshot.go b/service/ebs/api_op_StartSnapshot.go index 304d983ab76..2b4326766b3 100644 --- a/service/ebs/api_op_StartSnapshot.go +++ b/service/ebs/api_op_StartSnapshot.go @@ -149,6 +149,9 @@ func addOperationStartSnapshotMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationStartSnapshotMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ebs/go.mod b/service/ebs/go.mod index b911d1e868a..adcdf621295 100644 --- a/service/ebs/go.mod +++ b/service/ebs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ebs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ebs/go.sum b/service/ebs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ebs/go.sum +++ b/service/ebs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ec2/api_client.go b/service/ec2/api_client.go index 3bd5f79328f..852dfd4686a 100644 --- a/service/ec2/api_client.go +++ b/service/ec2/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go b/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go index c19dd456732..0b028f4ebd4 100644 --- a/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go +++ b/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go @@ -67,6 +67,9 @@ func addOperationAcceptReservedInstancesExchangeQuoteMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationAcceptReservedInstancesExchangeQuoteMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go b/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go index 3eb9843d438..e3d3d2f6053 100644 --- a/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go @@ -60,6 +60,9 @@ func addOperationAcceptTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAcceptTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go b/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go index 8ce202560e8..c1ad595e33d 100644 --- a/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go @@ -62,6 +62,9 @@ func addOperationAcceptTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAcceptTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AcceptVpcEndpointConnections.go b/service/ec2/api_op_AcceptVpcEndpointConnections.go index 096321fd776..6a52c381c1a 100644 --- a/service/ec2/api_op_AcceptVpcEndpointConnections.go +++ b/service/ec2/api_op_AcceptVpcEndpointConnections.go @@ -65,6 +65,9 @@ func addOperationAcceptVpcEndpointConnectionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAcceptVpcEndpointConnectionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AcceptVpcPeeringConnection.go b/service/ec2/api_op_AcceptVpcPeeringConnection.go index 7e0e418b0df..e69ac732d5f 100644 --- a/service/ec2/api_op_AcceptVpcPeeringConnection.go +++ b/service/ec2/api_op_AcceptVpcPeeringConnection.go @@ -62,6 +62,9 @@ func addOperationAcceptVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAcceptVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AdvertiseByoipCidr.go b/service/ec2/api_op_AdvertiseByoipCidr.go index 71a0e36685c..218d253666a 100644 --- a/service/ec2/api_op_AdvertiseByoipCidr.go +++ b/service/ec2/api_op_AdvertiseByoipCidr.go @@ -69,6 +69,9 @@ func addOperationAdvertiseByoipCidrMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAdvertiseByoipCidrMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AllocateAddress.go b/service/ec2/api_op_AllocateAddress.go index 0fbec2bee0d..2bd065690ee 100644 --- a/service/ec2/api_op_AllocateAddress.go +++ b/service/ec2/api_op_AllocateAddress.go @@ -131,6 +131,9 @@ func addOperationAllocateAddressMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationAllocateAddressMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AllocateHosts.go b/service/ec2/api_op_AllocateHosts.go index ea71fb9fead..8d2f84c2182 100644 --- a/service/ec2/api_op_AllocateHosts.go +++ b/service/ec2/api_op_AllocateHosts.go @@ -99,6 +99,9 @@ func addOperationAllocateHostsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationAllocateHostsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go b/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go index 18ceaf37a15..2a3a9ad7e43 100644 --- a/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go +++ b/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go @@ -71,6 +71,9 @@ func addOperationApplySecurityGroupsToClientVpnTargetNetworkMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationApplySecurityGroupsToClientVpnTargetNetworkMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssignIpv6Addresses.go b/service/ec2/api_op_AssignIpv6Addresses.go index d524b0ff215..0d44fae11b7 100644 --- a/service/ec2/api_op_AssignIpv6Addresses.go +++ b/service/ec2/api_op_AssignIpv6Addresses.go @@ -72,6 +72,9 @@ func addOperationAssignIpv6AddressesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationAssignIpv6AddressesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssignPrivateIpAddresses.go b/service/ec2/api_op_AssignPrivateIpAddresses.go index 1c01778a159..677160a21b8 100644 --- a/service/ec2/api_op_AssignPrivateIpAddresses.go +++ b/service/ec2/api_op_AssignPrivateIpAddresses.go @@ -88,6 +88,9 @@ func addOperationAssignPrivateIpAddressesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationAssignPrivateIpAddressesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateAddress.go b/service/ec2/api_op_AssociateAddress.go index eb645172aa0..193c0c53f6f 100644 --- a/service/ec2/api_op_AssociateAddress.go +++ b/service/ec2/api_op_AssociateAddress.go @@ -109,6 +109,9 @@ func addOperationAssociateAddressMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationAssociateAddressMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateClientVpnTargetNetwork.go b/service/ec2/api_op_AssociateClientVpnTargetNetwork.go index 06d93a4a742..336f062a4f7 100644 --- a/service/ec2/api_op_AssociateClientVpnTargetNetwork.go +++ b/service/ec2/api_op_AssociateClientVpnTargetNetwork.go @@ -81,6 +81,9 @@ func addOperationAssociateClientVpnTargetNetworkMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationAssociateClientVpnTargetNetworkMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateDhcpOptions.go b/service/ec2/api_op_AssociateDhcpOptions.go index f6ee980b5e9..9b3fdb2c7bc 100644 --- a/service/ec2/api_op_AssociateDhcpOptions.go +++ b/service/ec2/api_op_AssociateDhcpOptions.go @@ -69,6 +69,9 @@ func addOperationAssociateDhcpOptionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAssociateDhcpOptionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateEnclaveCertificateIamRole.go b/service/ec2/api_op_AssociateEnclaveCertificateIamRole.go index fac0265eaa0..687084d059d 100644 --- a/service/ec2/api_op_AssociateEnclaveCertificateIamRole.go +++ b/service/ec2/api_op_AssociateEnclaveCertificateIamRole.go @@ -85,6 +85,9 @@ func addOperationAssociateEnclaveCertificateIamRoleMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationAssociateEnclaveCertificateIamRoleMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateIamInstanceProfile.go b/service/ec2/api_op_AssociateIamInstanceProfile.go index 5fa4fb3f23b..a1bb633e221 100644 --- a/service/ec2/api_op_AssociateIamInstanceProfile.go +++ b/service/ec2/api_op_AssociateIamInstanceProfile.go @@ -59,6 +59,9 @@ func addOperationAssociateIamInstanceProfileMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAssociateIamInstanceProfileMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateRouteTable.go b/service/ec2/api_op_AssociateRouteTable.go index 72f9004c102..5c5fd1a9273 100644 --- a/service/ec2/api_op_AssociateRouteTable.go +++ b/service/ec2/api_op_AssociateRouteTable.go @@ -76,6 +76,9 @@ func addOperationAssociateRouteTableMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationAssociateRouteTableMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateSubnetCidrBlock.go b/service/ec2/api_op_AssociateSubnetCidrBlock.go index 6b06a728366..3299aabe8b1 100644 --- a/service/ec2/api_op_AssociateSubnetCidrBlock.go +++ b/service/ec2/api_op_AssociateSubnetCidrBlock.go @@ -63,6 +63,9 @@ func addOperationAssociateSubnetCidrBlockMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAssociateSubnetCidrBlockMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go b/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go index b5f7f33d01c..aab740fc141 100644 --- a/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go @@ -69,6 +69,9 @@ func addOperationAssociateTransitGatewayMulticastDomainMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationAssociateTransitGatewayMulticastDomainMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateTransitGatewayRouteTable.go b/service/ec2/api_op_AssociateTransitGatewayRouteTable.go index 63feacb6b05..bdac483a336 100644 --- a/service/ec2/api_op_AssociateTransitGatewayRouteTable.go +++ b/service/ec2/api_op_AssociateTransitGatewayRouteTable.go @@ -65,6 +65,9 @@ func addOperationAssociateTransitGatewayRouteTableMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAssociateTransitGatewayRouteTableMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AssociateVpcCidrBlock.go b/service/ec2/api_op_AssociateVpcCidrBlock.go index 8bf080edfd5..7c958869ee5 100644 --- a/service/ec2/api_op_AssociateVpcCidrBlock.go +++ b/service/ec2/api_op_AssociateVpcCidrBlock.go @@ -90,6 +90,9 @@ func addOperationAssociateVpcCidrBlockMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationAssociateVpcCidrBlockMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AttachClassicLinkVpc.go b/service/ec2/api_op_AttachClassicLinkVpc.go index fafbeb63b58..363fa2f94a8 100644 --- a/service/ec2/api_op_AttachClassicLinkVpc.go +++ b/service/ec2/api_op_AttachClassicLinkVpc.go @@ -77,6 +77,9 @@ func addOperationAttachClassicLinkVpcMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAttachClassicLinkVpcMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AttachInternetGateway.go b/service/ec2/api_op_AttachInternetGateway.go index ef910bc16cd..d0342acf225 100644 --- a/service/ec2/api_op_AttachInternetGateway.go +++ b/service/ec2/api_op_AttachInternetGateway.go @@ -62,6 +62,9 @@ func addOperationAttachInternetGatewayMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAttachInternetGatewayMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AttachNetworkInterface.go b/service/ec2/api_op_AttachNetworkInterface.go index 9464438a8d4..31cd714c1e6 100644 --- a/service/ec2/api_op_AttachNetworkInterface.go +++ b/service/ec2/api_op_AttachNetworkInterface.go @@ -70,6 +70,9 @@ func addOperationAttachNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAttachNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AttachVolume.go b/service/ec2/api_op_AttachVolume.go index a23d16cf4dd..53fbcfcad2b 100644 --- a/service/ec2/api_op_AttachVolume.go +++ b/service/ec2/api_op_AttachVolume.go @@ -113,6 +113,9 @@ func addOperationAttachVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationAttachVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AttachVpnGateway.go b/service/ec2/api_op_AttachVpnGateway.go index 37d487052d5..6a3185226ae 100644 --- a/service/ec2/api_op_AttachVpnGateway.go +++ b/service/ec2/api_op_AttachVpnGateway.go @@ -69,6 +69,9 @@ func addOperationAttachVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAttachVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AuthorizeClientVpnIngress.go b/service/ec2/api_op_AuthorizeClientVpnIngress.go index 66a54d69c70..293e80d1114 100644 --- a/service/ec2/api_op_AuthorizeClientVpnIngress.go +++ b/service/ec2/api_op_AuthorizeClientVpnIngress.go @@ -87,6 +87,9 @@ func addOperationAuthorizeClientVpnIngressMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationAuthorizeClientVpnIngressMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AuthorizeSecurityGroupEgress.go b/service/ec2/api_op_AuthorizeSecurityGroupEgress.go index 5cacbe5f120..6a89026945b 100644 --- a/service/ec2/api_op_AuthorizeSecurityGroupEgress.go +++ b/service/ec2/api_op_AuthorizeSecurityGroupEgress.go @@ -90,6 +90,9 @@ func addOperationAuthorizeSecurityGroupEgressMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationAuthorizeSecurityGroupEgressMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_AuthorizeSecurityGroupIngress.go b/service/ec2/api_op_AuthorizeSecurityGroupIngress.go index 32f95d6d0eb..4219cb28d45 100644 --- a/service/ec2/api_op_AuthorizeSecurityGroupIngress.go +++ b/service/ec2/api_op_AuthorizeSecurityGroupIngress.go @@ -114,6 +114,9 @@ func addOperationAuthorizeSecurityGroupIngressMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationAuthorizeSecurityGroupIngressMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_BundleInstance.go b/service/ec2/api_op_BundleInstance.go index 63e0238c5db..6e6b42b1a5b 100644 --- a/service/ec2/api_op_BundleInstance.go +++ b/service/ec2/api_op_BundleInstance.go @@ -71,6 +71,9 @@ func addOperationBundleInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBundleInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelBundleTask.go b/service/ec2/api_op_CancelBundleTask.go index 5bec80ba1c0..27f3bdeab80 100644 --- a/service/ec2/api_op_CancelBundleTask.go +++ b/service/ec2/api_op_CancelBundleTask.go @@ -61,6 +61,9 @@ func addOperationCancelBundleTaskMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCancelBundleTaskMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelCapacityReservation.go b/service/ec2/api_op_CancelCapacityReservation.go index 6e6d2b94919..5a0842ba69d 100644 --- a/service/ec2/api_op_CancelCapacityReservation.go +++ b/service/ec2/api_op_CancelCapacityReservation.go @@ -64,6 +64,9 @@ func addOperationCancelCapacityReservationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCancelCapacityReservationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelConversionTask.go b/service/ec2/api_op_CancelConversionTask.go index c23f229d446..f7ce19671c1 100644 --- a/service/ec2/api_op_CancelConversionTask.go +++ b/service/ec2/api_op_CancelConversionTask.go @@ -63,6 +63,9 @@ func addOperationCancelConversionTaskMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCancelConversionTaskMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelExportTask.go b/service/ec2/api_op_CancelExportTask.go index 0f8dab679b1..56c80951074 100644 --- a/service/ec2/api_op_CancelExportTask.go +++ b/service/ec2/api_op_CancelExportTask.go @@ -51,6 +51,9 @@ func addOperationCancelExportTaskMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationCancelExportTaskMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelImportTask.go b/service/ec2/api_op_CancelImportTask.go index 43fd0b2ca0b..f9a5983a9af 100644 --- a/service/ec2/api_op_CancelImportTask.go +++ b/service/ec2/api_op_CancelImportTask.go @@ -65,6 +65,9 @@ func addOperationCancelImportTaskMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCancelImportTaskMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelReservedInstancesListing.go b/service/ec2/api_op_CancelReservedInstancesListing.go index 5b5372e1e0c..ecdef826560 100644 --- a/service/ec2/api_op_CancelReservedInstancesListing.go +++ b/service/ec2/api_op_CancelReservedInstancesListing.go @@ -58,6 +58,9 @@ func addOperationCancelReservedInstancesListingMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCancelReservedInstancesListingMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelSpotFleetRequests.go b/service/ec2/api_op_CancelSpotFleetRequests.go index a66cb9266c0..dd2ac414278 100644 --- a/service/ec2/api_op_CancelSpotFleetRequests.go +++ b/service/ec2/api_op_CancelSpotFleetRequests.go @@ -76,6 +76,9 @@ func addOperationCancelSpotFleetRequestsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCancelSpotFleetRequestsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CancelSpotInstanceRequests.go b/service/ec2/api_op_CancelSpotInstanceRequests.go index e38431cbf04..34f011da0f2 100644 --- a/service/ec2/api_op_CancelSpotInstanceRequests.go +++ b/service/ec2/api_op_CancelSpotInstanceRequests.go @@ -62,6 +62,9 @@ func addOperationCancelSpotInstanceRequestsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCancelSpotInstanceRequestsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ConfirmProductInstance.go b/service/ec2/api_op_ConfirmProductInstance.go index a26f1d52b38..b005bc2166c 100644 --- a/service/ec2/api_op_ConfirmProductInstance.go +++ b/service/ec2/api_op_ConfirmProductInstance.go @@ -70,6 +70,9 @@ func addOperationConfirmProductInstanceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationConfirmProductInstanceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CopyFpgaImage.go b/service/ec2/api_op_CopyFpgaImage.go index 5075256e9de..8bd33774456 100644 --- a/service/ec2/api_op_CopyFpgaImage.go +++ b/service/ec2/api_op_CopyFpgaImage.go @@ -74,6 +74,9 @@ func addOperationCopyFpgaImageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCopyFpgaImageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CopyImage.go b/service/ec2/api_op_CopyImage.go index abc7e6dc4ff..64148e45ab2 100644 --- a/service/ec2/api_op_CopyImage.go +++ b/service/ec2/api_op_CopyImage.go @@ -123,6 +123,9 @@ func addOperationCopyImageMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationCopyImageMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CopySnapshot.go b/service/ec2/api_op_CopySnapshot.go index 84f54a9dff6..6e39dda97ae 100644 --- a/service/ec2/api_op_CopySnapshot.go +++ b/service/ec2/api_op_CopySnapshot.go @@ -142,6 +142,9 @@ func addOperationCopySnapshotMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationCopySnapshotMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateCapacityReservation.go b/service/ec2/api_op_CreateCapacityReservation.go index df0de34388d..c175bf258ef 100644 --- a/service/ec2/api_op_CreateCapacityReservation.go +++ b/service/ec2/api_op_CreateCapacityReservation.go @@ -169,6 +169,9 @@ func addOperationCreateCapacityReservationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -211,6 +214,9 @@ func addOperationCreateCapacityReservationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateCarrierGateway.go b/service/ec2/api_op_CreateCarrierGateway.go index ac3386e1856..fde4f89c171 100644 --- a/service/ec2/api_op_CreateCarrierGateway.go +++ b/service/ec2/api_op_CreateCarrierGateway.go @@ -71,6 +71,9 @@ func addOperationCreateCarrierGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateCarrierGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateClientVpnEndpoint.go b/service/ec2/api_op_CreateClientVpnEndpoint.go index 105138a4488..bfff5549c91 100644 --- a/service/ec2/api_op_CreateClientVpnEndpoint.go +++ b/service/ec2/api_op_CreateClientVpnEndpoint.go @@ -144,6 +144,9 @@ func addOperationCreateClientVpnEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -189,6 +192,9 @@ func addOperationCreateClientVpnEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateClientVpnRoute.go b/service/ec2/api_op_CreateClientVpnRoute.go index 259c8c0847b..176fb571aba 100644 --- a/service/ec2/api_op_CreateClientVpnRoute.go +++ b/service/ec2/api_op_CreateClientVpnRoute.go @@ -95,6 +95,9 @@ func addOperationCreateClientVpnRouteMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateClientVpnRouteMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateCustomerGateway.go b/service/ec2/api_op_CreateCustomerGateway.go index 92f4bed51fc..067403dfb3c 100644 --- a/service/ec2/api_op_CreateCustomerGateway.go +++ b/service/ec2/api_op_CreateCustomerGateway.go @@ -107,6 +107,9 @@ func addOperationCreateCustomerGatewayMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationCreateCustomerGatewayMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateDefaultSubnet.go b/service/ec2/api_op_CreateDefaultSubnet.go index ab238a1f8e2..bc0e277a184 100644 --- a/service/ec2/api_op_CreateDefaultSubnet.go +++ b/service/ec2/api_op_CreateDefaultSubnet.go @@ -63,6 +63,9 @@ func addOperationCreateDefaultSubnetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateDefaultSubnetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateDefaultVpc.go b/service/ec2/api_op_CreateDefaultVpc.go index a89f425a2b6..ddb45b32858 100644 --- a/service/ec2/api_op_CreateDefaultVpc.go +++ b/service/ec2/api_op_CreateDefaultVpc.go @@ -65,6 +65,9 @@ func addOperationCreateDefaultVpcMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateDefaultVpcMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateDhcpOptions.go b/service/ec2/api_op_CreateDhcpOptions.go index ba90e8d7768..690107d9cf7 100644 --- a/service/ec2/api_op_CreateDhcpOptions.go +++ b/service/ec2/api_op_CreateDhcpOptions.go @@ -105,6 +105,9 @@ func addOperationCreateDhcpOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateDhcpOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateEgressOnlyInternetGateway.go b/service/ec2/api_op_CreateEgressOnlyInternetGateway.go index 88542854c25..889bcac0cfc 100644 --- a/service/ec2/api_op_CreateEgressOnlyInternetGateway.go +++ b/service/ec2/api_op_CreateEgressOnlyInternetGateway.go @@ -74,6 +74,9 @@ func addOperationCreateEgressOnlyInternetGatewayMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateEgressOnlyInternetGatewayMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateFleet.go b/service/ec2/api_op_CreateFleet.go index 6e585b3bc30..391ac05a91e 100644 --- a/service/ec2/api_op_CreateFleet.go +++ b/service/ec2/api_op_CreateFleet.go @@ -129,6 +129,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateFlowLogs.go b/service/ec2/api_op_CreateFlowLogs.go index a3934e2c978..7536f649a69 100644 --- a/service/ec2/api_op_CreateFlowLogs.go +++ b/service/ec2/api_op_CreateFlowLogs.go @@ -151,6 +151,9 @@ func addOperationCreateFlowLogsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -193,6 +196,9 @@ func addOperationCreateFlowLogsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateFpgaImage.go b/service/ec2/api_op_CreateFpgaImage.go index ab6c6200ed5..abbaecdf415 100644 --- a/service/ec2/api_op_CreateFpgaImage.go +++ b/service/ec2/api_op_CreateFpgaImage.go @@ -85,6 +85,9 @@ func addOperationCreateFpgaImageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateFpgaImageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateImage.go b/service/ec2/api_op_CreateImage.go index b7912755a9f..acdddf6a942 100644 --- a/service/ec2/api_op_CreateImage.go +++ b/service/ec2/api_op_CreateImage.go @@ -88,6 +88,9 @@ func addOperationCreateImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateInstanceExportTask.go b/service/ec2/api_op_CreateInstanceExportTask.go index 11dd2c4d1e3..6a322ca6329 100644 --- a/service/ec2/api_op_CreateInstanceExportTask.go +++ b/service/ec2/api_op_CreateInstanceExportTask.go @@ -71,6 +71,9 @@ func addOperationCreateInstanceExportTaskMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateInstanceExportTaskMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateInternetGateway.go b/service/ec2/api_op_CreateInternetGateway.go index 695e5c81520..06c99834eec 100644 --- a/service/ec2/api_op_CreateInternetGateway.go +++ b/service/ec2/api_op_CreateInternetGateway.go @@ -60,6 +60,9 @@ func addOperationCreateInternetGatewayMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateInternetGatewayMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateKeyPair.go b/service/ec2/api_op_CreateKeyPair.go index dffd795087f..0e1955d3c4e 100644 --- a/service/ec2/api_op_CreateKeyPair.go +++ b/service/ec2/api_op_CreateKeyPair.go @@ -84,6 +84,9 @@ func addOperationCreateKeyPairMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateKeyPairMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateLaunchTemplate.go b/service/ec2/api_op_CreateLaunchTemplate.go index 273c203931c..de7ceadac5f 100644 --- a/service/ec2/api_op_CreateLaunchTemplate.go +++ b/service/ec2/api_op_CreateLaunchTemplate.go @@ -86,6 +86,9 @@ func addOperationCreateLaunchTemplateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateLaunchTemplateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateLaunchTemplateVersion.go b/service/ec2/api_op_CreateLaunchTemplateVersion.go index f210df60fe6..bccc6c05d11 100644 --- a/service/ec2/api_op_CreateLaunchTemplateVersion.go +++ b/service/ec2/api_op_CreateLaunchTemplateVersion.go @@ -94,6 +94,9 @@ func addOperationCreateLaunchTemplateVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateLaunchTemplateVersionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateLocalGatewayRoute.go b/service/ec2/api_op_CreateLocalGatewayRoute.go index b68dfa19f37..96c0c8b3a4f 100644 --- a/service/ec2/api_op_CreateLocalGatewayRoute.go +++ b/service/ec2/api_op_CreateLocalGatewayRoute.go @@ -70,6 +70,9 @@ func addOperationCreateLocalGatewayRouteMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateLocalGatewayRouteMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go b/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go index 71da191b64d..0d89aee639f 100644 --- a/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go +++ b/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go @@ -67,6 +67,9 @@ func addOperationCreateLocalGatewayRouteTableVpcAssociationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateLocalGatewayRouteTableVpcAssociationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateManagedPrefixList.go b/service/ec2/api_op_CreateManagedPrefixList.go index 7cc0c66042d..ab4fcf60799 100644 --- a/service/ec2/api_op_CreateManagedPrefixList.go +++ b/service/ec2/api_op_CreateManagedPrefixList.go @@ -86,6 +86,9 @@ func addOperationCreateManagedPrefixListMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateManagedPrefixListMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateNatGateway.go b/service/ec2/api_op_CreateNatGateway.go index 9480407aa04..77ebbd52299 100644 --- a/service/ec2/api_op_CreateNatGateway.go +++ b/service/ec2/api_op_CreateNatGateway.go @@ -86,6 +86,9 @@ func addOperationCreateNatGatewayMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateNatGatewayMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateNetworkAcl.go b/service/ec2/api_op_CreateNetworkAcl.go index c1393944fc0..2675ea08bd7 100644 --- a/service/ec2/api_op_CreateNetworkAcl.go +++ b/service/ec2/api_op_CreateNetworkAcl.go @@ -66,6 +66,9 @@ func addOperationCreateNetworkAclMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateNetworkAclMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateNetworkAclEntry.go b/service/ec2/api_op_CreateNetworkAclEntry.go index cb0ab13531c..4b592a010d2 100644 --- a/service/ec2/api_op_CreateNetworkAclEntry.go +++ b/service/ec2/api_op_CreateNetworkAclEntry.go @@ -114,6 +114,9 @@ func addOperationCreateNetworkAclEntryMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationCreateNetworkAclEntryMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateNetworkInterface.go b/service/ec2/api_op_CreateNetworkInterface.go index 91c4fccb38d..eee6cd27bdc 100644 --- a/service/ec2/api_op_CreateNetworkInterface.go +++ b/service/ec2/api_op_CreateNetworkInterface.go @@ -111,6 +111,9 @@ func addOperationCreateNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationCreateNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateNetworkInterfacePermission.go b/service/ec2/api_op_CreateNetworkInterfacePermission.go index 8b7695cce84..9cceddf735b 100644 --- a/service/ec2/api_op_CreateNetworkInterfacePermission.go +++ b/service/ec2/api_op_CreateNetworkInterfacePermission.go @@ -74,6 +74,9 @@ func addOperationCreateNetworkInterfacePermissionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateNetworkInterfacePermissionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreatePlacementGroup.go b/service/ec2/api_op_CreatePlacementGroup.go index a91f458229d..129d3cad100 100644 --- a/service/ec2/api_op_CreatePlacementGroup.go +++ b/service/ec2/api_op_CreatePlacementGroup.go @@ -76,6 +76,9 @@ func addOperationCreatePlacementGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreatePlacementGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateReservedInstancesListing.go b/service/ec2/api_op_CreateReservedInstancesListing.go index 4cd18eed10f..b975204ecd0 100644 --- a/service/ec2/api_op_CreateReservedInstancesListing.go +++ b/service/ec2/api_op_CreateReservedInstancesListing.go @@ -95,6 +95,9 @@ func addOperationCreateReservedInstancesListingMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateReservedInstancesListingMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateRoute.go b/service/ec2/api_op_CreateRoute.go index 1780bce85d2..0866fecf4b0 100644 --- a/service/ec2/api_op_CreateRoute.go +++ b/service/ec2/api_op_CreateRoute.go @@ -118,6 +118,9 @@ func addOperationCreateRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateRouteTable.go b/service/ec2/api_op_CreateRouteTable.go index 141ec096b53..2b0f6423000 100644 --- a/service/ec2/api_op_CreateRouteTable.go +++ b/service/ec2/api_op_CreateRouteTable.go @@ -66,6 +66,9 @@ func addOperationCreateRouteTableMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateRouteTableMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateSecurityGroup.go b/service/ec2/api_op_CreateSecurityGroup.go index 82b952e5896..8c336c3fedf 100644 --- a/service/ec2/api_op_CreateSecurityGroup.go +++ b/service/ec2/api_op_CreateSecurityGroup.go @@ -97,6 +97,9 @@ func addOperationCreateSecurityGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateSecurityGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateSnapshot.go b/service/ec2/api_op_CreateSnapshot.go index 49eb56e8349..01bff22e41b 100644 --- a/service/ec2/api_op_CreateSnapshot.go +++ b/service/ec2/api_op_CreateSnapshot.go @@ -148,6 +148,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateSnapshots.go b/service/ec2/api_op_CreateSnapshots.go index 8b97983c53b..8933ffc8d70 100644 --- a/service/ec2/api_op_CreateSnapshots.go +++ b/service/ec2/api_op_CreateSnapshots.go @@ -71,6 +71,9 @@ func addOperationCreateSnapshotsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateSnapshotsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateSpotDatafeedSubscription.go b/service/ec2/api_op_CreateSpotDatafeedSubscription.go index 4059d089897..21b95988ec6 100644 --- a/service/ec2/api_op_CreateSpotDatafeedSubscription.go +++ b/service/ec2/api_op_CreateSpotDatafeedSubscription.go @@ -71,6 +71,9 @@ func addOperationCreateSpotDatafeedSubscriptionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateSpotDatafeedSubscriptionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateSubnet.go b/service/ec2/api_op_CreateSubnet.go index 5fbfba392c5..47ce075320d 100644 --- a/service/ec2/api_op_CreateSubnet.go +++ b/service/ec2/api_op_CreateSubnet.go @@ -105,6 +105,9 @@ func addOperationCreateSubnetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateSubnetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTags.go b/service/ec2/api_op_CreateTags.go index 8287d30d7db..4f9c2d9680b 100644 --- a/service/ec2/api_op_CreateTags.go +++ b/service/ec2/api_op_CreateTags.go @@ -73,6 +73,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTrafficMirrorFilter.go b/service/ec2/api_op_CreateTrafficMirrorFilter.go index 9fa56188f7f..e096cf0aada 100644 --- a/service/ec2/api_op_CreateTrafficMirrorFilter.go +++ b/service/ec2/api_op_CreateTrafficMirrorFilter.go @@ -78,6 +78,9 @@ func addOperationCreateTrafficMirrorFilterMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateTrafficMirrorFilterMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTrafficMirrorFilterRule.go b/service/ec2/api_op_CreateTrafficMirrorFilterRule.go index f0098cb3174..1808713d95d 100644 --- a/service/ec2/api_op_CreateTrafficMirrorFilterRule.go +++ b/service/ec2/api_op_CreateTrafficMirrorFilterRule.go @@ -114,6 +114,9 @@ func addOperationCreateTrafficMirrorFilterRuleMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationCreateTrafficMirrorFilterRuleMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTrafficMirrorSession.go b/service/ec2/api_op_CreateTrafficMirrorSession.go index 7278631e942..0c11620c234 100644 --- a/service/ec2/api_op_CreateTrafficMirrorSession.go +++ b/service/ec2/api_op_CreateTrafficMirrorSession.go @@ -115,6 +115,9 @@ func addOperationCreateTrafficMirrorSessionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateTrafficMirrorSessionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTrafficMirrorTarget.go b/service/ec2/api_op_CreateTrafficMirrorTarget.go index 0690838bfb3..8c469b38724 100644 --- a/service/ec2/api_op_CreateTrafficMirrorTarget.go +++ b/service/ec2/api_op_CreateTrafficMirrorTarget.go @@ -84,6 +84,9 @@ func addOperationCreateTrafficMirrorTargetMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateTrafficMirrorTargetMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGateway.go b/service/ec2/api_op_CreateTransitGateway.go index 92607caec17..47abc12d4a7 100644 --- a/service/ec2/api_op_CreateTransitGateway.go +++ b/service/ec2/api_op_CreateTransitGateway.go @@ -78,6 +78,9 @@ func addOperationCreateTransitGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateTransitGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go b/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go index 0e6b69c15ae..f96628b6eff 100644 --- a/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go @@ -66,6 +66,9 @@ func addOperationCreateTransitGatewayMulticastDomainMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateTransitGatewayMulticastDomainMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go b/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go index 0c6f435627a..e306167892d 100644 --- a/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go @@ -81,6 +81,9 @@ func addOperationCreateTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGatewayPrefixListReference.go b/service/ec2/api_op_CreateTransitGatewayPrefixListReference.go index ee5dea56789..eaeb43cfee0 100644 --- a/service/ec2/api_op_CreateTransitGatewayPrefixListReference.go +++ b/service/ec2/api_op_CreateTransitGatewayPrefixListReference.go @@ -71,6 +71,9 @@ func addOperationCreateTransitGatewayPrefixListReferenceMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateTransitGatewayPrefixListReferenceMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGatewayRoute.go b/service/ec2/api_op_CreateTransitGatewayRoute.go index 743682ccee8..e408a40359d 100644 --- a/service/ec2/api_op_CreateTransitGatewayRoute.go +++ b/service/ec2/api_op_CreateTransitGatewayRoute.go @@ -71,6 +71,9 @@ func addOperationCreateTransitGatewayRouteMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateTransitGatewayRouteMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGatewayRouteTable.go b/service/ec2/api_op_CreateTransitGatewayRouteTable.go index 074e3b87fc2..829b5e47a6a 100644 --- a/service/ec2/api_op_CreateTransitGatewayRouteTable.go +++ b/service/ec2/api_op_CreateTransitGatewayRouteTable.go @@ -62,6 +62,9 @@ func addOperationCreateTransitGatewayRouteTableMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateTransitGatewayRouteTableMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go b/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go index 61f14ba63c8..84dc3ce0a4f 100644 --- a/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go @@ -82,6 +82,9 @@ func addOperationCreateTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVolume.go b/service/ec2/api_op_CreateVolume.go index 96d89321bfc..c86c67ae8b8 100644 --- a/service/ec2/api_op_CreateVolume.go +++ b/service/ec2/api_op_CreateVolume.go @@ -214,6 +214,9 @@ func addOperationCreateVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -256,6 +259,9 @@ func addOperationCreateVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpc.go b/service/ec2/api_op_CreateVpc.go index 02b11e4a6f9..1fa63aa7f59 100644 --- a/service/ec2/api_op_CreateVpc.go +++ b/service/ec2/api_op_CreateVpc.go @@ -109,6 +109,9 @@ func addOperationCreateVpcMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateVpcMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpcEndpoint.go b/service/ec2/api_op_CreateVpcEndpoint.go index 024260ddead..17c4ece82f1 100644 --- a/service/ec2/api_op_CreateVpcEndpoint.go +++ b/service/ec2/api_op_CreateVpcEndpoint.go @@ -123,6 +123,9 @@ func addOperationCreateVpcEndpointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationCreateVpcEndpointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go b/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go index d84bd346f01..fd5197994e5 100644 --- a/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go +++ b/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go @@ -85,6 +85,9 @@ func addOperationCreateVpcEndpointConnectionNotificationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateVpcEndpointConnectionNotificationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go b/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go index 074312ab472..c2134383116 100644 --- a/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go +++ b/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go @@ -89,6 +89,9 @@ func addOperationCreateVpcEndpointServiceConfigurationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateVpcEndpointServiceConfigurationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpcPeeringConnection.go b/service/ec2/api_op_CreateVpcPeeringConnection.go index 323ad9e717d..18af99f95bc 100644 --- a/service/ec2/api_op_CreateVpcPeeringConnection.go +++ b/service/ec2/api_op_CreateVpcPeeringConnection.go @@ -84,6 +84,9 @@ func addOperationCreateVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpnConnection.go b/service/ec2/api_op_CreateVpnConnection.go index b3c40ae6ccf..bb4f774b746 100644 --- a/service/ec2/api_op_CreateVpnConnection.go +++ b/service/ec2/api_op_CreateVpnConnection.go @@ -92,6 +92,9 @@ func addOperationCreateVpnConnectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreateVpnConnectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpnConnectionRoute.go b/service/ec2/api_op_CreateVpnConnectionRoute.go index 28464406649..f0f3d4c2b7d 100644 --- a/service/ec2/api_op_CreateVpnConnectionRoute.go +++ b/service/ec2/api_op_CreateVpnConnectionRoute.go @@ -59,6 +59,9 @@ func addOperationCreateVpnConnectionRouteMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationCreateVpnConnectionRouteMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_CreateVpnGateway.go b/service/ec2/api_op_CreateVpnGateway.go index fb9e0a73ef6..a4f8cdb4084 100644 --- a/service/ec2/api_op_CreateVpnGateway.go +++ b/service/ec2/api_op_CreateVpnGateway.go @@ -77,6 +77,9 @@ func addOperationCreateVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteCarrierGateway.go b/service/ec2/api_op_DeleteCarrierGateway.go index ed75bc8592a..bd5089e78e9 100644 --- a/service/ec2/api_op_DeleteCarrierGateway.go +++ b/service/ec2/api_op_DeleteCarrierGateway.go @@ -62,6 +62,9 @@ func addOperationDeleteCarrierGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteCarrierGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteClientVpnEndpoint.go b/service/ec2/api_op_DeleteClientVpnEndpoint.go index d28d912414e..5744ddffe2d 100644 --- a/service/ec2/api_op_DeleteClientVpnEndpoint.go +++ b/service/ec2/api_op_DeleteClientVpnEndpoint.go @@ -60,6 +60,9 @@ func addOperationDeleteClientVpnEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteClientVpnEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteClientVpnRoute.go b/service/ec2/api_op_DeleteClientVpnRoute.go index 71cbeca0acd..7f4f1daceb5 100644 --- a/service/ec2/api_op_DeleteClientVpnRoute.go +++ b/service/ec2/api_op_DeleteClientVpnRoute.go @@ -71,6 +71,9 @@ func addOperationDeleteClientVpnRouteMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteClientVpnRouteMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteCustomerGateway.go b/service/ec2/api_op_DeleteCustomerGateway.go index c8ec6940ba0..3858eb36b3a 100644 --- a/service/ec2/api_op_DeleteCustomerGateway.go +++ b/service/ec2/api_op_DeleteCustomerGateway.go @@ -56,6 +56,9 @@ func addOperationDeleteCustomerGatewayMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteCustomerGatewayMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteDhcpOptions.go b/service/ec2/api_op_DeleteDhcpOptions.go index f896944f81c..1dfaef27e28 100644 --- a/service/ec2/api_op_DeleteDhcpOptions.go +++ b/service/ec2/api_op_DeleteDhcpOptions.go @@ -57,6 +57,9 @@ func addOperationDeleteDhcpOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDhcpOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go b/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go index 2bad134b9ae..84c564e503b 100644 --- a/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go +++ b/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go @@ -58,6 +58,9 @@ func addOperationDeleteEgressOnlyInternetGatewayMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteEgressOnlyInternetGatewayMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteFleets.go b/service/ec2/api_op_DeleteFleets.go index 2b0ddcab65b..51424e17f67 100644 --- a/service/ec2/api_op_DeleteFleets.go +++ b/service/ec2/api_op_DeleteFleets.go @@ -73,6 +73,9 @@ func addOperationDeleteFleetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteFleetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteFlowLogs.go b/service/ec2/api_op_DeleteFlowLogs.go index 6462e1294c0..9e1cdb15b18 100644 --- a/service/ec2/api_op_DeleteFlowLogs.go +++ b/service/ec2/api_op_DeleteFlowLogs.go @@ -59,6 +59,9 @@ func addOperationDeleteFlowLogsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteFlowLogsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteFpgaImage.go b/service/ec2/api_op_DeleteFpgaImage.go index 9960922891e..f9e216ef3c6 100644 --- a/service/ec2/api_op_DeleteFpgaImage.go +++ b/service/ec2/api_op_DeleteFpgaImage.go @@ -58,6 +58,9 @@ func addOperationDeleteFpgaImageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteFpgaImageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteInternetGateway.go b/service/ec2/api_op_DeleteInternetGateway.go index 61c52d5dab2..b1a15b18fd9 100644 --- a/service/ec2/api_op_DeleteInternetGateway.go +++ b/service/ec2/api_op_DeleteInternetGateway.go @@ -55,6 +55,9 @@ func addOperationDeleteInternetGatewayMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteInternetGatewayMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteKeyPair.go b/service/ec2/api_op_DeleteKeyPair.go index b7658ebb64b..ecafe9cfdb6 100644 --- a/service/ec2/api_op_DeleteKeyPair.go +++ b/service/ec2/api_op_DeleteKeyPair.go @@ -55,6 +55,9 @@ func addOperationDeleteKeyPairMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteKeyPairMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteLaunchTemplate.go b/service/ec2/api_op_DeleteLaunchTemplate.go index 8da8426108a..f6d2dc1a2c2 100644 --- a/service/ec2/api_op_DeleteLaunchTemplate.go +++ b/service/ec2/api_op_DeleteLaunchTemplate.go @@ -63,6 +63,9 @@ func addOperationDeleteLaunchTemplateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteLaunchTemplateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteLaunchTemplateVersions.go b/service/ec2/api_op_DeleteLaunchTemplateVersions.go index 3531ef26c67..9ff4ea123aa 100644 --- a/service/ec2/api_op_DeleteLaunchTemplateVersions.go +++ b/service/ec2/api_op_DeleteLaunchTemplateVersions.go @@ -73,6 +73,9 @@ func addOperationDeleteLaunchTemplateVersionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteLaunchTemplateVersionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteLocalGatewayRoute.go b/service/ec2/api_op_DeleteLocalGatewayRoute.go index 9467d96ba57..6dd17db61b7 100644 --- a/service/ec2/api_op_DeleteLocalGatewayRoute.go +++ b/service/ec2/api_op_DeleteLocalGatewayRoute.go @@ -64,6 +64,9 @@ func addOperationDeleteLocalGatewayRouteMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteLocalGatewayRouteMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go b/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go index 8a27aeb6375..a77ca358a03 100644 --- a/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go +++ b/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go @@ -59,6 +59,9 @@ func addOperationDeleteLocalGatewayRouteTableVpcAssociationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteLocalGatewayRouteTableVpcAssociationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteManagedPrefixList.go b/service/ec2/api_op_DeleteManagedPrefixList.go index 41a0bd5d358..25c6039432b 100644 --- a/service/ec2/api_op_DeleteManagedPrefixList.go +++ b/service/ec2/api_op_DeleteManagedPrefixList.go @@ -60,6 +60,9 @@ func addOperationDeleteManagedPrefixListMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteManagedPrefixListMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteNatGateway.go b/service/ec2/api_op_DeleteNatGateway.go index 085552da562..1f4d0677940 100644 --- a/service/ec2/api_op_DeleteNatGateway.go +++ b/service/ec2/api_op_DeleteNatGateway.go @@ -60,6 +60,9 @@ func addOperationDeleteNatGatewayMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteNatGatewayMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteNetworkAcl.go b/service/ec2/api_op_DeleteNetworkAcl.go index 02b15be1a13..0e4c664ceea 100644 --- a/service/ec2/api_op_DeleteNetworkAcl.go +++ b/service/ec2/api_op_DeleteNetworkAcl.go @@ -55,6 +55,9 @@ func addOperationDeleteNetworkAclMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteNetworkAclMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteNetworkAclEntry.go b/service/ec2/api_op_DeleteNetworkAclEntry.go index bff8dd7f7d0..264c0fd60cf 100644 --- a/service/ec2/api_op_DeleteNetworkAclEntry.go +++ b/service/ec2/api_op_DeleteNetworkAclEntry.go @@ -65,6 +65,9 @@ func addOperationDeleteNetworkAclEntryMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteNetworkAclEntryMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteNetworkInterface.go b/service/ec2/api_op_DeleteNetworkInterface.go index 149bff1fa4a..8263d536694 100644 --- a/service/ec2/api_op_DeleteNetworkInterface.go +++ b/service/ec2/api_op_DeleteNetworkInterface.go @@ -56,6 +56,9 @@ func addOperationDeleteNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteNetworkInterfacePermission.go b/service/ec2/api_op_DeleteNetworkInterfacePermission.go index 038c5d185cf..c80c850f89e 100644 --- a/service/ec2/api_op_DeleteNetworkInterfacePermission.go +++ b/service/ec2/api_op_DeleteNetworkInterfacePermission.go @@ -67,6 +67,9 @@ func addOperationDeleteNetworkInterfacePermissionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteNetworkInterfacePermissionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeletePlacementGroup.go b/service/ec2/api_op_DeletePlacementGroup.go index 520a07d006b..f281ab4715c 100644 --- a/service/ec2/api_op_DeletePlacementGroup.go +++ b/service/ec2/api_op_DeletePlacementGroup.go @@ -58,6 +58,9 @@ func addOperationDeletePlacementGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeletePlacementGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteQueuedReservedInstances.go b/service/ec2/api_op_DeleteQueuedReservedInstances.go index 6e818448088..f27b5cfbdee 100644 --- a/service/ec2/api_op_DeleteQueuedReservedInstances.go +++ b/service/ec2/api_op_DeleteQueuedReservedInstances.go @@ -62,6 +62,9 @@ func addOperationDeleteQueuedReservedInstancesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteQueuedReservedInstancesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteRoute.go b/service/ec2/api_op_DeleteRoute.go index 376b03d63b0..5c75c7f4e38 100644 --- a/service/ec2/api_op_DeleteRoute.go +++ b/service/ec2/api_op_DeleteRoute.go @@ -65,6 +65,9 @@ func addOperationDeleteRouteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteRouteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteRouteTable.go b/service/ec2/api_op_DeleteRouteTable.go index 4f2f6d6c1a6..5a7bffd6ae7 100644 --- a/service/ec2/api_op_DeleteRouteTable.go +++ b/service/ec2/api_op_DeleteRouteTable.go @@ -55,6 +55,9 @@ func addOperationDeleteRouteTableMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteRouteTableMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteSecurityGroup.go b/service/ec2/api_op_DeleteSecurityGroup.go index 7bb4bb16790..ae53129298b 100644 --- a/service/ec2/api_op_DeleteSecurityGroup.go +++ b/service/ec2/api_op_DeleteSecurityGroup.go @@ -59,6 +59,9 @@ func addOperationDeleteSecurityGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteSecurityGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteSnapshot.go b/service/ec2/api_op_DeleteSnapshot.go index 20edbc49d1b..bddf1a8b3f4 100644 --- a/service/ec2/api_op_DeleteSnapshot.go +++ b/service/ec2/api_op_DeleteSnapshot.go @@ -64,6 +64,9 @@ func addOperationDeleteSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteSpotDatafeedSubscription.go b/service/ec2/api_op_DeleteSpotDatafeedSubscription.go index ae500171636..08288a6616a 100644 --- a/service/ec2/api_op_DeleteSpotDatafeedSubscription.go +++ b/service/ec2/api_op_DeleteSpotDatafeedSubscription.go @@ -50,6 +50,9 @@ func addOperationDeleteSpotDatafeedSubscriptionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDeleteSpotDatafeedSubscriptionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteSubnet.go b/service/ec2/api_op_DeleteSubnet.go index 647530241e6..4afe670f9dd 100644 --- a/service/ec2/api_op_DeleteSubnet.go +++ b/service/ec2/api_op_DeleteSubnet.go @@ -55,6 +55,9 @@ func addOperationDeleteSubnetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteSubnetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTags.go b/service/ec2/api_op_DeleteTags.go index fa41508fd54..5254ab2bed4 100644 --- a/service/ec2/api_op_DeleteTags.go +++ b/service/ec2/api_op_DeleteTags.go @@ -68,6 +68,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTrafficMirrorFilter.go b/service/ec2/api_op_DeleteTrafficMirrorFilter.go index da420ca43a0..43bd5fbd445 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorFilter.go +++ b/service/ec2/api_op_DeleteTrafficMirrorFilter.go @@ -59,6 +59,9 @@ func addOperationDeleteTrafficMirrorFilterMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTrafficMirrorFilterMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go b/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go index 384ca71743a..25e19ed6bb7 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go +++ b/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go @@ -58,6 +58,9 @@ func addOperationDeleteTrafficMirrorFilterRuleMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteTrafficMirrorFilterRuleMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTrafficMirrorSession.go b/service/ec2/api_op_DeleteTrafficMirrorSession.go index ccba6e505f5..bcd9b7ee3f9 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorSession.go +++ b/service/ec2/api_op_DeleteTrafficMirrorSession.go @@ -58,6 +58,9 @@ func addOperationDeleteTrafficMirrorSessionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteTrafficMirrorSessionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTrafficMirrorTarget.go b/service/ec2/api_op_DeleteTrafficMirrorTarget.go index da2003a9126..a1a7bae29bb 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorTarget.go +++ b/service/ec2/api_op_DeleteTrafficMirrorTarget.go @@ -59,6 +59,9 @@ func addOperationDeleteTrafficMirrorTargetMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTrafficMirrorTargetMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGateway.go b/service/ec2/api_op_DeleteTransitGateway.go index 7d8439ef55a..ce132666fae 100644 --- a/service/ec2/api_op_DeleteTransitGateway.go +++ b/service/ec2/api_op_DeleteTransitGateway.go @@ -59,6 +59,9 @@ func addOperationDeleteTransitGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTransitGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go b/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go index 59bf8863aee..9ca4e6e62b4 100644 --- a/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go @@ -59,6 +59,9 @@ func addOperationDeleteTransitGatewayMulticastDomainMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTransitGatewayMulticastDomainMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go b/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go index 41a61f195b6..8c80d880d9a 100644 --- a/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go @@ -59,6 +59,9 @@ func addOperationDeleteTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGatewayPrefixListReference.go b/service/ec2/api_op_DeleteTransitGatewayPrefixListReference.go index e33d14eb3fe..a0797f2b87c 100644 --- a/service/ec2/api_op_DeleteTransitGatewayPrefixListReference.go +++ b/service/ec2/api_op_DeleteTransitGatewayPrefixListReference.go @@ -65,6 +65,9 @@ func addOperationDeleteTransitGatewayPrefixListReferenceMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteTransitGatewayPrefixListReferenceMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGatewayRoute.go b/service/ec2/api_op_DeleteTransitGatewayRoute.go index 9338a826fec..6a296727c75 100644 --- a/service/ec2/api_op_DeleteTransitGatewayRoute.go +++ b/service/ec2/api_op_DeleteTransitGatewayRoute.go @@ -64,6 +64,9 @@ func addOperationDeleteTransitGatewayRouteMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteTransitGatewayRouteMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGatewayRouteTable.go b/service/ec2/api_op_DeleteTransitGatewayRouteTable.go index 01641c50db8..869b4e4d69b 100644 --- a/service/ec2/api_op_DeleteTransitGatewayRouteTable.go +++ b/service/ec2/api_op_DeleteTransitGatewayRouteTable.go @@ -60,6 +60,9 @@ func addOperationDeleteTransitGatewayRouteTableMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteTransitGatewayRouteTableMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go b/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go index ecb53b1b3f4..dbcf8288b67 100644 --- a/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go @@ -59,6 +59,9 @@ func addOperationDeleteTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVolume.go b/service/ec2/api_op_DeleteVolume.go index 336ff1d5823..dc05f448ff2 100644 --- a/service/ec2/api_op_DeleteVolume.go +++ b/service/ec2/api_op_DeleteVolume.go @@ -58,6 +58,9 @@ func addOperationDeleteVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpc.go b/service/ec2/api_op_DeleteVpc.go index 8e4ca89ca83..969d9d2ac6a 100644 --- a/service/ec2/api_op_DeleteVpc.go +++ b/service/ec2/api_op_DeleteVpc.go @@ -58,6 +58,9 @@ func addOperationDeleteVpcMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteVpcMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go b/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go index eb5c35aa012..bd1e08564e1 100644 --- a/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go +++ b/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go @@ -59,6 +59,9 @@ func addOperationDeleteVpcEndpointConnectionNotificationsMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteVpcEndpointConnectionNotificationsMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go b/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go index 988aad04843..f39e153f5e2 100644 --- a/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go +++ b/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go @@ -63,6 +63,9 @@ func addOperationDeleteVpcEndpointServiceConfigurationsMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteVpcEndpointServiceConfigurationsMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpcEndpoints.go b/service/ec2/api_op_DeleteVpcEndpoints.go index e2f05c9ba8b..20cc2a2d9c6 100644 --- a/service/ec2/api_op_DeleteVpcEndpoints.go +++ b/service/ec2/api_op_DeleteVpcEndpoints.go @@ -64,6 +64,9 @@ func addOperationDeleteVpcEndpointsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteVpcEndpointsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpcPeeringConnection.go b/service/ec2/api_op_DeleteVpcPeeringConnection.go index 122f679a501..3440c70f676 100644 --- a/service/ec2/api_op_DeleteVpcPeeringConnection.go +++ b/service/ec2/api_op_DeleteVpcPeeringConnection.go @@ -62,6 +62,9 @@ func addOperationDeleteVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpnConnection.go b/service/ec2/api_op_DeleteVpnConnection.go index 10a55794204..b22beb9bafc 100644 --- a/service/ec2/api_op_DeleteVpnConnection.go +++ b/service/ec2/api_op_DeleteVpnConnection.go @@ -65,6 +65,9 @@ func addOperationDeleteVpnConnectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteVpnConnectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpnConnectionRoute.go b/service/ec2/api_op_DeleteVpnConnectionRoute.go index 269900654a4..d740ca356f0 100644 --- a/service/ec2/api_op_DeleteVpnConnectionRoute.go +++ b/service/ec2/api_op_DeleteVpnConnectionRoute.go @@ -57,6 +57,9 @@ func addOperationDeleteVpnConnectionRouteMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteVpnConnectionRouteMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeleteVpnGateway.go b/service/ec2/api_op_DeleteVpnGateway.go index e08c93cf6c5..792c1e7de46 100644 --- a/service/ec2/api_op_DeleteVpnGateway.go +++ b/service/ec2/api_op_DeleteVpnGateway.go @@ -58,6 +58,9 @@ func addOperationDeleteVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeprovisionByoipCidr.go b/service/ec2/api_op_DeprovisionByoipCidr.go index cdb50197440..c7711ef64c8 100644 --- a/service/ec2/api_op_DeprovisionByoipCidr.go +++ b/service/ec2/api_op_DeprovisionByoipCidr.go @@ -64,6 +64,9 @@ func addOperationDeprovisionByoipCidrMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeprovisionByoipCidrMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeregisterImage.go b/service/ec2/api_op_DeregisterImage.go index f5d7c081be6..a3ed05d7002 100644 --- a/service/ec2/api_op_DeregisterImage.go +++ b/service/ec2/api_op_DeregisterImage.go @@ -62,6 +62,9 @@ func addOperationDeregisterImageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeregisterImageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go b/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go index 0595ccd3378..2f04180622d 100644 --- a/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go +++ b/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go @@ -58,6 +58,9 @@ func addOperationDeregisterInstanceEventNotificationAttributesMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeregisterInstanceEventNotificationAttributesMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go index c0fadd77db4..a071e414ef7 100644 --- a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go +++ b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go @@ -64,6 +64,9 @@ func addOperationDeregisterTransitGatewayMulticastGroupMembersMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeregisterTransitGatewayMulticastGroupMembersMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go index c1eaff38097..b5dc06f93fc 100644 --- a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go +++ b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go @@ -64,6 +64,9 @@ func addOperationDeregisterTransitGatewayMulticastGroupSourcesMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeregisterTransitGatewayMulticastGroupSourcesMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeAccountAttributes.go b/service/ec2/api_op_DescribeAccountAttributes.go index 2d10410f368..b305433024b 100644 --- a/service/ec2/api_op_DescribeAccountAttributes.go +++ b/service/ec2/api_op_DescribeAccountAttributes.go @@ -82,6 +82,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeAddresses.go b/service/ec2/api_op_DescribeAddresses.go index 987bf4465e3..e462004966f 100644 --- a/service/ec2/api_op_DescribeAddresses.go +++ b/service/ec2/api_op_DescribeAddresses.go @@ -106,6 +106,9 @@ func addOperationDescribeAddressesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeAddressesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeAggregateIdFormat.go b/service/ec2/api_op_DescribeAggregateIdFormat.go index e32cf52ac4c..ae1986fcf13 100644 --- a/service/ec2/api_op_DescribeAggregateIdFormat.go +++ b/service/ec2/api_op_DescribeAggregateIdFormat.go @@ -70,6 +70,9 @@ func addOperationDescribeAggregateIdFormatMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeAggregateIdFormatMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeAvailabilityZones.go b/service/ec2/api_op_DescribeAvailabilityZones.go index 19612eeebd7..8e658643d35 100644 --- a/service/ec2/api_op_DescribeAvailabilityZones.go +++ b/service/ec2/api_op_DescribeAvailabilityZones.go @@ -114,6 +114,9 @@ func addOperationDescribeAvailabilityZonesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationDescribeAvailabilityZonesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeBundleTasks.go b/service/ec2/api_op_DescribeBundleTasks.go index d1e3879006f..ffa0bf38333 100644 --- a/service/ec2/api_op_DescribeBundleTasks.go +++ b/service/ec2/api_op_DescribeBundleTasks.go @@ -92,6 +92,9 @@ func addOperationDescribeBundleTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeBundleTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeByoipCidrs.go b/service/ec2/api_op_DescribeByoipCidrs.go index 109430c2a12..db35f4531f4 100644 --- a/service/ec2/api_op_DescribeByoipCidrs.go +++ b/service/ec2/api_op_DescribeByoipCidrs.go @@ -70,6 +70,9 @@ func addOperationDescribeByoipCidrsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeByoipCidrsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeCapacityReservations.go b/service/ec2/api_op_DescribeCapacityReservations.go index 42234e5fb74..e81e42dc89e 100644 --- a/service/ec2/api_op_DescribeCapacityReservations.go +++ b/service/ec2/api_op_DescribeCapacityReservations.go @@ -153,6 +153,9 @@ func addOperationDescribeCapacityReservationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationDescribeCapacityReservationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeCarrierGateways.go b/service/ec2/api_op_DescribeCarrierGateways.go index 33c1e9af66a..37756614830 100644 --- a/service/ec2/api_op_DescribeCarrierGateways.go +++ b/service/ec2/api_op_DescribeCarrierGateways.go @@ -92,6 +92,9 @@ func addOperationDescribeCarrierGatewaysMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeCarrierGatewaysMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeClassicLinkInstances.go b/service/ec2/api_op_DescribeClassicLinkInstances.go index d59107a0e48..bf2c83e0c61 100644 --- a/service/ec2/api_op_DescribeClassicLinkInstances.go +++ b/service/ec2/api_op_DescribeClassicLinkInstances.go @@ -94,6 +94,9 @@ func addOperationDescribeClassicLinkInstancesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeClassicLinkInstancesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go b/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go index 1c4295057c1..285fbf120f9 100644 --- a/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go +++ b/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go @@ -83,6 +83,9 @@ func addOperationDescribeClientVpnAuthorizationRulesMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeClientVpnAuthorizationRulesMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeClientVpnConnections.go b/service/ec2/api_op_DescribeClientVpnConnections.go index 5e9a00d5322..18ee0bd39e3 100644 --- a/service/ec2/api_op_DescribeClientVpnConnections.go +++ b/service/ec2/api_op_DescribeClientVpnConnections.go @@ -82,6 +82,9 @@ func addOperationDescribeClientVpnConnectionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeClientVpnConnectionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeClientVpnEndpoints.go b/service/ec2/api_op_DescribeClientVpnEndpoints.go index 60f53cf5e05..985f33ea3a6 100644 --- a/service/ec2/api_op_DescribeClientVpnEndpoints.go +++ b/service/ec2/api_op_DescribeClientVpnEndpoints.go @@ -78,6 +78,9 @@ func addOperationDescribeClientVpnEndpointsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeClientVpnEndpointsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeClientVpnRoutes.go b/service/ec2/api_op_DescribeClientVpnRoutes.go index 370371ac582..eebf2c45b93 100644 --- a/service/ec2/api_op_DescribeClientVpnRoutes.go +++ b/service/ec2/api_op_DescribeClientVpnRoutes.go @@ -83,6 +83,9 @@ func addOperationDescribeClientVpnRoutesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeClientVpnRoutesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeClientVpnTargetNetworks.go b/service/ec2/api_op_DescribeClientVpnTargetNetworks.go index 5ed859b22ca..713d6e9cfe9 100644 --- a/service/ec2/api_op_DescribeClientVpnTargetNetworks.go +++ b/service/ec2/api_op_DescribeClientVpnTargetNetworks.go @@ -86,6 +86,9 @@ func addOperationDescribeClientVpnTargetNetworksMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeClientVpnTargetNetworksMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeCoipPools.go b/service/ec2/api_op_DescribeCoipPools.go index 50db79f0dd9..6e69e60209f 100644 --- a/service/ec2/api_op_DescribeCoipPools.go +++ b/service/ec2/api_op_DescribeCoipPools.go @@ -77,6 +77,9 @@ func addOperationDescribeCoipPoolsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeCoipPoolsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeConversionTasks.go b/service/ec2/api_op_DescribeConversionTasks.go index 4741e72fd04..f917cdd50e0 100644 --- a/service/ec2/api_op_DescribeConversionTasks.go +++ b/service/ec2/api_op_DescribeConversionTasks.go @@ -61,6 +61,9 @@ func addOperationDescribeConversionTasksMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeConversionTasksMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeCustomerGateways.go b/service/ec2/api_op_DescribeCustomerGateways.go index e0031ae0a0c..3a5604980a9 100644 --- a/service/ec2/api_op_DescribeCustomerGateways.go +++ b/service/ec2/api_op_DescribeCustomerGateways.go @@ -90,6 +90,9 @@ func addOperationDescribeCustomerGatewaysMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeCustomerGatewaysMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeDhcpOptions.go b/service/ec2/api_op_DescribeDhcpOptions.go index 60ac8710b54..e0c6a8d9f26 100644 --- a/service/ec2/api_op_DescribeDhcpOptions.go +++ b/service/ec2/api_op_DescribeDhcpOptions.go @@ -96,6 +96,9 @@ func addOperationDescribeDhcpOptionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeDhcpOptionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go b/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go index 95e8ee31143..0d7e000f4b3 100644 --- a/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go +++ b/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go @@ -81,6 +81,9 @@ func addOperationDescribeEgressOnlyInternetGatewaysMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeEgressOnlyInternetGatewaysMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeElasticGpus.go b/service/ec2/api_op_DescribeElasticGpus.go index 59f503d678f..dfc2e325ecd 100644 --- a/service/ec2/api_op_DescribeElasticGpus.go +++ b/service/ec2/api_op_DescribeElasticGpus.go @@ -94,6 +94,9 @@ func addOperationDescribeElasticGpusMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeElasticGpusMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeExportImageTasks.go b/service/ec2/api_op_DescribeExportImageTasks.go index 82ee2bc9971..02604e0cf8f 100644 --- a/service/ec2/api_op_DescribeExportImageTasks.go +++ b/service/ec2/api_op_DescribeExportImageTasks.go @@ -71,6 +71,9 @@ func addOperationDescribeExportImageTasksMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeExportImageTasksMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeExportTasks.go b/service/ec2/api_op_DescribeExportTasks.go index aa7a48becb1..a8c77a0c899 100644 --- a/service/ec2/api_op_DescribeExportTasks.go +++ b/service/ec2/api_op_DescribeExportTasks.go @@ -55,6 +55,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFastSnapshotRestores.go b/service/ec2/api_op_DescribeFastSnapshotRestores.go index 7111f3db320..895801ee6f6 100644 --- a/service/ec2/api_op_DescribeFastSnapshotRestores.go +++ b/service/ec2/api_op_DescribeFastSnapshotRestores.go @@ -80,6 +80,9 @@ func addOperationDescribeFastSnapshotRestoresMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeFastSnapshotRestoresMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFleetHistory.go b/service/ec2/api_op_DescribeFleetHistory.go index 7dabedbb554..dcbfa624492 100644 --- a/service/ec2/api_op_DescribeFleetHistory.go +++ b/service/ec2/api_op_DescribeFleetHistory.go @@ -95,6 +95,9 @@ func addOperationDescribeFleetHistoryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeFleetHistoryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFleetInstances.go b/service/ec2/api_op_DescribeFleetInstances.go index 190600cc6ce..21be549be5e 100644 --- a/service/ec2/api_op_DescribeFleetInstances.go +++ b/service/ec2/api_op_DescribeFleetInstances.go @@ -79,6 +79,9 @@ func addOperationDescribeFleetInstancesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeFleetInstancesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFleets.go b/service/ec2/api_op_DescribeFleets.go index 98fe9cb2a74..b4ea8967a6d 100644 --- a/service/ec2/api_op_DescribeFleets.go +++ b/service/ec2/api_op_DescribeFleets.go @@ -89,6 +89,9 @@ func addOperationDescribeFleetsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeFleetsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFlowLogs.go b/service/ec2/api_op_DescribeFlowLogs.go index 0c6d9566d8a..09934ff8c99 100644 --- a/service/ec2/api_op_DescribeFlowLogs.go +++ b/service/ec2/api_op_DescribeFlowLogs.go @@ -100,6 +100,9 @@ func addOperationDescribeFlowLogsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeFlowLogsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFpgaImageAttribute.go b/service/ec2/api_op_DescribeFpgaImageAttribute.go index debf3787121..ca82911d39b 100644 --- a/service/ec2/api_op_DescribeFpgaImageAttribute.go +++ b/service/ec2/api_op_DescribeFpgaImageAttribute.go @@ -64,6 +64,9 @@ func addOperationDescribeFpgaImageAttributeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeFpgaImageAttributeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeFpgaImages.go b/service/ec2/api_op_DescribeFpgaImages.go index 7084b1bffb2..68b001621e5 100644 --- a/service/ec2/api_op_DescribeFpgaImages.go +++ b/service/ec2/api_op_DescribeFpgaImages.go @@ -111,6 +111,9 @@ func addOperationDescribeFpgaImagesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeFpgaImagesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeHostReservationOfferings.go b/service/ec2/api_op_DescribeHostReservationOfferings.go index 44a8aa4f557..a711e562613 100644 --- a/service/ec2/api_op_DescribeHostReservationOfferings.go +++ b/service/ec2/api_op_DescribeHostReservationOfferings.go @@ -95,6 +95,9 @@ func addOperationDescribeHostReservationOfferingsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeHostReservationOfferingsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeHostReservations.go b/service/ec2/api_op_DescribeHostReservations.go index b43d7b125b6..55d7fced574 100644 --- a/service/ec2/api_op_DescribeHostReservations.go +++ b/service/ec2/api_op_DescribeHostReservations.go @@ -86,6 +86,9 @@ func addOperationDescribeHostReservationsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeHostReservationsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeHosts.go b/service/ec2/api_op_DescribeHosts.go index ff2c33d38c6..35e6f40cb11 100644 --- a/service/ec2/api_op_DescribeHosts.go +++ b/service/ec2/api_op_DescribeHosts.go @@ -94,6 +94,9 @@ func addOperationDescribeHostsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeHostsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go b/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go index 1eb03b3479c..9454332f37a 100644 --- a/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go +++ b/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go @@ -70,6 +70,9 @@ func addOperationDescribeIamInstanceProfileAssociationsMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeIamInstanceProfileAssociationsMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeIdFormat.go b/service/ec2/api_op_DescribeIdFormat.go index 8d24bf9c84c..e7538e78dbd 100644 --- a/service/ec2/api_op_DescribeIdFormat.go +++ b/service/ec2/api_op_DescribeIdFormat.go @@ -75,6 +75,9 @@ func addOperationDescribeIdFormatMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeIdFormatMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeIdentityIdFormat.go b/service/ec2/api_op_DescribeIdentityIdFormat.go index 041e25ec7e8..e039c5e2aa6 100644 --- a/service/ec2/api_op_DescribeIdentityIdFormat.go +++ b/service/ec2/api_op_DescribeIdentityIdFormat.go @@ -78,6 +78,9 @@ func addOperationDescribeIdentityIdFormatMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeIdentityIdFormatMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeImageAttribute.go b/service/ec2/api_op_DescribeImageAttribute.go index e90c1b90359..a16f60481e7 100644 --- a/service/ec2/api_op_DescribeImageAttribute.go +++ b/service/ec2/api_op_DescribeImageAttribute.go @@ -92,6 +92,9 @@ func addOperationDescribeImageAttributeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeImageAttributeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeImages.go b/service/ec2/api_op_DescribeImages.go index 632002782c8..e6e280d81f9 100644 --- a/service/ec2/api_op_DescribeImages.go +++ b/service/ec2/api_op_DescribeImages.go @@ -175,6 +175,9 @@ func addOperationDescribeImagesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -214,6 +217,9 @@ func addOperationDescribeImagesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeImportImageTasks.go b/service/ec2/api_op_DescribeImportImageTasks.go index 43deda58b3a..fed051a6d96 100644 --- a/service/ec2/api_op_DescribeImportImageTasks.go +++ b/service/ec2/api_op_DescribeImportImageTasks.go @@ -73,6 +73,9 @@ func addOperationDescribeImportImageTasksMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeImportImageTasksMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeImportSnapshotTasks.go b/service/ec2/api_op_DescribeImportSnapshotTasks.go index 714c6cc3366..6ff473e48d0 100644 --- a/service/ec2/api_op_DescribeImportSnapshotTasks.go +++ b/service/ec2/api_op_DescribeImportSnapshotTasks.go @@ -72,6 +72,9 @@ func addOperationDescribeImportSnapshotTasksMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeImportSnapshotTasksMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstanceAttribute.go b/service/ec2/api_op_DescribeInstanceAttribute.go index 1a958ffb12c..f33cf00bff4 100644 --- a/service/ec2/api_op_DescribeInstanceAttribute.go +++ b/service/ec2/api_op_DescribeInstanceAttribute.go @@ -121,6 +121,9 @@ func addOperationDescribeInstanceAttributeMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationDescribeInstanceAttributeMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstanceCreditSpecifications.go b/service/ec2/api_op_DescribeInstanceCreditSpecifications.go index feb95b41bff..0bbc63c6b19 100644 --- a/service/ec2/api_op_DescribeInstanceCreditSpecifications.go +++ b/service/ec2/api_op_DescribeInstanceCreditSpecifications.go @@ -93,6 +93,9 @@ func addOperationDescribeInstanceCreditSpecificationsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeInstanceCreditSpecificationsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go b/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go index d87d7a81e4d..1b3a82f42e3 100644 --- a/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go +++ b/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go @@ -55,6 +55,9 @@ func addOperationDescribeInstanceEventNotificationAttributesMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribeInstanceEventNotificationAttributesMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstanceStatus.go b/service/ec2/api_op_DescribeInstanceStatus.go index ae28f9e26ce..196e003b403 100644 --- a/service/ec2/api_op_DescribeInstanceStatus.go +++ b/service/ec2/api_op_DescribeInstanceStatus.go @@ -150,6 +150,9 @@ func addOperationDescribeInstanceStatusMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -189,6 +192,9 @@ func addOperationDescribeInstanceStatusMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstanceTypeOfferings.go b/service/ec2/api_op_DescribeInstanceTypeOfferings.go index 8509b800917..1c031c08da6 100644 --- a/service/ec2/api_op_DescribeInstanceTypeOfferings.go +++ b/service/ec2/api_op_DescribeInstanceTypeOfferings.go @@ -81,6 +81,9 @@ func addOperationDescribeInstanceTypeOfferingsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeInstanceTypeOfferingsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstanceTypes.go b/service/ec2/api_op_DescribeInstanceTypes.go index d2fee0e4fa1..7b44475270a 100644 --- a/service/ec2/api_op_DescribeInstanceTypes.go +++ b/service/ec2/api_op_DescribeInstanceTypes.go @@ -220,6 +220,9 @@ func addOperationDescribeInstanceTypesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -259,6 +262,9 @@ func addOperationDescribeInstanceTypesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInstances.go b/service/ec2/api_op_DescribeInstances.go index 0f395b22c12..beacf907759 100644 --- a/service/ec2/api_op_DescribeInstances.go +++ b/service/ec2/api_op_DescribeInstances.go @@ -388,6 +388,9 @@ func addOperationDescribeInstancesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -427,6 +430,9 @@ func addOperationDescribeInstancesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeInternetGateways.go b/service/ec2/api_op_DescribeInternetGateways.go index ac6868e6ea1..698d78a97c1 100644 --- a/service/ec2/api_op_DescribeInternetGateways.go +++ b/service/ec2/api_op_DescribeInternetGateways.go @@ -93,6 +93,9 @@ func addOperationDescribeInternetGatewaysMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeInternetGatewaysMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeIpv6Pools.go b/service/ec2/api_op_DescribeIpv6Pools.go index e9efc6f3b76..f3adaaf0f6a 100644 --- a/service/ec2/api_op_DescribeIpv6Pools.go +++ b/service/ec2/api_op_DescribeIpv6Pools.go @@ -81,6 +81,9 @@ func addOperationDescribeIpv6PoolsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeIpv6PoolsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeKeyPairs.go b/service/ec2/api_op_DescribeKeyPairs.go index 386aac5322e..5a538c7dbe1 100644 --- a/service/ec2/api_op_DescribeKeyPairs.go +++ b/service/ec2/api_op_DescribeKeyPairs.go @@ -83,6 +83,9 @@ func addOperationDescribeKeyPairsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeKeyPairsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLaunchTemplateVersions.go b/service/ec2/api_op_DescribeLaunchTemplateVersions.go index b81e2685d81..5c452105a4e 100644 --- a/service/ec2/api_op_DescribeLaunchTemplateVersions.go +++ b/service/ec2/api_op_DescribeLaunchTemplateVersions.go @@ -122,6 +122,9 @@ func addOperationDescribeLaunchTemplateVersionsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationDescribeLaunchTemplateVersionsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLaunchTemplates.go b/service/ec2/api_op_DescribeLaunchTemplates.go index 99410227fe1..0d710b54e85 100644 --- a/service/ec2/api_op_DescribeLaunchTemplates.go +++ b/service/ec2/api_op_DescribeLaunchTemplates.go @@ -90,6 +90,9 @@ func addOperationDescribeLaunchTemplatesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeLaunchTemplatesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go b/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go index 9918f042876..58585c705f3 100644 --- a/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go +++ b/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go @@ -86,6 +86,9 @@ func addOperationDescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go b/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go index d52d2fd8d74..099d45c1874 100644 --- a/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go +++ b/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go @@ -85,6 +85,9 @@ func addOperationDescribeLocalGatewayRouteTableVpcAssociationsMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeLocalGatewayRouteTableVpcAssociationsMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLocalGatewayRouteTables.go b/service/ec2/api_op_DescribeLocalGatewayRouteTables.go index 5fc3bb17ada..5ae9f65e23d 100644 --- a/service/ec2/api_op_DescribeLocalGatewayRouteTables.go +++ b/service/ec2/api_op_DescribeLocalGatewayRouteTables.go @@ -83,6 +83,9 @@ func addOperationDescribeLocalGatewayRouteTablesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeLocalGatewayRouteTablesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go index 6e3edcab694..156c16e04c3 100644 --- a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go +++ b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go @@ -80,6 +80,9 @@ func addOperationDescribeLocalGatewayVirtualInterfaceGroupsMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeLocalGatewayVirtualInterfaceGroupsMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go index 4d002610ab4..7df25c45ea8 100644 --- a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go +++ b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go @@ -71,6 +71,9 @@ func addOperationDescribeLocalGatewayVirtualInterfacesMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeLocalGatewayVirtualInterfacesMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeLocalGateways.go b/service/ec2/api_op_DescribeLocalGateways.go index 806f76df47f..486156c50de 100644 --- a/service/ec2/api_op_DescribeLocalGateways.go +++ b/service/ec2/api_op_DescribeLocalGateways.go @@ -89,6 +89,9 @@ func addOperationDescribeLocalGatewaysMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeLocalGatewaysMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeManagedPrefixLists.go b/service/ec2/api_op_DescribeManagedPrefixLists.go index fc8c3a950bd..eb5498ee169 100644 --- a/service/ec2/api_op_DescribeManagedPrefixLists.go +++ b/service/ec2/api_op_DescribeManagedPrefixLists.go @@ -80,6 +80,9 @@ func addOperationDescribeManagedPrefixListsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeManagedPrefixListsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeMovingAddresses.go b/service/ec2/api_op_DescribeMovingAddresses.go index 6732dd0e4c0..41913dbe1e6 100644 --- a/service/ec2/api_op_DescribeMovingAddresses.go +++ b/service/ec2/api_op_DescribeMovingAddresses.go @@ -80,6 +80,9 @@ func addOperationDescribeMovingAddressesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeMovingAddressesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeNatGateways.go b/service/ec2/api_op_DescribeNatGateways.go index 4929068f231..f7f1b82d4d8 100644 --- a/service/ec2/api_op_DescribeNatGateways.go +++ b/service/ec2/api_op_DescribeNatGateways.go @@ -92,6 +92,9 @@ func addOperationDescribeNatGatewaysMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeNatGatewaysMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeNetworkAcls.go b/service/ec2/api_op_DescribeNetworkAcls.go index 10c6bcf55e0..07f8c00eef8 100644 --- a/service/ec2/api_op_DescribeNetworkAcls.go +++ b/service/ec2/api_op_DescribeNetworkAcls.go @@ -130,6 +130,9 @@ func addOperationDescribeNetworkAclsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationDescribeNetworkAclsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go b/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go index bc0842b8394..e61821ab675 100644 --- a/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go +++ b/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go @@ -77,6 +77,9 @@ func addOperationDescribeNetworkInterfaceAttributeMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeNetworkInterfaceAttributeMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeNetworkInterfacePermissions.go b/service/ec2/api_op_DescribeNetworkInterfacePermissions.go index c67c0d0e972..3ca7bf28876 100644 --- a/service/ec2/api_op_DescribeNetworkInterfacePermissions.go +++ b/service/ec2/api_op_DescribeNetworkInterfacePermissions.go @@ -83,6 +83,9 @@ func addOperationDescribeNetworkInterfacePermissionsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeNetworkInterfacePermissionsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeNetworkInterfaces.go b/service/ec2/api_op_DescribeNetworkInterfaces.go index 6bdcfdf5bcb..28e3af28627 100644 --- a/service/ec2/api_op_DescribeNetworkInterfaces.go +++ b/service/ec2/api_op_DescribeNetworkInterfaces.go @@ -193,6 +193,9 @@ func addOperationDescribeNetworkInterfacesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -232,6 +235,9 @@ func addOperationDescribeNetworkInterfacesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribePlacementGroups.go b/service/ec2/api_op_DescribePlacementGroups.go index b72847ff9fa..d6acd43c1e2 100644 --- a/service/ec2/api_op_DescribePlacementGroups.go +++ b/service/ec2/api_op_DescribePlacementGroups.go @@ -86,6 +86,9 @@ func addOperationDescribePlacementGroupsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribePlacementGroupsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribePrefixLists.go b/service/ec2/api_op_DescribePrefixLists.go index 36c0671468d..e9bf0436df6 100644 --- a/service/ec2/api_op_DescribePrefixLists.go +++ b/service/ec2/api_op_DescribePrefixLists.go @@ -78,6 +78,9 @@ func addOperationDescribePrefixListsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribePrefixListsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribePrincipalIdFormat.go b/service/ec2/api_op_DescribePrincipalIdFormat.go index 3c3f735f46c..f8ac032a8e4 100644 --- a/service/ec2/api_op_DescribePrincipalIdFormat.go +++ b/service/ec2/api_op_DescribePrincipalIdFormat.go @@ -87,6 +87,9 @@ func addOperationDescribePrincipalIdFormatMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDescribePrincipalIdFormatMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribePublicIpv4Pools.go b/service/ec2/api_op_DescribePublicIpv4Pools.go index 144b61c1264..b9ebebbf30e 100644 --- a/service/ec2/api_op_DescribePublicIpv4Pools.go +++ b/service/ec2/api_op_DescribePublicIpv4Pools.go @@ -75,6 +75,9 @@ func addOperationDescribePublicIpv4PoolsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribePublicIpv4PoolsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeRegions.go b/service/ec2/api_op_DescribeRegions.go index d0ed4a5dd2f..fa5f130b0e2 100644 --- a/service/ec2/api_op_DescribeRegions.go +++ b/service/ec2/api_op_DescribeRegions.go @@ -79,6 +79,9 @@ func addOperationDescribeRegionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeRegionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeReservedInstances.go b/service/ec2/api_op_DescribeReservedInstances.go index 91efd29a23e..896e5580039 100644 --- a/service/ec2/api_op_DescribeReservedInstances.go +++ b/service/ec2/api_op_DescribeReservedInstances.go @@ -126,6 +126,9 @@ func addOperationDescribeReservedInstancesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationDescribeReservedInstancesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeReservedInstancesListings.go b/service/ec2/api_op_DescribeReservedInstancesListings.go index 74c39be6704..6503960a448 100644 --- a/service/ec2/api_op_DescribeReservedInstancesListings.go +++ b/service/ec2/api_op_DescribeReservedInstancesListings.go @@ -85,6 +85,9 @@ func addOperationDescribeReservedInstancesListingsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeReservedInstancesListingsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeReservedInstancesModifications.go b/service/ec2/api_op_DescribeReservedInstancesModifications.go index 71ea3ac4022..75816caccc4 100644 --- a/service/ec2/api_op_DescribeReservedInstancesModifications.go +++ b/service/ec2/api_op_DescribeReservedInstancesModifications.go @@ -112,6 +112,9 @@ func addOperationDescribeReservedInstancesModificationsMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationDescribeReservedInstancesModificationsMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeReservedInstancesOfferings.go b/service/ec2/api_op_DescribeReservedInstancesOfferings.go index 65f433e8a4c..b9cc8a61247 100644 --- a/service/ec2/api_op_DescribeReservedInstancesOfferings.go +++ b/service/ec2/api_op_DescribeReservedInstancesOfferings.go @@ -163,6 +163,9 @@ func addOperationDescribeReservedInstancesOfferingsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -202,6 +205,9 @@ func addOperationDescribeReservedInstancesOfferingsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeRouteTables.go b/service/ec2/api_op_DescribeRouteTables.go index 777e454a871..36e25c217da 100644 --- a/service/ec2/api_op_DescribeRouteTables.go +++ b/service/ec2/api_op_DescribeRouteTables.go @@ -150,6 +150,9 @@ func addOperationDescribeRouteTablesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -189,6 +192,9 @@ func addOperationDescribeRouteTablesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeScheduledInstanceAvailability.go b/service/ec2/api_op_DescribeScheduledInstanceAvailability.go index 8c227332bb1..a0f5d6557ed 100644 --- a/service/ec2/api_op_DescribeScheduledInstanceAvailability.go +++ b/service/ec2/api_op_DescribeScheduledInstanceAvailability.go @@ -107,6 +107,9 @@ func addOperationDescribeScheduledInstanceAvailabilityMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationDescribeScheduledInstanceAvailabilityMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeScheduledInstances.go b/service/ec2/api_op_DescribeScheduledInstances.go index fc88491247b..46c08c38635 100644 --- a/service/ec2/api_op_DescribeScheduledInstances.go +++ b/service/ec2/api_op_DescribeScheduledInstances.go @@ -88,6 +88,9 @@ func addOperationDescribeScheduledInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeScheduledInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSecurityGroupReferences.go b/service/ec2/api_op_DescribeSecurityGroupReferences.go index 9c9b1c14d7e..69b768729ae 100644 --- a/service/ec2/api_op_DescribeSecurityGroupReferences.go +++ b/service/ec2/api_op_DescribeSecurityGroupReferences.go @@ -60,6 +60,9 @@ func addOperationDescribeSecurityGroupReferencesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeSecurityGroupReferencesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSecurityGroups.go b/service/ec2/api_op_DescribeSecurityGroups.go index a664cda5c60..1dd4bb21347 100644 --- a/service/ec2/api_op_DescribeSecurityGroups.go +++ b/service/ec2/api_op_DescribeSecurityGroups.go @@ -175,6 +175,9 @@ func addOperationDescribeSecurityGroupsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -214,6 +217,9 @@ func addOperationDescribeSecurityGroupsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSnapshotAttribute.go b/service/ec2/api_op_DescribeSnapshotAttribute.go index dc565e9d987..13f4339b6ad 100644 --- a/service/ec2/api_op_DescribeSnapshotAttribute.go +++ b/service/ec2/api_op_DescribeSnapshotAttribute.go @@ -75,6 +75,9 @@ func addOperationDescribeSnapshotAttributeMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeSnapshotAttributeMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSnapshots.go b/service/ec2/api_op_DescribeSnapshots.go index 92746c2c887..6f7248ea598 100644 --- a/service/ec2/api_op_DescribeSnapshots.go +++ b/service/ec2/api_op_DescribeSnapshots.go @@ -172,6 +172,9 @@ func addOperationDescribeSnapshotsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -211,6 +214,9 @@ func addOperationDescribeSnapshotsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSpotDatafeedSubscription.go b/service/ec2/api_op_DescribeSpotDatafeedSubscription.go index 18b171ec705..38d2cad97cc 100644 --- a/service/ec2/api_op_DescribeSpotDatafeedSubscription.go +++ b/service/ec2/api_op_DescribeSpotDatafeedSubscription.go @@ -59,6 +59,9 @@ func addOperationDescribeSpotDatafeedSubscriptionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeSpotDatafeedSubscriptionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSpotFleetInstances.go b/service/ec2/api_op_DescribeSpotFleetInstances.go index 49d4621a0a0..d7959f6de0a 100644 --- a/service/ec2/api_op_DescribeSpotFleetInstances.go +++ b/service/ec2/api_op_DescribeSpotFleetInstances.go @@ -77,6 +77,9 @@ func addOperationDescribeSpotFleetInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeSpotFleetInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSpotFleetRequestHistory.go b/service/ec2/api_op_DescribeSpotFleetRequestHistory.go index b9bbf513a39..97107d52374 100644 --- a/service/ec2/api_op_DescribeSpotFleetRequestHistory.go +++ b/service/ec2/api_op_DescribeSpotFleetRequestHistory.go @@ -98,6 +98,9 @@ func addOperationDescribeSpotFleetRequestHistoryMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeSpotFleetRequestHistoryMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSpotFleetRequests.go b/service/ec2/api_op_DescribeSpotFleetRequests.go index 0adef2edce7..c2213aa6778 100644 --- a/service/ec2/api_op_DescribeSpotFleetRequests.go +++ b/service/ec2/api_op_DescribeSpotFleetRequests.go @@ -72,6 +72,9 @@ func addOperationDescribeSpotFleetRequestsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeSpotFleetRequestsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSpotInstanceRequests.go b/service/ec2/api_op_DescribeSpotInstanceRequests.go index c95f5ed1a4c..2985a830c58 100644 --- a/service/ec2/api_op_DescribeSpotInstanceRequests.go +++ b/service/ec2/api_op_DescribeSpotInstanceRequests.go @@ -216,6 +216,9 @@ func addOperationDescribeSpotInstanceRequestsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -255,6 +258,9 @@ func addOperationDescribeSpotInstanceRequestsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSpotPriceHistory.go b/service/ec2/api_op_DescribeSpotPriceHistory.go index eff9d3559e8..111b36bc8ef 100644 --- a/service/ec2/api_op_DescribeSpotPriceHistory.go +++ b/service/ec2/api_op_DescribeSpotPriceHistory.go @@ -115,6 +115,9 @@ func addOperationDescribeSpotPriceHistoryMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationDescribeSpotPriceHistoryMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeStaleSecurityGroups.go b/service/ec2/api_op_DescribeStaleSecurityGroups.go index 5aa5857f0ad..45e6cad19b4 100644 --- a/service/ec2/api_op_DescribeStaleSecurityGroups.go +++ b/service/ec2/api_op_DescribeStaleSecurityGroups.go @@ -74,6 +74,9 @@ func addOperationDescribeStaleSecurityGroupsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeStaleSecurityGroupsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeSubnets.go b/service/ec2/api_op_DescribeSubnets.go index 947934607f5..3ae922a1163 100644 --- a/service/ec2/api_op_DescribeSubnets.go +++ b/service/ec2/api_op_DescribeSubnets.go @@ -126,6 +126,9 @@ func addOperationDescribeSubnetsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationDescribeSubnetsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTags.go b/service/ec2/api_op_DescribeTags.go index 388af94bf82..b4e560e7140 100644 --- a/service/ec2/api_op_DescribeTags.go +++ b/service/ec2/api_op_DescribeTags.go @@ -91,6 +91,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTrafficMirrorFilters.go b/service/ec2/api_op_DescribeTrafficMirrorFilters.go index dcdb9c319f2..fdd907b4bfc 100644 --- a/service/ec2/api_op_DescribeTrafficMirrorFilters.go +++ b/service/ec2/api_op_DescribeTrafficMirrorFilters.go @@ -77,6 +77,9 @@ func addOperationDescribeTrafficMirrorFiltersMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeTrafficMirrorFiltersMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTrafficMirrorSessions.go b/service/ec2/api_op_DescribeTrafficMirrorSessions.go index fe339d7c674..c0ec7106848 100644 --- a/service/ec2/api_op_DescribeTrafficMirrorSessions.go +++ b/service/ec2/api_op_DescribeTrafficMirrorSessions.go @@ -99,6 +99,9 @@ func addOperationDescribeTrafficMirrorSessionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationDescribeTrafficMirrorSessionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTrafficMirrorTargets.go b/service/ec2/api_op_DescribeTrafficMirrorTargets.go index f934d5974af..61576aac1b4 100644 --- a/service/ec2/api_op_DescribeTrafficMirrorTargets.go +++ b/service/ec2/api_op_DescribeTrafficMirrorTargets.go @@ -86,6 +86,9 @@ func addOperationDescribeTrafficMirrorTargetsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeTrafficMirrorTargetsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTransitGatewayAttachments.go b/service/ec2/api_op_DescribeTransitGatewayAttachments.go index 588e0b98822..3d26caf502a 100644 --- a/service/ec2/api_op_DescribeTransitGatewayAttachments.go +++ b/service/ec2/api_op_DescribeTransitGatewayAttachments.go @@ -102,6 +102,9 @@ func addOperationDescribeTransitGatewayAttachmentsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDescribeTransitGatewayAttachmentsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go b/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go index 61f57430bc5..d73fdf25ef7 100644 --- a/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go +++ b/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go @@ -81,6 +81,9 @@ func addOperationDescribeTransitGatewayMulticastDomainsMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeTransitGatewayMulticastDomainsMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go b/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go index a8d964f5fc8..a8eaa2550a7 100644 --- a/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go +++ b/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go @@ -87,6 +87,9 @@ func addOperationDescribeTransitGatewayPeeringAttachmentsMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDescribeTransitGatewayPeeringAttachmentsMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTransitGatewayRouteTables.go b/service/ec2/api_op_DescribeTransitGatewayRouteTables.go index 58bb5996036..4ba3edc6811 100644 --- a/service/ec2/api_op_DescribeTransitGatewayRouteTables.go +++ b/service/ec2/api_op_DescribeTransitGatewayRouteTables.go @@ -88,6 +88,9 @@ func addOperationDescribeTransitGatewayRouteTablesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeTransitGatewayRouteTablesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go b/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go index 649a2220de1..b0618e0c389 100644 --- a/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go +++ b/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go @@ -85,6 +85,9 @@ func addOperationDescribeTransitGatewayVpcAttachmentsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeTransitGatewayVpcAttachmentsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeTransitGateways.go b/service/ec2/api_op_DescribeTransitGateways.go index dca2ab507cb..b1ecf506543 100644 --- a/service/ec2/api_op_DescribeTransitGateways.go +++ b/service/ec2/api_op_DescribeTransitGateways.go @@ -110,6 +110,9 @@ func addOperationDescribeTransitGatewaysMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationDescribeTransitGatewaysMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVolumeAttribute.go b/service/ec2/api_op_DescribeVolumeAttribute.go index 7c4b0ec22d4..ee23a766fd9 100644 --- a/service/ec2/api_op_DescribeVolumeAttribute.go +++ b/service/ec2/api_op_DescribeVolumeAttribute.go @@ -73,6 +73,9 @@ func addOperationDescribeVolumeAttributeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeVolumeAttributeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVolumeStatus.go b/service/ec2/api_op_DescribeVolumeStatus.go index 9ddc46888a6..1e7f6eb4bcb 100644 --- a/service/ec2/api_op_DescribeVolumeStatus.go +++ b/service/ec2/api_op_DescribeVolumeStatus.go @@ -145,6 +145,9 @@ func addOperationDescribeVolumeStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -184,6 +187,9 @@ func addOperationDescribeVolumeStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVolumes.go b/service/ec2/api_op_DescribeVolumes.go index 27f0ca1b015..88ef68ab8f0 100644 --- a/service/ec2/api_op_DescribeVolumes.go +++ b/service/ec2/api_op_DescribeVolumes.go @@ -146,6 +146,9 @@ func addOperationDescribeVolumesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -185,6 +188,9 @@ func addOperationDescribeVolumesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVolumesModifications.go b/service/ec2/api_op_DescribeVolumesModifications.go index 1ce703e8473..45fcb88c0b6 100644 --- a/service/ec2/api_op_DescribeVolumesModifications.go +++ b/service/ec2/api_op_DescribeVolumesModifications.go @@ -111,6 +111,9 @@ func addOperationDescribeVolumesModificationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeVolumesModificationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcAttribute.go b/service/ec2/api_op_DescribeVpcAttribute.go index 43060c14567..ae986f20306 100644 --- a/service/ec2/api_op_DescribeVpcAttribute.go +++ b/service/ec2/api_op_DescribeVpcAttribute.go @@ -75,6 +75,9 @@ func addOperationDescribeVpcAttributeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeVpcAttributeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcClassicLink.go b/service/ec2/api_op_DescribeVpcClassicLink.go index d78f862535d..df9e5e88ac9 100644 --- a/service/ec2/api_op_DescribeVpcClassicLink.go +++ b/service/ec2/api_op_DescribeVpcClassicLink.go @@ -73,6 +73,9 @@ func addOperationDescribeVpcClassicLinkMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeVpcClassicLinkMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go b/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go index 3ee6a839bc0..b5ee9a51a9f 100644 --- a/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go +++ b/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go @@ -69,6 +69,9 @@ func addOperationDescribeVpcClassicLinkDnsSupportMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeVpcClassicLinkDnsSupportMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go b/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go index ef0e2f73331..00a597a6d2c 100644 --- a/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go +++ b/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go @@ -89,6 +89,9 @@ func addOperationDescribeVpcEndpointConnectionNotificationsMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeVpcEndpointConnectionNotificationsMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcEndpointConnections.go b/service/ec2/api_op_DescribeVpcEndpointConnections.go index 4ccbdc23337..8f305de5b0e 100644 --- a/service/ec2/api_op_DescribeVpcEndpointConnections.go +++ b/service/ec2/api_op_DescribeVpcEndpointConnections.go @@ -83,6 +83,9 @@ func addOperationDescribeVpcEndpointConnectionsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeVpcEndpointConnectionsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go b/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go index 5dc93fa99c0..c6fa72b2c09 100644 --- a/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go +++ b/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go @@ -92,6 +92,9 @@ func addOperationDescribeVpcEndpointServiceConfigurationsMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeVpcEndpointServiceConfigurationsMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go b/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go index dbf0db3a6d6..d96c4b7e648 100644 --- a/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go +++ b/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go @@ -81,6 +81,9 @@ func addOperationDescribeVpcEndpointServicePermissionsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeVpcEndpointServicePermissionsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcEndpointServices.go b/service/ec2/api_op_DescribeVpcEndpointServices.go index 1ec2beac966..a53fb8f42d4 100644 --- a/service/ec2/api_op_DescribeVpcEndpointServices.go +++ b/service/ec2/api_op_DescribeVpcEndpointServices.go @@ -90,6 +90,9 @@ func addOperationDescribeVpcEndpointServicesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeVpcEndpointServicesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcEndpoints.go b/service/ec2/api_op_DescribeVpcEndpoints.go index fe5cbe444c4..429314e2dcb 100644 --- a/service/ec2/api_op_DescribeVpcEndpoints.go +++ b/service/ec2/api_op_DescribeVpcEndpoints.go @@ -96,6 +96,9 @@ func addOperationDescribeVpcEndpointsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeVpcEndpointsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcPeeringConnections.go b/service/ec2/api_op_DescribeVpcPeeringConnections.go index 15165a2e0c3..3b24f693d56 100644 --- a/service/ec2/api_op_DescribeVpcPeeringConnections.go +++ b/service/ec2/api_op_DescribeVpcPeeringConnections.go @@ -113,6 +113,9 @@ func addOperationDescribeVpcPeeringConnectionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationDescribeVpcPeeringConnectionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpcs.go b/service/ec2/api_op_DescribeVpcs.go index 023b6281c9a..2b6dea35a2e 100644 --- a/service/ec2/api_op_DescribeVpcs.go +++ b/service/ec2/api_op_DescribeVpcs.go @@ -123,6 +123,9 @@ func addOperationDescribeVpcsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationDescribeVpcsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpnConnections.go b/service/ec2/api_op_DescribeVpnConnections.go index 0242167086a..34e367ef69b 100644 --- a/service/ec2/api_op_DescribeVpnConnections.go +++ b/service/ec2/api_op_DescribeVpnConnections.go @@ -106,6 +106,9 @@ func addOperationDescribeVpnConnectionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeVpnConnectionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DescribeVpnGateways.go b/service/ec2/api_op_DescribeVpnGateways.go index 767d482edf6..778d79eb341 100644 --- a/service/ec2/api_op_DescribeVpnGateways.go +++ b/service/ec2/api_op_DescribeVpnGateways.go @@ -98,6 +98,9 @@ func addOperationDescribeVpnGatewaysMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeVpnGatewaysMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DetachClassicLinkVpc.go b/service/ec2/api_op_DetachClassicLinkVpc.go index 3bac10602eb..4d19668c30f 100644 --- a/service/ec2/api_op_DetachClassicLinkVpc.go +++ b/service/ec2/api_op_DetachClassicLinkVpc.go @@ -65,6 +65,9 @@ func addOperationDetachClassicLinkVpcMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDetachClassicLinkVpcMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DetachInternetGateway.go b/service/ec2/api_op_DetachInternetGateway.go index dce1cce8c33..b7796930884 100644 --- a/service/ec2/api_op_DetachInternetGateway.go +++ b/service/ec2/api_op_DetachInternetGateway.go @@ -61,6 +61,9 @@ func addOperationDetachInternetGatewayMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDetachInternetGatewayMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DetachNetworkInterface.go b/service/ec2/api_op_DetachNetworkInterface.go index abddb52687c..dce8d2e704b 100644 --- a/service/ec2/api_op_DetachNetworkInterface.go +++ b/service/ec2/api_op_DetachNetworkInterface.go @@ -73,6 +73,9 @@ func addOperationDetachNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDetachNetworkInterfaceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DetachVolume.go b/service/ec2/api_op_DetachVolume.go index a52ff642adc..979d4c36a78 100644 --- a/service/ec2/api_op_DetachVolume.go +++ b/service/ec2/api_op_DetachVolume.go @@ -103,6 +103,9 @@ func addOperationDetachVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDetachVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DetachVpnGateway.go b/service/ec2/api_op_DetachVpnGateway.go index 4aab38b5045..eb49aa310d1 100644 --- a/service/ec2/api_op_DetachVpnGateway.go +++ b/service/ec2/api_op_DetachVpnGateway.go @@ -66,6 +66,9 @@ func addOperationDetachVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetachVpnGatewayMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisableEbsEncryptionByDefault.go b/service/ec2/api_op_DisableEbsEncryptionByDefault.go index 7a42c505f2c..51a6d486caf 100644 --- a/service/ec2/api_op_DisableEbsEncryptionByDefault.go +++ b/service/ec2/api_op_DisableEbsEncryptionByDefault.go @@ -59,6 +59,9 @@ func addOperationDisableEbsEncryptionByDefaultMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDisableEbsEncryptionByDefaultMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisableFastSnapshotRestores.go b/service/ec2/api_op_DisableFastSnapshotRestores.go index 3a8f270bfb9..934513c1cdb 100644 --- a/service/ec2/api_op_DisableFastSnapshotRestores.go +++ b/service/ec2/api_op_DisableFastSnapshotRestores.go @@ -70,6 +70,9 @@ func addOperationDisableFastSnapshotRestoresMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDisableFastSnapshotRestoresMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go b/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go index dec114759aa..762af2e24a8 100644 --- a/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go +++ b/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go @@ -65,6 +65,9 @@ func addOperationDisableTransitGatewayRouteTablePropagationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDisableTransitGatewayRouteTablePropagationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisableVgwRoutePropagation.go b/service/ec2/api_op_DisableVgwRoutePropagation.go index 7561eba7c0b..1764b3fbf6e 100644 --- a/service/ec2/api_op_DisableVgwRoutePropagation.go +++ b/service/ec2/api_op_DisableVgwRoutePropagation.go @@ -61,6 +61,9 @@ func addOperationDisableVgwRoutePropagationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDisableVgwRoutePropagationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisableVpcClassicLink.go b/service/ec2/api_op_DisableVpcClassicLink.go index c56a3e2abba..c879b0332fb 100644 --- a/service/ec2/api_op_DisableVpcClassicLink.go +++ b/service/ec2/api_op_DisableVpcClassicLink.go @@ -59,6 +59,9 @@ func addOperationDisableVpcClassicLinkMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDisableVpcClassicLinkMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go b/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go index 7504a76b13c..049364bf2da 100644 --- a/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go +++ b/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go @@ -55,6 +55,9 @@ func addOperationDisableVpcClassicLinkDnsSupportMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDisableVpcClassicLinkDnsSupportMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateAddress.go b/service/ec2/api_op_DisassociateAddress.go index 0368348ed15..d3bebc194d3 100644 --- a/service/ec2/api_op_DisassociateAddress.go +++ b/service/ec2/api_op_DisassociateAddress.go @@ -60,6 +60,9 @@ func addOperationDisassociateAddressMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDisassociateAddressMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go b/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go index 4ab690ffaf8..4651d5b86fa 100644 --- a/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go +++ b/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go @@ -79,6 +79,9 @@ func addOperationDisassociateClientVpnTargetNetworkMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDisassociateClientVpnTargetNetworkMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateEnclaveCertificateIamRole.go b/service/ec2/api_op_DisassociateEnclaveCertificateIamRole.go index ee27c8d8c60..654305affc6 100644 --- a/service/ec2/api_op_DisassociateEnclaveCertificateIamRole.go +++ b/service/ec2/api_op_DisassociateEnclaveCertificateIamRole.go @@ -64,6 +64,9 @@ func addOperationDisassociateEnclaveCertificateIamRoleMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDisassociateEnclaveCertificateIamRoleMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateIamInstanceProfile.go b/service/ec2/api_op_DisassociateIamInstanceProfile.go index 364c977110f..2c918aed2e9 100644 --- a/service/ec2/api_op_DisassociateIamInstanceProfile.go +++ b/service/ec2/api_op_DisassociateIamInstanceProfile.go @@ -54,6 +54,9 @@ func addOperationDisassociateIamInstanceProfileMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateIamInstanceProfileMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateRouteTable.go b/service/ec2/api_op_DisassociateRouteTable.go index 5a24f82f74d..fec794a6365 100644 --- a/service/ec2/api_op_DisassociateRouteTable.go +++ b/service/ec2/api_op_DisassociateRouteTable.go @@ -60,6 +60,9 @@ func addOperationDisassociateRouteTableMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisassociateRouteTableMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateSubnetCidrBlock.go b/service/ec2/api_op_DisassociateSubnetCidrBlock.go index 5dd386e2321..96290fa2acb 100644 --- a/service/ec2/api_op_DisassociateSubnetCidrBlock.go +++ b/service/ec2/api_op_DisassociateSubnetCidrBlock.go @@ -58,6 +58,9 @@ func addOperationDisassociateSubnetCidrBlockMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDisassociateSubnetCidrBlockMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go b/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go index c0fcf1bf11a..f94a8f6bf07 100644 --- a/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go @@ -63,6 +63,9 @@ func addOperationDisassociateTransitGatewayMulticastDomainMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisassociateTransitGatewayMulticastDomainMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go b/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go index 013bfe6a89e..24ffd57eeaf 100644 --- a/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go +++ b/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go @@ -64,6 +64,9 @@ func addOperationDisassociateTransitGatewayRouteTableMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDisassociateTransitGatewayRouteTableMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_DisassociateVpcCidrBlock.go b/service/ec2/api_op_DisassociateVpcCidrBlock.go index 96fba35b861..52a5f8a3378 100644 --- a/service/ec2/api_op_DisassociateVpcCidrBlock.go +++ b/service/ec2/api_op_DisassociateVpcCidrBlock.go @@ -64,6 +64,9 @@ func addOperationDisassociateVpcCidrBlockMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDisassociateVpcCidrBlockMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableEbsEncryptionByDefault.go b/service/ec2/api_op_EnableEbsEncryptionByDefault.go index 9009330017b..b5464b8e031 100644 --- a/service/ec2/api_op_EnableEbsEncryptionByDefault.go +++ b/service/ec2/api_op_EnableEbsEncryptionByDefault.go @@ -64,6 +64,9 @@ func addOperationEnableEbsEncryptionByDefaultMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationEnableEbsEncryptionByDefaultMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableFastSnapshotRestores.go b/service/ec2/api_op_EnableFastSnapshotRestores.go index a0f75a43e4f..ffbd392e29a 100644 --- a/service/ec2/api_op_EnableFastSnapshotRestores.go +++ b/service/ec2/api_op_EnableFastSnapshotRestores.go @@ -77,6 +77,9 @@ func addOperationEnableFastSnapshotRestoresMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationEnableFastSnapshotRestoresMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go b/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go index 875b3419542..edab1e91b92 100644 --- a/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go +++ b/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go @@ -65,6 +65,9 @@ func addOperationEnableTransitGatewayRouteTablePropagationMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationEnableTransitGatewayRouteTablePropagationMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableVgwRoutePropagation.go b/service/ec2/api_op_EnableVgwRoutePropagation.go index 0c3913c56b2..244083e2a13 100644 --- a/service/ec2/api_op_EnableVgwRoutePropagation.go +++ b/service/ec2/api_op_EnableVgwRoutePropagation.go @@ -64,6 +64,9 @@ func addOperationEnableVgwRoutePropagationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationEnableVgwRoutePropagationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableVolumeIO.go b/service/ec2/api_op_EnableVolumeIO.go index 1f36b9d69ee..48a2c7b6edc 100644 --- a/service/ec2/api_op_EnableVolumeIO.go +++ b/service/ec2/api_op_EnableVolumeIO.go @@ -55,6 +55,9 @@ func addOperationEnableVolumeIOMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationEnableVolumeIOMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableVpcClassicLink.go b/service/ec2/api_op_EnableVpcClassicLink.go index 3e6cf942011..6c9e08e54d1 100644 --- a/service/ec2/api_op_EnableVpcClassicLink.go +++ b/service/ec2/api_op_EnableVpcClassicLink.go @@ -65,6 +65,9 @@ func addOperationEnableVpcClassicLinkMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationEnableVpcClassicLinkMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go b/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go index c856e58fbf1..9e8c53db364 100644 --- a/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go +++ b/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go @@ -58,6 +58,9 @@ func addOperationEnableVpcClassicLinkDnsSupportMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationEnableVpcClassicLinkDnsSupportMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go b/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go index e2745192dd1..2035b677046 100644 --- a/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go +++ b/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go @@ -63,6 +63,9 @@ func addOperationExportClientVpnClientCertificateRevocationListMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationExportClientVpnClientCertificateRevocationListMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ExportClientVpnClientConfiguration.go b/service/ec2/api_op_ExportClientVpnClientConfiguration.go index f316faf02c3..ec7dd519d25 100644 --- a/service/ec2/api_op_ExportClientVpnClientConfiguration.go +++ b/service/ec2/api_op_ExportClientVpnClientConfiguration.go @@ -61,6 +61,9 @@ func addOperationExportClientVpnClientConfigurationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationExportClientVpnClientConfigurationMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ExportImage.go b/service/ec2/api_op_ExportImage.go index 377c8594e2c..208b355cdec 100644 --- a/service/ec2/api_op_ExportImage.go +++ b/service/ec2/api_op_ExportImage.go @@ -118,6 +118,9 @@ func addOperationExportImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationExportImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ExportTransitGatewayRoutes.go b/service/ec2/api_op_ExportTransitGatewayRoutes.go index 7cff4f16654..8282688a49c 100644 --- a/service/ec2/api_op_ExportTransitGatewayRoutes.go +++ b/service/ec2/api_op_ExportTransitGatewayRoutes.go @@ -102,6 +102,9 @@ func addOperationExportTransitGatewayRoutesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationExportTransitGatewayRoutesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetAssociatedEnclaveCertificateIamRoles.go b/service/ec2/api_op_GetAssociatedEnclaveCertificateIamRoles.go index f5fbfa4e3a7..2dea2d52b40 100644 --- a/service/ec2/api_op_GetAssociatedEnclaveCertificateIamRoles.go +++ b/service/ec2/api_op_GetAssociatedEnclaveCertificateIamRoles.go @@ -62,6 +62,9 @@ func addOperationGetAssociatedEnclaveCertificateIamRolesMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetAssociatedEnclaveCertificateIamRolesMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go b/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go index d4be7f51e5d..1f046debc42 100644 --- a/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go +++ b/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go @@ -71,6 +71,9 @@ func addOperationGetAssociatedIpv6PoolCidrsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetAssociatedIpv6PoolCidrsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetCapacityReservationUsage.go b/service/ec2/api_op_GetCapacityReservationUsage.go index bdccfb03d39..a43122dc207 100644 --- a/service/ec2/api_op_GetCapacityReservationUsage.go +++ b/service/ec2/api_op_GetCapacityReservationUsage.go @@ -112,6 +112,9 @@ func addOperationGetCapacityReservationUsageMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationGetCapacityReservationUsageMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetCoipPoolUsage.go b/service/ec2/api_op_GetCoipPoolUsage.go index c86f41aa149..21db1e479f5 100644 --- a/service/ec2/api_op_GetCoipPoolUsage.go +++ b/service/ec2/api_op_GetCoipPoolUsage.go @@ -85,6 +85,9 @@ func addOperationGetCoipPoolUsageMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationGetCoipPoolUsageMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetConsoleOutput.go b/service/ec2/api_op_GetConsoleOutput.go index d511b6abeef..b7b830564d0 100644 --- a/service/ec2/api_op_GetConsoleOutput.go +++ b/service/ec2/api_op_GetConsoleOutput.go @@ -82,6 +82,9 @@ func addOperationGetConsoleOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetConsoleOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetConsoleScreenshot.go b/service/ec2/api_op_GetConsoleScreenshot.go index e2003ccb881..e5aa6e70e0a 100644 --- a/service/ec2/api_op_GetConsoleScreenshot.go +++ b/service/ec2/api_op_GetConsoleScreenshot.go @@ -66,6 +66,9 @@ func addOperationGetConsoleScreenshotMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetConsoleScreenshotMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetDefaultCreditSpecification.go b/service/ec2/api_op_GetDefaultCreditSpecification.go index 5344cb44f27..57dc2709cea 100644 --- a/service/ec2/api_op_GetDefaultCreditSpecification.go +++ b/service/ec2/api_op_GetDefaultCreditSpecification.go @@ -62,6 +62,9 @@ func addOperationGetDefaultCreditSpecificationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetDefaultCreditSpecificationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetEbsDefaultKmsKeyId.go b/service/ec2/api_op_GetEbsDefaultKmsKeyId.go index 2cda264811c..94c7c168dc5 100644 --- a/service/ec2/api_op_GetEbsDefaultKmsKeyId.go +++ b/service/ec2/api_op_GetEbsDefaultKmsKeyId.go @@ -58,6 +58,9 @@ func addOperationGetEbsDefaultKmsKeyIdMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetEbsDefaultKmsKeyIdMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetEbsEncryptionByDefault.go b/service/ec2/api_op_GetEbsEncryptionByDefault.go index 9e9cfd3825d..2bd2ba289d3 100644 --- a/service/ec2/api_op_GetEbsEncryptionByDefault.go +++ b/service/ec2/api_op_GetEbsEncryptionByDefault.go @@ -56,6 +56,9 @@ func addOperationGetEbsEncryptionByDefaultMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetEbsEncryptionByDefaultMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetGroupsForCapacityReservation.go b/service/ec2/api_op_GetGroupsForCapacityReservation.go index cd2a2599f45..a7b67df5bd3 100644 --- a/service/ec2/api_op_GetGroupsForCapacityReservation.go +++ b/service/ec2/api_op_GetGroupsForCapacityReservation.go @@ -73,6 +73,9 @@ func addOperationGetGroupsForCapacityReservationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetGroupsForCapacityReservationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetHostReservationPurchasePreview.go b/service/ec2/api_op_GetHostReservationPurchasePreview.go index 555b4349ef1..e61128abf17 100644 --- a/service/ec2/api_op_GetHostReservationPurchasePreview.go +++ b/service/ec2/api_op_GetHostReservationPurchasePreview.go @@ -72,6 +72,9 @@ func addOperationGetHostReservationPurchasePreviewMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetHostReservationPurchasePreviewMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetLaunchTemplateData.go b/service/ec2/api_op_GetLaunchTemplateData.go index 0c5c498f35f..ec5e3c0beb3 100644 --- a/service/ec2/api_op_GetLaunchTemplateData.go +++ b/service/ec2/api_op_GetLaunchTemplateData.go @@ -65,6 +65,9 @@ func addOperationGetLaunchTemplateDataMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetLaunchTemplateDataMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetManagedPrefixListAssociations.go b/service/ec2/api_op_GetManagedPrefixListAssociations.go index 9d9c7eda857..02e52369fc6 100644 --- a/service/ec2/api_op_GetManagedPrefixListAssociations.go +++ b/service/ec2/api_op_GetManagedPrefixListAssociations.go @@ -71,6 +71,9 @@ func addOperationGetManagedPrefixListAssociationsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetManagedPrefixListAssociationsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetManagedPrefixListEntries.go b/service/ec2/api_op_GetManagedPrefixListEntries.go index dd72bfff971..f994f1dd9cf 100644 --- a/service/ec2/api_op_GetManagedPrefixListEntries.go +++ b/service/ec2/api_op_GetManagedPrefixListEntries.go @@ -74,6 +74,9 @@ func addOperationGetManagedPrefixListEntriesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetManagedPrefixListEntriesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetPasswordData.go b/service/ec2/api_op_GetPasswordData.go index a06cf7fa71a..0c302dfd080 100644 --- a/service/ec2/api_op_GetPasswordData.go +++ b/service/ec2/api_op_GetPasswordData.go @@ -80,6 +80,9 @@ func addOperationGetPasswordDataMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetPasswordDataMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetReservedInstancesExchangeQuote.go b/service/ec2/api_op_GetReservedInstancesExchangeQuote.go index 64716c43945..55a30580e71 100644 --- a/service/ec2/api_op_GetReservedInstancesExchangeQuote.go +++ b/service/ec2/api_op_GetReservedInstancesExchangeQuote.go @@ -93,6 +93,9 @@ func addOperationGetReservedInstancesExchangeQuoteMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationGetReservedInstancesExchangeQuoteMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go b/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go index de75ae5055f..61800fe0253 100644 --- a/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go +++ b/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go @@ -77,6 +77,9 @@ func addOperationGetTransitGatewayAttachmentPropagationsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetTransitGatewayAttachmentPropagationsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go b/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go index f3a61118e81..0221fde3761 100644 --- a/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go +++ b/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go @@ -87,6 +87,9 @@ func addOperationGetTransitGatewayMulticastDomainAssociationsMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetTransitGatewayMulticastDomainAssociationsMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetTransitGatewayPrefixListReferences.go b/service/ec2/api_op_GetTransitGatewayPrefixListReferences.go index 8285e22482a..dfc5b70e62f 100644 --- a/service/ec2/api_op_GetTransitGatewayPrefixListReferences.go +++ b/service/ec2/api_op_GetTransitGatewayPrefixListReferences.go @@ -95,6 +95,9 @@ func addOperationGetTransitGatewayPrefixListReferencesMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationGetTransitGatewayPrefixListReferencesMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go b/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go index aef0567ef64..04bc3057b46 100644 --- a/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go +++ b/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go @@ -83,6 +83,9 @@ func addOperationGetTransitGatewayRouteTableAssociationsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetTransitGatewayRouteTableAssociationsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go b/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go index dec6fbb283c..bb82edab26e 100644 --- a/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go +++ b/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go @@ -83,6 +83,9 @@ func addOperationGetTransitGatewayRouteTablePropagationsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetTransitGatewayRouteTablePropagationsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go b/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go index 88a7fbdb96f..eca2b33606a 100644 --- a/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go +++ b/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go @@ -70,6 +70,9 @@ func addOperationImportClientVpnClientCertificateRevocationListMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationImportClientVpnClientCertificateRevocationListMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ImportImage.go b/service/ec2/api_op_ImportImage.go index 87229029f3a..2108634545e 100644 --- a/service/ec2/api_op_ImportImage.go +++ b/service/ec2/api_op_ImportImage.go @@ -183,6 +183,9 @@ func addOperationImportImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -222,6 +225,9 @@ func addOperationImportImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ImportInstance.go b/service/ec2/api_op_ImportInstance.go index 90811e37ef6..9ce66810637 100644 --- a/service/ec2/api_op_ImportInstance.go +++ b/service/ec2/api_op_ImportInstance.go @@ -75,6 +75,9 @@ func addOperationImportInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationImportInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ImportKeyPair.go b/service/ec2/api_op_ImportKeyPair.go index 8be7a1fa5b3..03d8b1e4b90 100644 --- a/service/ec2/api_op_ImportKeyPair.go +++ b/service/ec2/api_op_ImportKeyPair.go @@ -84,6 +84,9 @@ func addOperationImportKeyPairMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationImportKeyPairMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ImportSnapshot.go b/service/ec2/api_op_ImportSnapshot.go index 87d5fdd2b22..c947e584e7d 100644 --- a/service/ec2/api_op_ImportSnapshot.go +++ b/service/ec2/api_op_ImportSnapshot.go @@ -122,6 +122,9 @@ func addOperationImportSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationImportSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ImportVolume.go b/service/ec2/api_op_ImportVolume.go index 85a5f01e6cd..8e0aaa1a94a 100644 --- a/service/ec2/api_op_ImportVolume.go +++ b/service/ec2/api_op_ImportVolume.go @@ -77,6 +77,9 @@ func addOperationImportVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationImportVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyAvailabilityZoneGroup.go b/service/ec2/api_op_ModifyAvailabilityZoneGroup.go index a40674f84b8..afd31ac8fa9 100644 --- a/service/ec2/api_op_ModifyAvailabilityZoneGroup.go +++ b/service/ec2/api_op_ModifyAvailabilityZoneGroup.go @@ -71,6 +71,9 @@ func addOperationModifyAvailabilityZoneGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationModifyAvailabilityZoneGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyCapacityReservation.go b/service/ec2/api_op_ModifyCapacityReservation.go index ae6421a9876..a048408fb0c 100644 --- a/service/ec2/api_op_ModifyCapacityReservation.go +++ b/service/ec2/api_op_ModifyCapacityReservation.go @@ -90,6 +90,9 @@ func addOperationModifyCapacityReservationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationModifyCapacityReservationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyClientVpnEndpoint.go b/service/ec2/api_op_ModifyClientVpnEndpoint.go index 88b89985d51..76df9f50f46 100644 --- a/service/ec2/api_op_ModifyClientVpnEndpoint.go +++ b/service/ec2/api_op_ModifyClientVpnEndpoint.go @@ -106,6 +106,9 @@ func addOperationModifyClientVpnEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationModifyClientVpnEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyDefaultCreditSpecification.go b/service/ec2/api_op_ModifyDefaultCreditSpecification.go index 89c04692ac4..0b2c93ef3ad 100644 --- a/service/ec2/api_op_ModifyDefaultCreditSpecification.go +++ b/service/ec2/api_op_ModifyDefaultCreditSpecification.go @@ -77,6 +77,9 @@ func addOperationModifyDefaultCreditSpecificationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationModifyDefaultCreditSpecificationMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go b/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go index c0b2ac46d6e..6f43f97d5c0 100644 --- a/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go +++ b/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go @@ -88,6 +88,9 @@ func addOperationModifyEbsDefaultKmsKeyIdMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationModifyEbsDefaultKmsKeyIdMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyFleet.go b/service/ec2/api_op_ModifyFleet.go index 8c2ad4ca61f..faf6f39cbae 100644 --- a/service/ec2/api_op_ModifyFleet.go +++ b/service/ec2/api_op_ModifyFleet.go @@ -93,6 +93,9 @@ func addOperationModifyFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationModifyFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyFpgaImageAttribute.go b/service/ec2/api_op_ModifyFpgaImageAttribute.go index ab1b0f412d0..9ca41ff2212 100644 --- a/service/ec2/api_op_ModifyFpgaImageAttribute.go +++ b/service/ec2/api_op_ModifyFpgaImageAttribute.go @@ -86,6 +86,9 @@ func addOperationModifyFpgaImageAttributeMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationModifyFpgaImageAttributeMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyHosts.go b/service/ec2/api_op_ModifyHosts.go index 3ab0573e3ba..0b8658d56f3 100644 --- a/service/ec2/api_op_ModifyHosts.go +++ b/service/ec2/api_op_ModifyHosts.go @@ -89,6 +89,9 @@ func addOperationModifyHostsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationModifyHostsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyIdFormat.go b/service/ec2/api_op_ModifyIdFormat.go index 3f7766a6d49..0d26427dc00 100644 --- a/service/ec2/api_op_ModifyIdFormat.go +++ b/service/ec2/api_op_ModifyIdFormat.go @@ -81,6 +81,9 @@ func addOperationModifyIdFormatMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationModifyIdFormatMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyIdentityIdFormat.go b/service/ec2/api_op_ModifyIdentityIdFormat.go index 36238e0b53f..91c5bdb09c6 100644 --- a/service/ec2/api_op_ModifyIdentityIdFormat.go +++ b/service/ec2/api_op_ModifyIdentityIdFormat.go @@ -86,6 +86,9 @@ func addOperationModifyIdentityIdFormatMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationModifyIdentityIdFormatMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyImageAttribute.go b/service/ec2/api_op_ModifyImageAttribute.go index a5b0327600e..6b96d407ef4 100644 --- a/service/ec2/api_op_ModifyImageAttribute.go +++ b/service/ec2/api_op_ModifyImageAttribute.go @@ -92,6 +92,9 @@ func addOperationModifyImageAttributeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationModifyImageAttributeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyInstanceAttribute.go b/service/ec2/api_op_ModifyInstanceAttribute.go index 1cfc3c31265..e4633a06eea 100644 --- a/service/ec2/api_op_ModifyInstanceAttribute.go +++ b/service/ec2/api_op_ModifyInstanceAttribute.go @@ -141,6 +141,9 @@ func addOperationModifyInstanceAttributeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationModifyInstanceAttributeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go b/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go index 770511fad54..9e070c75ee6 100644 --- a/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go +++ b/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go @@ -67,6 +67,9 @@ func addOperationModifyInstanceCapacityReservationAttributesMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationModifyInstanceCapacityReservationAttributesMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyInstanceCreditSpecification.go b/service/ec2/api_op_ModifyInstanceCreditSpecification.go index af351a7e35b..566a9b726c5 100644 --- a/service/ec2/api_op_ModifyInstanceCreditSpecification.go +++ b/service/ec2/api_op_ModifyInstanceCreditSpecification.go @@ -73,6 +73,9 @@ func addOperationModifyInstanceCreditSpecificationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationModifyInstanceCreditSpecificationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyInstanceEventStartTime.go b/service/ec2/api_op_ModifyInstanceEventStartTime.go index 73841da4533..9f61b497100 100644 --- a/service/ec2/api_op_ModifyInstanceEventStartTime.go +++ b/service/ec2/api_op_ModifyInstanceEventStartTime.go @@ -70,6 +70,9 @@ func addOperationModifyInstanceEventStartTimeMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationModifyInstanceEventStartTimeMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyInstanceMetadataOptions.go b/service/ec2/api_op_ModifyInstanceMetadataOptions.go index 5a46fae5e96..5cf67ade1dc 100644 --- a/service/ec2/api_op_ModifyInstanceMetadataOptions.go +++ b/service/ec2/api_op_ModifyInstanceMetadataOptions.go @@ -93,6 +93,9 @@ func addOperationModifyInstanceMetadataOptionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationModifyInstanceMetadataOptionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyInstancePlacement.go b/service/ec2/api_op_ModifyInstancePlacement.go index 231ce019111..020a8eaf42d 100644 --- a/service/ec2/api_op_ModifyInstancePlacement.go +++ b/service/ec2/api_op_ModifyInstancePlacement.go @@ -99,6 +99,9 @@ func addOperationModifyInstancePlacementMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationModifyInstancePlacementMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyLaunchTemplate.go b/service/ec2/api_op_ModifyLaunchTemplate.go index c0c21d522e4..d05ae3da1c2 100644 --- a/service/ec2/api_op_ModifyLaunchTemplate.go +++ b/service/ec2/api_op_ModifyLaunchTemplate.go @@ -73,6 +73,9 @@ func addOperationModifyLaunchTemplateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationModifyLaunchTemplateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyManagedPrefixList.go b/service/ec2/api_op_ModifyManagedPrefixList.go index e1549397d1d..f761d59843f 100644 --- a/service/ec2/api_op_ModifyManagedPrefixList.go +++ b/service/ec2/api_op_ModifyManagedPrefixList.go @@ -74,6 +74,9 @@ func addOperationModifyManagedPrefixListMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationModifyManagedPrefixListMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go b/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go index 6eb2a1fd3dd..19645c1983f 100644 --- a/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go +++ b/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go @@ -78,6 +78,9 @@ func addOperationModifyNetworkInterfaceAttributeMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationModifyNetworkInterfaceAttributeMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyReservedInstances.go b/service/ec2/api_op_ModifyReservedInstances.go index bfb4fe654be..075a773007e 100644 --- a/service/ec2/api_op_ModifyReservedInstances.go +++ b/service/ec2/api_op_ModifyReservedInstances.go @@ -71,6 +71,9 @@ func addOperationModifyReservedInstancesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationModifyReservedInstancesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifySnapshotAttribute.go b/service/ec2/api_op_ModifySnapshotAttribute.go index 6b2d18905b5..9d7cf137a16 100644 --- a/service/ec2/api_op_ModifySnapshotAttribute.go +++ b/service/ec2/api_op_ModifySnapshotAttribute.go @@ -81,6 +81,9 @@ func addOperationModifySnapshotAttributeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationModifySnapshotAttributeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifySpotFleetRequest.go b/service/ec2/api_op_ModifySpotFleetRequest.go index 1c10883a595..d56d8210786 100644 --- a/service/ec2/api_op_ModifySpotFleetRequest.go +++ b/service/ec2/api_op_ModifySpotFleetRequest.go @@ -94,6 +94,9 @@ func addOperationModifySpotFleetRequestMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationModifySpotFleetRequestMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifySubnetAttribute.go b/service/ec2/api_op_ModifySubnetAttribute.go index 7f94d32820f..c870a33696c 100644 --- a/service/ec2/api_op_ModifySubnetAttribute.go +++ b/service/ec2/api_op_ModifySubnetAttribute.go @@ -71,6 +71,9 @@ func addOperationModifySubnetAttributeMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationModifySubnetAttributeMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go b/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go index edcf7f6214c..8ca578d6335 100644 --- a/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go +++ b/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go @@ -73,6 +73,9 @@ func addOperationModifyTrafficMirrorFilterNetworkServicesMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationModifyTrafficMirrorFilterNetworkServicesMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go b/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go index cb17d174e09..08da8daf679 100644 --- a/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go +++ b/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go @@ -94,6 +94,9 @@ func addOperationModifyTrafficMirrorFilterRuleMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationModifyTrafficMirrorFilterRuleMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyTrafficMirrorSession.go b/service/ec2/api_op_ModifyTrafficMirrorSession.go index e243bf3e53e..d55c9fb169b 100644 --- a/service/ec2/api_op_ModifyTrafficMirrorSession.go +++ b/service/ec2/api_op_ModifyTrafficMirrorSession.go @@ -89,6 +89,9 @@ func addOperationModifyTrafficMirrorSessionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationModifyTrafficMirrorSessionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyTransitGateway.go b/service/ec2/api_op_ModifyTransitGateway.go index f866021d35d..453f41765a3 100644 --- a/service/ec2/api_op_ModifyTransitGateway.go +++ b/service/ec2/api_op_ModifyTransitGateway.go @@ -67,6 +67,9 @@ func addOperationModifyTransitGatewayMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationModifyTransitGatewayMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyTransitGatewayPrefixListReference.go b/service/ec2/api_op_ModifyTransitGatewayPrefixListReference.go index 4d23c66877e..1dfca2c3497 100644 --- a/service/ec2/api_op_ModifyTransitGatewayPrefixListReference.go +++ b/service/ec2/api_op_ModifyTransitGatewayPrefixListReference.go @@ -71,6 +71,9 @@ func addOperationModifyTransitGatewayPrefixListReferenceMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationModifyTransitGatewayPrefixListReferenceMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go b/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go index 5141da55a91..47c4ba736f2 100644 --- a/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go @@ -69,6 +69,9 @@ func addOperationModifyTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationModifyTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVolume.go b/service/ec2/api_op_ModifyVolume.go index cf46eb511f9..200c81ef20d 100644 --- a/service/ec2/api_op_ModifyVolume.go +++ b/service/ec2/api_op_ModifyVolume.go @@ -111,6 +111,9 @@ func addOperationModifyVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationModifyVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVolumeAttribute.go b/service/ec2/api_op_ModifyVolumeAttribute.go index 300cb623544..08e576a2e35 100644 --- a/service/ec2/api_op_ModifyVolumeAttribute.go +++ b/service/ec2/api_op_ModifyVolumeAttribute.go @@ -64,6 +64,9 @@ func addOperationModifyVolumeAttributeMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationModifyVolumeAttributeMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcAttribute.go b/service/ec2/api_op_ModifyVpcAttribute.go index fd07823bbc2..54a57ceef7a 100644 --- a/service/ec2/api_op_ModifyVpcAttribute.go +++ b/service/ec2/api_op_ModifyVpcAttribute.go @@ -65,6 +65,9 @@ func addOperationModifyVpcAttributeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationModifyVpcAttributeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcEndpoint.go b/service/ec2/api_op_ModifyVpcEndpoint.go index de88dd6e80e..5aa245dd7e9 100644 --- a/service/ec2/api_op_ModifyVpcEndpoint.go +++ b/service/ec2/api_op_ModifyVpcEndpoint.go @@ -96,6 +96,9 @@ func addOperationModifyVpcEndpointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationModifyVpcEndpointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go b/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go index 150161dbf30..1ae25c12524 100644 --- a/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go +++ b/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go @@ -67,6 +67,9 @@ func addOperationModifyVpcEndpointConnectionNotificationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationModifyVpcEndpointConnectionNotificationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go b/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go index 5bf8b0bf9d5..64a4439a303 100644 --- a/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go +++ b/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go @@ -83,6 +83,9 @@ func addOperationModifyVpcEndpointServiceConfigurationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationModifyVpcEndpointServiceConfigurationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go b/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go index 1928ffca95a..e97c3386137 100644 --- a/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go +++ b/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go @@ -73,6 +73,9 @@ func addOperationModifyVpcEndpointServicePermissionsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationModifyVpcEndpointServicePermissionsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go b/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go index f0e0cb7a505..eda81b352cc 100644 --- a/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go +++ b/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go @@ -93,6 +93,9 @@ func addOperationModifyVpcPeeringConnectionOptionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationModifyVpcPeeringConnectionOptionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpcTenancy.go b/service/ec2/api_op_ModifyVpcTenancy.go index b272aba0422..190d407d7cd 100644 --- a/service/ec2/api_op_ModifyVpcTenancy.go +++ b/service/ec2/api_op_ModifyVpcTenancy.go @@ -72,6 +72,9 @@ func addOperationModifyVpcTenancyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationModifyVpcTenancyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpnConnection.go b/service/ec2/api_op_ModifyVpnConnection.go index 625ac1a5480..8042cf843ae 100644 --- a/service/ec2/api_op_ModifyVpnConnection.go +++ b/service/ec2/api_op_ModifyVpnConnection.go @@ -102,6 +102,9 @@ func addOperationModifyVpnConnectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationModifyVpnConnectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpnConnectionOptions.go b/service/ec2/api_op_ModifyVpnConnectionOptions.go index 8ae7380c185..dcdd3fd4876 100644 --- a/service/ec2/api_op_ModifyVpnConnectionOptions.go +++ b/service/ec2/api_op_ModifyVpnConnectionOptions.go @@ -76,6 +76,9 @@ func addOperationModifyVpnConnectionOptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationModifyVpnConnectionOptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpnTunnelCertificate.go b/service/ec2/api_op_ModifyVpnTunnelCertificate.go index af17415b109..92bac166d25 100644 --- a/service/ec2/api_op_ModifyVpnTunnelCertificate.go +++ b/service/ec2/api_op_ModifyVpnTunnelCertificate.go @@ -64,6 +64,9 @@ func addOperationModifyVpnTunnelCertificateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationModifyVpnTunnelCertificateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ModifyVpnTunnelOptions.go b/service/ec2/api_op_ModifyVpnTunnelOptions.go index 5015512d527..4edcb989657 100644 --- a/service/ec2/api_op_ModifyVpnTunnelOptions.go +++ b/service/ec2/api_op_ModifyVpnTunnelOptions.go @@ -74,6 +74,9 @@ func addOperationModifyVpnTunnelOptionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationModifyVpnTunnelOptionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_MonitorInstances.go b/service/ec2/api_op_MonitorInstances.go index 0f1894c1cf3..495ecc3fa61 100644 --- a/service/ec2/api_op_MonitorInstances.go +++ b/service/ec2/api_op_MonitorInstances.go @@ -63,6 +63,9 @@ func addOperationMonitorInstancesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationMonitorInstancesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_MoveAddressToVpc.go b/service/ec2/api_op_MoveAddressToVpc.go index 26708400560..17385b9dbf1 100644 --- a/service/ec2/api_op_MoveAddressToVpc.go +++ b/service/ec2/api_op_MoveAddressToVpc.go @@ -68,6 +68,9 @@ func addOperationMoveAddressToVpcMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationMoveAddressToVpcMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ProvisionByoipCidr.go b/service/ec2/api_op_ProvisionByoipCidr.go index 97284be183b..a67d5bbacbe 100644 --- a/service/ec2/api_op_ProvisionByoipCidr.go +++ b/service/ec2/api_op_ProvisionByoipCidr.go @@ -91,6 +91,9 @@ func addOperationProvisionByoipCidrMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationProvisionByoipCidrMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_PurchaseHostReservation.go b/service/ec2/api_op_PurchaseHostReservation.go index 8443367d450..ea1a326648c 100644 --- a/service/ec2/api_op_PurchaseHostReservation.go +++ b/service/ec2/api_op_PurchaseHostReservation.go @@ -96,6 +96,9 @@ func addOperationPurchaseHostReservationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationPurchaseHostReservationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_PurchaseReservedInstancesOffering.go b/service/ec2/api_op_PurchaseReservedInstancesOffering.go index 07d286127b0..b98b63832d6 100644 --- a/service/ec2/api_op_PurchaseReservedInstancesOffering.go +++ b/service/ec2/api_op_PurchaseReservedInstancesOffering.go @@ -86,6 +86,9 @@ func addOperationPurchaseReservedInstancesOfferingMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationPurchaseReservedInstancesOfferingMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_PurchaseScheduledInstances.go b/service/ec2/api_op_PurchaseScheduledInstances.go index dd930e945f5..68b467a8ff6 100644 --- a/service/ec2/api_op_PurchaseScheduledInstances.go +++ b/service/ec2/api_op_PurchaseScheduledInstances.go @@ -73,6 +73,9 @@ func addOperationPurchaseScheduledInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationPurchaseScheduledInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RebootInstances.go b/service/ec2/api_op_RebootInstances.go index 72b1963db33..2e8e4b92d3c 100644 --- a/service/ec2/api_op_RebootInstances.go +++ b/service/ec2/api_op_RebootInstances.go @@ -61,6 +61,9 @@ func addOperationRebootInstancesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRebootInstancesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RegisterImage.go b/service/ec2/api_op_RegisterImage.go index 6c0f1548c7f..656b7c5229f 100644 --- a/service/ec2/api_op_RegisterImage.go +++ b/service/ec2/api_op_RegisterImage.go @@ -151,6 +151,9 @@ func addOperationRegisterImageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -193,6 +196,9 @@ func addOperationRegisterImageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go b/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go index b1dcd360c1f..12796dc5481 100644 --- a/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go +++ b/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go @@ -58,6 +58,9 @@ func addOperationRegisterInstanceEventNotificationAttributesMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRegisterInstanceEventNotificationAttributesMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go index 644b6a41016..713d0ef8da6 100644 --- a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go +++ b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go @@ -72,6 +72,9 @@ func addOperationRegisterTransitGatewayMulticastGroupMembersMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationRegisterTransitGatewayMulticastGroupMembersMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go index 8ca4a2ba266..a9cf6f9b84f 100644 --- a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go +++ b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go @@ -72,6 +72,9 @@ func addOperationRegisterTransitGatewayMulticastGroupSourcesMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationRegisterTransitGatewayMulticastGroupSourcesMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go b/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go index a78fb100c8f..d30c0de5b0b 100644 --- a/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go @@ -59,6 +59,9 @@ func addOperationRejectTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRejectTransitGatewayPeeringAttachmentMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go b/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go index 1ed3e74b516..6076464461f 100644 --- a/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go @@ -62,6 +62,9 @@ func addOperationRejectTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationRejectTransitGatewayVpcAttachmentMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RejectVpcEndpointConnections.go b/service/ec2/api_op_RejectVpcEndpointConnections.go index 39084585fbe..6a8d7500cf7 100644 --- a/service/ec2/api_op_RejectVpcEndpointConnections.go +++ b/service/ec2/api_op_RejectVpcEndpointConnections.go @@ -65,6 +65,9 @@ func addOperationRejectVpcEndpointConnectionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationRejectVpcEndpointConnectionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RejectVpcPeeringConnection.go b/service/ec2/api_op_RejectVpcPeeringConnection.go index 02522e713e1..bf7133feb6e 100644 --- a/service/ec2/api_op_RejectVpcPeeringConnection.go +++ b/service/ec2/api_op_RejectVpcPeeringConnection.go @@ -62,6 +62,9 @@ func addOperationRejectVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationRejectVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReleaseAddress.go b/service/ec2/api_op_ReleaseAddress.go index 16fc986c52e..360a2cc492e 100644 --- a/service/ec2/api_op_ReleaseAddress.go +++ b/service/ec2/api_op_ReleaseAddress.go @@ -77,6 +77,9 @@ func addOperationReleaseAddressMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationReleaseAddressMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReleaseHosts.go b/service/ec2/api_op_ReleaseHosts.go index 93ee75cdffe..f6ca52758ca 100644 --- a/service/ec2/api_op_ReleaseHosts.go +++ b/service/ec2/api_op_ReleaseHosts.go @@ -65,6 +65,9 @@ func addOperationReleaseHostsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationReleaseHostsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go b/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go index 6f53a9efda8..b5c4825545b 100644 --- a/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go +++ b/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go @@ -61,6 +61,9 @@ func addOperationReplaceIamInstanceProfileAssociationMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationReplaceIamInstanceProfileAssociationMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReplaceNetworkAclAssociation.go b/service/ec2/api_op_ReplaceNetworkAclAssociation.go index e3a9d2b4b19..907b4741147 100644 --- a/service/ec2/api_op_ReplaceNetworkAclAssociation.go +++ b/service/ec2/api_op_ReplaceNetworkAclAssociation.go @@ -68,6 +68,9 @@ func addOperationReplaceNetworkAclAssociationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationReplaceNetworkAclAssociationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReplaceNetworkAclEntry.go b/service/ec2/api_op_ReplaceNetworkAclEntry.go index a695efe4434..a6f11c654d4 100644 --- a/service/ec2/api_op_ReplaceNetworkAclEntry.go +++ b/service/ec2/api_op_ReplaceNetworkAclEntry.go @@ -100,6 +100,9 @@ func addOperationReplaceNetworkAclEntryMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationReplaceNetworkAclEntryMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReplaceRoute.go b/service/ec2/api_op_ReplaceRoute.go index c3caf470e9a..306d778153a 100644 --- a/service/ec2/api_op_ReplaceRoute.go +++ b/service/ec2/api_op_ReplaceRoute.go @@ -100,6 +100,9 @@ func addOperationReplaceRouteMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationReplaceRouteMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReplaceRouteTableAssociation.go b/service/ec2/api_op_ReplaceRouteTableAssociation.go index 8a3c9ccf486..71c6f45edcd 100644 --- a/service/ec2/api_op_ReplaceRouteTableAssociation.go +++ b/service/ec2/api_op_ReplaceRouteTableAssociation.go @@ -74,6 +74,9 @@ func addOperationReplaceRouteTableAssociationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationReplaceRouteTableAssociationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReplaceTransitGatewayRoute.go b/service/ec2/api_op_ReplaceTransitGatewayRoute.go index aa5636f1a92..5615ef1607a 100644 --- a/service/ec2/api_op_ReplaceTransitGatewayRoute.go +++ b/service/ec2/api_op_ReplaceTransitGatewayRoute.go @@ -71,6 +71,9 @@ func addOperationReplaceTransitGatewayRouteMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationReplaceTransitGatewayRouteMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ReportInstanceStatus.go b/service/ec2/api_op_ReportInstanceStatus.go index 8d8fa236a79..5da5bf763b5 100644 --- a/service/ec2/api_op_ReportInstanceStatus.go +++ b/service/ec2/api_op_ReportInstanceStatus.go @@ -108,6 +108,9 @@ func addOperationReportInstanceStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationReportInstanceStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RequestSpotFleet.go b/service/ec2/api_op_RequestSpotFleet.go index a0c42ded6a1..e1326a264ac 100644 --- a/service/ec2/api_op_RequestSpotFleet.go +++ b/service/ec2/api_op_RequestSpotFleet.go @@ -78,6 +78,9 @@ func addOperationRequestSpotFleetMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationRequestSpotFleetMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RequestSpotInstances.go b/service/ec2/api_op_RequestSpotInstances.go index d8167cd166e..f4316c73201 100644 --- a/service/ec2/api_op_RequestSpotInstances.go +++ b/service/ec2/api_op_RequestSpotInstances.go @@ -144,6 +144,9 @@ func addOperationRequestSpotInstancesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationRequestSpotInstancesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go b/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go index 4236d35b4a5..4b794a57d06 100644 --- a/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go +++ b/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go @@ -59,6 +59,9 @@ func addOperationResetEbsDefaultKmsKeyIdMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationResetEbsDefaultKmsKeyIdMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ResetFpgaImageAttribute.go b/service/ec2/api_op_ResetFpgaImageAttribute.go index 3469ca005c0..035efda9499 100644 --- a/service/ec2/api_op_ResetFpgaImageAttribute.go +++ b/service/ec2/api_op_ResetFpgaImageAttribute.go @@ -63,6 +63,9 @@ func addOperationResetFpgaImageAttributeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationResetFpgaImageAttributeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ResetImageAttribute.go b/service/ec2/api_op_ResetImageAttribute.go index 4159b6bd205..aa4f8205515 100644 --- a/service/ec2/api_op_ResetImageAttribute.go +++ b/service/ec2/api_op_ResetImageAttribute.go @@ -63,6 +63,9 @@ func addOperationResetImageAttributeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationResetImageAttributeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ResetInstanceAttribute.go b/service/ec2/api_op_ResetInstanceAttribute.go index dae521119aa..737bd8f7fe3 100644 --- a/service/ec2/api_op_ResetInstanceAttribute.go +++ b/service/ec2/api_op_ResetInstanceAttribute.go @@ -69,6 +69,9 @@ func addOperationResetInstanceAttributeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationResetInstanceAttributeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ResetNetworkInterfaceAttribute.go b/service/ec2/api_op_ResetNetworkInterfaceAttribute.go index 6ad4f06474e..ad17388ffc7 100644 --- a/service/ec2/api_op_ResetNetworkInterfaceAttribute.go +++ b/service/ec2/api_op_ResetNetworkInterfaceAttribute.go @@ -59,6 +59,9 @@ func addOperationResetNetworkInterfaceAttributeMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationResetNetworkInterfaceAttributeMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_ResetSnapshotAttribute.go b/service/ec2/api_op_ResetSnapshotAttribute.go index 21db972c9ab..b579e36a53f 100644 --- a/service/ec2/api_op_ResetSnapshotAttribute.go +++ b/service/ec2/api_op_ResetSnapshotAttribute.go @@ -64,6 +64,9 @@ func addOperationResetSnapshotAttributeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationResetSnapshotAttributeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RestoreAddressToClassic.go b/service/ec2/api_op_RestoreAddressToClassic.go index 6178dafef22..5cccddea14c 100644 --- a/service/ec2/api_op_RestoreAddressToClassic.go +++ b/service/ec2/api_op_RestoreAddressToClassic.go @@ -65,6 +65,9 @@ func addOperationRestoreAddressToClassicMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationRestoreAddressToClassicMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RestoreManagedPrefixListVersion.go b/service/ec2/api_op_RestoreManagedPrefixListVersion.go index 7f9ae4ba9e1..1247739f0b1 100644 --- a/service/ec2/api_op_RestoreManagedPrefixListVersion.go +++ b/service/ec2/api_op_RestoreManagedPrefixListVersion.go @@ -70,6 +70,9 @@ func addOperationRestoreManagedPrefixListVersionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationRestoreManagedPrefixListVersionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RevokeClientVpnIngress.go b/service/ec2/api_op_RevokeClientVpnIngress.go index 3e614607da7..f84c67956da 100644 --- a/service/ec2/api_op_RevokeClientVpnIngress.go +++ b/service/ec2/api_op_RevokeClientVpnIngress.go @@ -72,6 +72,9 @@ func addOperationRevokeClientVpnIngressMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationRevokeClientVpnIngressMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RevokeSecurityGroupEgress.go b/service/ec2/api_op_RevokeSecurityGroupEgress.go index ef9d86d125f..e899a32f12b 100644 --- a/service/ec2/api_op_RevokeSecurityGroupEgress.go +++ b/service/ec2/api_op_RevokeSecurityGroupEgress.go @@ -102,6 +102,9 @@ func addOperationRevokeSecurityGroupEgressMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationRevokeSecurityGroupEgressMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RevokeSecurityGroupIngress.go b/service/ec2/api_op_RevokeSecurityGroupIngress.go index 324343433f6..85d69304101 100644 --- a/service/ec2/api_op_RevokeSecurityGroupIngress.go +++ b/service/ec2/api_op_RevokeSecurityGroupIngress.go @@ -116,6 +116,9 @@ func addOperationRevokeSecurityGroupIngressMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationRevokeSecurityGroupIngressMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RunInstances.go b/service/ec2/api_op_RunInstances.go index 93c5d9634ab..46983ce0ff3 100644 --- a/service/ec2/api_op_RunInstances.go +++ b/service/ec2/api_op_RunInstances.go @@ -363,6 +363,9 @@ func addOperationRunInstancesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -408,6 +411,9 @@ func addOperationRunInstancesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_RunScheduledInstances.go b/service/ec2/api_op_RunScheduledInstances.go index a6918ce2500..de291157381 100644 --- a/service/ec2/api_op_RunScheduledInstances.go +++ b/service/ec2/api_op_RunScheduledInstances.go @@ -84,6 +84,9 @@ func addOperationRunScheduledInstancesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationRunScheduledInstancesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_SearchLocalGatewayRoutes.go b/service/ec2/api_op_SearchLocalGatewayRoutes.go index 234874d218c..d206fffcd18 100644 --- a/service/ec2/api_op_SearchLocalGatewayRoutes.go +++ b/service/ec2/api_op_SearchLocalGatewayRoutes.go @@ -75,6 +75,9 @@ func addOperationSearchLocalGatewayRoutesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationSearchLocalGatewayRoutesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go b/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go index 29e1cb8119f..07fc8624008 100644 --- a/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go +++ b/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go @@ -102,6 +102,9 @@ func addOperationSearchTransitGatewayMulticastGroupsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationSearchTransitGatewayMulticastGroupsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_SearchTransitGatewayRoutes.go b/service/ec2/api_op_SearchTransitGatewayRoutes.go index 0d2a96e7396..e2f5a62ebc5 100644 --- a/service/ec2/api_op_SearchTransitGatewayRoutes.go +++ b/service/ec2/api_op_SearchTransitGatewayRoutes.go @@ -103,6 +103,9 @@ func addOperationSearchTransitGatewayRoutesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationSearchTransitGatewayRoutesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_SendDiagnosticInterrupt.go b/service/ec2/api_op_SendDiagnosticInterrupt.go index 6d48f9be01b..c4b7d218d43 100644 --- a/service/ec2/api_op_SendDiagnosticInterrupt.go +++ b/service/ec2/api_op_SendDiagnosticInterrupt.go @@ -68,6 +68,9 @@ func addOperationSendDiagnosticInterruptMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationSendDiagnosticInterruptMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_StartInstances.go b/service/ec2/api_op_StartInstances.go index 9b961ff5067..8b8b40ef8d2 100644 --- a/service/ec2/api_op_StartInstances.go +++ b/service/ec2/api_op_StartInstances.go @@ -79,6 +79,9 @@ func addOperationStartInstancesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationStartInstancesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go b/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go index afab5b9ded5..164fb986639 100644 --- a/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go +++ b/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go @@ -65,6 +65,9 @@ func addOperationStartVpcEndpointServicePrivateDnsVerificationMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationStartVpcEndpointServicePrivateDnsVerificationMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_StopInstances.go b/service/ec2/api_op_StopInstances.go index ef07f3b6ed5..95caf71f3dc 100644 --- a/service/ec2/api_op_StopInstances.go +++ b/service/ec2/api_op_StopInstances.go @@ -112,6 +112,9 @@ func addOperationStopInstancesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationStopInstancesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_TerminateClientVpnConnections.go b/service/ec2/api_op_TerminateClientVpnConnections.go index f4299c55070..be6e3766dba 100644 --- a/service/ec2/api_op_TerminateClientVpnConnections.go +++ b/service/ec2/api_op_TerminateClientVpnConnections.go @@ -75,6 +75,9 @@ func addOperationTerminateClientVpnConnectionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationTerminateClientVpnConnectionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_TerminateInstances.go b/service/ec2/api_op_TerminateInstances.go index 545690c716a..bf117f2fbf6 100644 --- a/service/ec2/api_op_TerminateInstances.go +++ b/service/ec2/api_op_TerminateInstances.go @@ -78,6 +78,9 @@ func addOperationTerminateInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationTerminateInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_UnassignIpv6Addresses.go b/service/ec2/api_op_UnassignIpv6Addresses.go index f2012da23ed..721f1b332d1 100644 --- a/service/ec2/api_op_UnassignIpv6Addresses.go +++ b/service/ec2/api_op_UnassignIpv6Addresses.go @@ -60,6 +60,9 @@ func addOperationUnassignIpv6AddressesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUnassignIpv6AddressesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_UnassignPrivateIpAddresses.go b/service/ec2/api_op_UnassignPrivateIpAddresses.go index c6c018dcbe7..a18281b59a2 100644 --- a/service/ec2/api_op_UnassignPrivateIpAddresses.go +++ b/service/ec2/api_op_UnassignPrivateIpAddresses.go @@ -55,6 +55,9 @@ func addOperationUnassignPrivateIpAddressesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUnassignPrivateIpAddressesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_UnmonitorInstances.go b/service/ec2/api_op_UnmonitorInstances.go index 56ec32f2ad4..b0cfcb38cc3 100644 --- a/service/ec2/api_op_UnmonitorInstances.go +++ b/service/ec2/api_op_UnmonitorInstances.go @@ -62,6 +62,9 @@ func addOperationUnmonitorInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUnmonitorInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go index d0343676cdf..15db762f7dc 100644 --- a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go +++ b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go @@ -72,6 +72,9 @@ func addOperationUpdateSecurityGroupRuleDescriptionsEgressMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateSecurityGroupRuleDescriptionsEgressMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go index 68ae565f284..bb7682f8c59 100644 --- a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go +++ b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go @@ -72,6 +72,9 @@ func addOperationUpdateSecurityGroupRuleDescriptionsIngressMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateSecurityGroupRuleDescriptionsIngressMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/api_op_WithdrawByoipCidr.go b/service/ec2/api_op_WithdrawByoipCidr.go index 3a9b3f11ebc..749584ca606 100644 --- a/service/ec2/api_op_WithdrawByoipCidr.go +++ b/service/ec2/api_op_WithdrawByoipCidr.go @@ -62,6 +62,9 @@ func addOperationWithdrawByoipCidrMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationWithdrawByoipCidrMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2/go.mod b/service/ec2/go.mod index 456550b89dc..ca9ab136373 100644 --- a/service/ec2/go.mod +++ b/service/ec2/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v0.1.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ec2/go.sum b/service/ec2/go.sum index f8642733024..8a4986a5fc4 100644 --- a/service/ec2/go.sum +++ b/service/ec2/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ec2instanceconnect/api_client.go b/service/ec2instanceconnect/api_client.go index c58b963748a..0f0bd09aafc 100644 --- a/service/ec2instanceconnect/api_client.go +++ b/service/ec2instanceconnect/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ec2instanceconnect/api_op_SendSSHPublicKey.go b/service/ec2instanceconnect/api_op_SendSSHPublicKey.go index 09588849ac7..b06b3355077 100644 --- a/service/ec2instanceconnect/api_op_SendSSHPublicKey.go +++ b/service/ec2instanceconnect/api_op_SendSSHPublicKey.go @@ -73,6 +73,9 @@ func addOperationSendSSHPublicKeyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSendSSHPublicKeyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ec2instanceconnect/go.mod b/service/ec2instanceconnect/go.mod index 62bad8ab31f..633cc4df6fe 100644 --- a/service/ec2instanceconnect/go.mod +++ b/service/ec2instanceconnect/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ec2instanceconnect/go.sum b/service/ec2instanceconnect/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ec2instanceconnect/go.sum +++ b/service/ec2instanceconnect/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ecr/api_client.go b/service/ecr/api_client.go index 7c2dc935475..e3d65f2820a 100644 --- a/service/ecr/api_client.go +++ b/service/ecr/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ecr/api_op_BatchCheckLayerAvailability.go b/service/ecr/api_op_BatchCheckLayerAvailability.go index 3072cfbcb7a..d801cb83d18 100644 --- a/service/ecr/api_op_BatchCheckLayerAvailability.go +++ b/service/ecr/api_op_BatchCheckLayerAvailability.go @@ -71,6 +71,9 @@ func addOperationBatchCheckLayerAvailabilityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchCheckLayerAvailabilityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_BatchDeleteImage.go b/service/ecr/api_op_BatchDeleteImage.go index 272359be662..1adff1a2ff8 100644 --- a/service/ecr/api_op_BatchDeleteImage.go +++ b/service/ecr/api_op_BatchDeleteImage.go @@ -72,6 +72,9 @@ func addOperationBatchDeleteImageMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationBatchDeleteImageMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_BatchGetImage.go b/service/ecr/api_op_BatchGetImage.go index 38d15a6f450..c226865afa5 100644 --- a/service/ecr/api_op_BatchGetImage.go +++ b/service/ecr/api_op_BatchGetImage.go @@ -74,6 +74,9 @@ func addOperationBatchGetImageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationBatchGetImageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_CompleteLayerUpload.go b/service/ecr/api_op_CompleteLayerUpload.go index 200280c26b3..356417f0f3e 100644 --- a/service/ecr/api_op_CompleteLayerUpload.go +++ b/service/ecr/api_op_CompleteLayerUpload.go @@ -82,6 +82,9 @@ func addOperationCompleteLayerUploadMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCompleteLayerUploadMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_CreateRepository.go b/service/ecr/api_op_CreateRepository.go index 28fef983453..9c23c3b2b24 100644 --- a/service/ecr/api_op_CreateRepository.go +++ b/service/ecr/api_op_CreateRepository.go @@ -78,6 +78,9 @@ func addOperationCreateRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_DeleteLifecyclePolicy.go b/service/ecr/api_op_DeleteLifecyclePolicy.go index bd140625934..a4a0940515e 100644 --- a/service/ecr/api_op_DeleteLifecyclePolicy.go +++ b/service/ecr/api_op_DeleteLifecyclePolicy.go @@ -66,6 +66,9 @@ func addOperationDeleteLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_DeleteRepository.go b/service/ecr/api_op_DeleteRepository.go index 5fab16d6451..5f3e2ed6467 100644 --- a/service/ecr/api_op_DeleteRepository.go +++ b/service/ecr/api_op_DeleteRepository.go @@ -61,6 +61,9 @@ func addOperationDeleteRepositoryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteRepositoryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_DeleteRepositoryPolicy.go b/service/ecr/api_op_DeleteRepositoryPolicy.go index f4084944591..e5a76238302 100644 --- a/service/ecr/api_op_DeleteRepositoryPolicy.go +++ b/service/ecr/api_op_DeleteRepositoryPolicy.go @@ -64,6 +64,9 @@ func addOperationDeleteRepositoryPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteRepositoryPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_DescribeImageScanFindings.go b/service/ecr/api_op_DescribeImageScanFindings.go index ec03de82b8c..0806e163f0e 100644 --- a/service/ecr/api_op_DescribeImageScanFindings.go +++ b/service/ecr/api_op_DescribeImageScanFindings.go @@ -98,6 +98,9 @@ func addOperationDescribeImageScanFindingsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeImageScanFindingsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_DescribeImages.go b/service/ecr/api_op_DescribeImages.go index aa00d8efb9d..7c25be700bc 100644 --- a/service/ecr/api_op_DescribeImages.go +++ b/service/ecr/api_op_DescribeImages.go @@ -91,6 +91,9 @@ func addOperationDescribeImagesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeImagesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_DescribeRepositories.go b/service/ecr/api_op_DescribeRepositories.go index ea11af1d04f..364a3113a9d 100644 --- a/service/ecr/api_op_DescribeRepositories.go +++ b/service/ecr/api_op_DescribeRepositories.go @@ -83,6 +83,9 @@ func addOperationDescribeRepositoriesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeRepositoriesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_GetAuthorizationToken.go b/service/ecr/api_op_GetAuthorizationToken.go index bfc3a7f90d3..f09df87f82d 100644 --- a/service/ecr/api_op_GetAuthorizationToken.go +++ b/service/ecr/api_op_GetAuthorizationToken.go @@ -62,6 +62,9 @@ func addOperationGetAuthorizationTokenMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetAuthorizationTokenMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_GetDownloadUrlForLayer.go b/service/ecr/api_op_GetDownloadUrlForLayer.go index b2da2ff6290..c82254cf6d8 100644 --- a/service/ecr/api_op_GetDownloadUrlForLayer.go +++ b/service/ecr/api_op_GetDownloadUrlForLayer.go @@ -69,6 +69,9 @@ func addOperationGetDownloadUrlForLayerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetDownloadUrlForLayerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_GetLifecyclePolicy.go b/service/ecr/api_op_GetLifecyclePolicy.go index 70ed95a7884..e001fef819f 100644 --- a/service/ecr/api_op_GetLifecyclePolicy.go +++ b/service/ecr/api_op_GetLifecyclePolicy.go @@ -66,6 +66,9 @@ func addOperationGetLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_GetLifecyclePolicyPreview.go b/service/ecr/api_op_GetLifecyclePolicyPreview.go index f00bd483957..965fa49b6a4 100644 --- a/service/ecr/api_op_GetLifecyclePolicyPreview.go +++ b/service/ecr/api_op_GetLifecyclePolicyPreview.go @@ -106,6 +106,9 @@ func addOperationGetLifecyclePolicyPreviewMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationGetLifecyclePolicyPreviewMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_GetRepositoryPolicy.go b/service/ecr/api_op_GetRepositoryPolicy.go index 76d403de03f..c663f3eaa17 100644 --- a/service/ecr/api_op_GetRepositoryPolicy.go +++ b/service/ecr/api_op_GetRepositoryPolicy.go @@ -62,6 +62,9 @@ func addOperationGetRepositoryPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetRepositoryPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_InitiateLayerUpload.go b/service/ecr/api_op_InitiateLayerUpload.go index b4e3c082743..882ac3e4070 100644 --- a/service/ecr/api_op_InitiateLayerUpload.go +++ b/service/ecr/api_op_InitiateLayerUpload.go @@ -66,6 +66,9 @@ func addOperationInitiateLayerUploadMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationInitiateLayerUploadMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_ListImages.go b/service/ecr/api_op_ListImages.go index 71816173192..9458b5f49dd 100644 --- a/service/ecr/api_op_ListImages.go +++ b/service/ecr/api_op_ListImages.go @@ -89,6 +89,9 @@ func addOperationListImagesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListImagesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_ListTagsForResource.go b/service/ecr/api_op_ListTagsForResource.go index 6af30c4d13a..8afafb4d4d2 100644 --- a/service/ecr/api_op_ListTagsForResource.go +++ b/service/ecr/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_PutImage.go b/service/ecr/api_op_PutImage.go index a85fc8212da..62bafc67f3e 100644 --- a/service/ecr/api_op_PutImage.go +++ b/service/ecr/api_op_PutImage.go @@ -81,6 +81,9 @@ func addOperationPutImageMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationPutImageMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_PutImageScanningConfiguration.go b/service/ecr/api_op_PutImageScanningConfiguration.go index 4ab7fcb3942..667dc4f9efe 100644 --- a/service/ecr/api_op_PutImageScanningConfiguration.go +++ b/service/ecr/api_op_PutImageScanningConfiguration.go @@ -72,6 +72,9 @@ func addOperationPutImageScanningConfigurationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutImageScanningConfigurationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_PutImageTagMutability.go b/service/ecr/api_op_PutImageTagMutability.go index 5a47f39d813..21b4a163810 100644 --- a/service/ecr/api_op_PutImageTagMutability.go +++ b/service/ecr/api_op_PutImageTagMutability.go @@ -74,6 +74,9 @@ func addOperationPutImageTagMutabilityMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationPutImageTagMutabilityMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_PutLifecyclePolicy.go b/service/ecr/api_op_PutLifecyclePolicy.go index 2400ab05b44..22ace79884e 100644 --- a/service/ecr/api_op_PutLifecyclePolicy.go +++ b/service/ecr/api_op_PutLifecyclePolicy.go @@ -69,6 +69,9 @@ func addOperationPutLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationPutLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_SetRepositoryPolicy.go b/service/ecr/api_op_SetRepositoryPolicy.go index d399976b0a0..22f59320fd9 100644 --- a/service/ecr/api_op_SetRepositoryPolicy.go +++ b/service/ecr/api_op_SetRepositoryPolicy.go @@ -79,6 +79,9 @@ func addOperationSetRepositoryPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationSetRepositoryPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_StartImageScan.go b/service/ecr/api_op_StartImageScan.go index 04bb614857a..5e253deb324 100644 --- a/service/ecr/api_op_StartImageScan.go +++ b/service/ecr/api_op_StartImageScan.go @@ -76,6 +76,9 @@ func addOperationStartImageScanMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationStartImageScanMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_StartLifecyclePolicyPreview.go b/service/ecr/api_op_StartLifecyclePolicyPreview.go index 005e640e83a..4e2f84d2202 100644 --- a/service/ecr/api_op_StartLifecyclePolicyPreview.go +++ b/service/ecr/api_op_StartLifecyclePolicyPreview.go @@ -72,6 +72,9 @@ func addOperationStartLifecyclePolicyPreviewMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationStartLifecyclePolicyPreviewMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_TagResource.go b/service/ecr/api_op_TagResource.go index 0e092293fcd..8222ccb4a70 100644 --- a/service/ecr/api_op_TagResource.go +++ b/service/ecr/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_UntagResource.go b/service/ecr/api_op_UntagResource.go index c96f9eab819..a7617569ddb 100644 --- a/service/ecr/api_op_UntagResource.go +++ b/service/ecr/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/api_op_UploadLayerPart.go b/service/ecr/api_op_UploadLayerPart.go index d09b8714a71..3c929429b02 100644 --- a/service/ecr/api_op_UploadLayerPart.go +++ b/service/ecr/api_op_UploadLayerPart.go @@ -91,6 +91,9 @@ func addOperationUploadLayerPartMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationUploadLayerPartMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecr/go.mod b/service/ecr/go.mod index c56ad7de67e..26217ab1024 100644 --- a/service/ecr/go.mod +++ b/service/ecr/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ecr go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ecr/go.sum b/service/ecr/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ecr/go.sum +++ b/service/ecr/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ecs/api_client.go b/service/ecs/api_client.go index ad0fe60e017..b8a46f6328b 100644 --- a/service/ecs/api_client.go +++ b/service/ecs/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ecs/api_op_CreateCapacityProvider.go b/service/ecs/api_op_CreateCapacityProvider.go index b0b25e11b7f..57f076ab2ff 100644 --- a/service/ecs/api_op_CreateCapacityProvider.go +++ b/service/ecs/api_op_CreateCapacityProvider.go @@ -95,6 +95,9 @@ func addOperationCreateCapacityProviderMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateCapacityProviderMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_CreateCluster.go b/service/ecs/api_op_CreateCluster.go index a960d825163..581da1bc026 100644 --- a/service/ecs/api_op_CreateCluster.go +++ b/service/ecs/api_op_CreateCluster.go @@ -127,6 +127,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_CreateService.go b/service/ecs/api_op_CreateService.go index a90cacae57a..6c21fa6660d 100644 --- a/service/ecs/api_op_CreateService.go +++ b/service/ecs/api_op_CreateService.go @@ -388,6 +388,9 @@ func addOperationCreateServiceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -430,6 +433,9 @@ func addOperationCreateServiceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_CreateTaskSet.go b/service/ecs/api_op_CreateTaskSet.go index 5d5766dd78f..20f1dececaf 100644 --- a/service/ecs/api_op_CreateTaskSet.go +++ b/service/ecs/api_op_CreateTaskSet.go @@ -161,6 +161,9 @@ func addOperationCreateTaskSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -203,6 +206,9 @@ func addOperationCreateTaskSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeleteAccountSetting.go b/service/ecs/api_op_DeleteAccountSetting.go index 434188004f8..c0b9566c32f 100644 --- a/service/ecs/api_op_DeleteAccountSetting.go +++ b/service/ecs/api_op_DeleteAccountSetting.go @@ -67,6 +67,9 @@ func addOperationDeleteAccountSettingMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteAccountSettingMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeleteAttributes.go b/service/ecs/api_op_DeleteAttributes.go index d3802194536..90e9ab076fd 100644 --- a/service/ecs/api_op_DeleteAttributes.go +++ b/service/ecs/api_op_DeleteAttributes.go @@ -61,6 +61,9 @@ func addOperationDeleteAttributesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteAttributesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeleteCapacityProvider.go b/service/ecs/api_op_DeleteCapacityProvider.go index da828269c46..d3aa698a666 100644 --- a/service/ecs/api_op_DeleteCapacityProvider.go +++ b/service/ecs/api_op_DeleteCapacityProvider.go @@ -65,6 +65,9 @@ func addOperationDeleteCapacityProviderMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteCapacityProviderMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeleteCluster.go b/service/ecs/api_op_DeleteCluster.go index 8c41fbc65c2..7b5553661cc 100644 --- a/service/ecs/api_op_DeleteCluster.go +++ b/service/ecs/api_op_DeleteCluster.go @@ -59,6 +59,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeleteService.go b/service/ecs/api_op_DeleteService.go index 27f4b05f27d..5d73bebfd72 100644 --- a/service/ecs/api_op_DeleteService.go +++ b/service/ecs/api_op_DeleteService.go @@ -77,6 +77,9 @@ func addOperationDeleteServiceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDeleteServiceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeleteTaskSet.go b/service/ecs/api_op_DeleteTaskSet.go index ba2a216f111..ffcf1ebeaf5 100644 --- a/service/ecs/api_op_DeleteTaskSet.go +++ b/service/ecs/api_op_DeleteTaskSet.go @@ -76,6 +76,9 @@ func addOperationDeleteTaskSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDeleteTaskSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeregisterContainerInstance.go b/service/ecs/api_op_DeregisterContainerInstance.go index b07dd610083..366562b098c 100644 --- a/service/ecs/api_op_DeregisterContainerInstance.go +++ b/service/ecs/api_op_DeregisterContainerInstance.go @@ -84,6 +84,9 @@ func addOperationDeregisterContainerInstanceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDeregisterContainerInstanceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DeregisterTaskDefinition.go b/service/ecs/api_op_DeregisterTaskDefinition.go index c324f7cfba2..3c500942f06 100644 --- a/service/ecs/api_op_DeregisterTaskDefinition.go +++ b/service/ecs/api_op_DeregisterTaskDefinition.go @@ -66,6 +66,9 @@ func addOperationDeregisterTaskDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeregisterTaskDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeCapacityProviders.go b/service/ecs/api_op_DescribeCapacityProviders.go index e934e6afb51..8199fa65b37 100644 --- a/service/ecs/api_op_DescribeCapacityProviders.go +++ b/service/ecs/api_op_DescribeCapacityProviders.go @@ -84,6 +84,9 @@ func addOperationDescribeCapacityProvidersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeCapacityProvidersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeClusters.go b/service/ecs/api_op_DescribeClusters.go index 08714ba4848..7512158d96e 100644 --- a/service/ecs/api_op_DescribeClusters.go +++ b/service/ecs/api_op_DescribeClusters.go @@ -86,6 +86,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeContainerInstances.go b/service/ecs/api_op_DescribeContainerInstances.go index 97f555b3e88..2928b93f24b 100644 --- a/service/ecs/api_op_DescribeContainerInstances.go +++ b/service/ecs/api_op_DescribeContainerInstances.go @@ -70,6 +70,9 @@ func addOperationDescribeContainerInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeContainerInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeServices.go b/service/ecs/api_op_DescribeServices.go index 8168af78caf..6302e46d504 100644 --- a/service/ecs/api_op_DescribeServices.go +++ b/service/ecs/api_op_DescribeServices.go @@ -68,6 +68,9 @@ func addOperationDescribeServicesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeServicesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeTaskDefinition.go b/service/ecs/api_op_DescribeTaskDefinition.go index 9891b66e426..70ba2e62eb4 100644 --- a/service/ecs/api_op_DescribeTaskDefinition.go +++ b/service/ecs/api_op_DescribeTaskDefinition.go @@ -93,6 +93,9 @@ func addOperationDescribeTaskDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeTaskDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeTaskSets.go b/service/ecs/api_op_DescribeTaskSets.go index 9dbebc6c065..8be142bc6ce 100644 --- a/service/ecs/api_op_DescribeTaskSets.go +++ b/service/ecs/api_op_DescribeTaskSets.go @@ -75,6 +75,9 @@ func addOperationDescribeTaskSetsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeTaskSetsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DescribeTasks.go b/service/ecs/api_op_DescribeTasks.go index 5460f2bb31e..8b1ecb744e2 100644 --- a/service/ecs/api_op_DescribeTasks.go +++ b/service/ecs/api_op_DescribeTasks.go @@ -67,6 +67,9 @@ func addOperationDescribeTasksMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeTasksMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_DiscoverPollEndpoint.go b/service/ecs/api_op_DiscoverPollEndpoint.go index 850a50a832e..051be470e26 100644 --- a/service/ecs/api_op_DiscoverPollEndpoint.go +++ b/service/ecs/api_op_DiscoverPollEndpoint.go @@ -63,6 +63,9 @@ func addOperationDiscoverPollEndpointMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDiscoverPollEndpointMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListAccountSettings.go b/service/ecs/api_op_ListAccountSettings.go index 1e8f945c9d3..7440760556b 100644 --- a/service/ecs/api_op_ListAccountSettings.go +++ b/service/ecs/api_op_ListAccountSettings.go @@ -89,6 +89,9 @@ func addOperationListAccountSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListAccountSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListAttributes.go b/service/ecs/api_op_ListAttributes.go index e40a432f2e3..e63fb9ade93 100644 --- a/service/ecs/api_op_ListAttributes.go +++ b/service/ecs/api_op_ListAttributes.go @@ -93,6 +93,9 @@ func addOperationListAttributesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationListAttributesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListClusters.go b/service/ecs/api_op_ListClusters.go index 2b3d70aed27..5db53eb06bf 100644 --- a/service/ecs/api_op_ListClusters.go +++ b/service/ecs/api_op_ListClusters.go @@ -71,6 +71,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListContainerInstances.go b/service/ecs/api_op_ListContainerInstances.go index b9c31af1c1e..c428f1354c1 100644 --- a/service/ecs/api_op_ListContainerInstances.go +++ b/service/ecs/api_op_ListContainerInstances.go @@ -96,6 +96,9 @@ func addOperationListContainerInstancesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationListContainerInstancesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListServices.go b/service/ecs/api_op_ListServices.go index 1d62f0db944..fcb6cb063bc 100644 --- a/service/ecs/api_op_ListServices.go +++ b/service/ecs/api_op_ListServices.go @@ -83,6 +83,9 @@ func addOperationListServicesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListServicesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListTagsForResource.go b/service/ecs/api_op_ListTagsForResource.go index bd43fcb1639..f0ccba82f82 100644 --- a/service/ecs/api_op_ListTagsForResource.go +++ b/service/ecs/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListTaskDefinitionFamilies.go b/service/ecs/api_op_ListTaskDefinitionFamilies.go index 4640a2dacee..5e96b53c80c 100644 --- a/service/ecs/api_op_ListTaskDefinitionFamilies.go +++ b/service/ecs/api_op_ListTaskDefinitionFamilies.go @@ -92,6 +92,9 @@ func addOperationListTaskDefinitionFamiliesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListTaskDefinitionFamiliesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListTaskDefinitions.go b/service/ecs/api_op_ListTaskDefinitions.go index 3909e8a1f3a..6c8abcb592e 100644 --- a/service/ecs/api_op_ListTaskDefinitions.go +++ b/service/ecs/api_op_ListTaskDefinitions.go @@ -94,6 +94,9 @@ func addOperationListTaskDefinitionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListTaskDefinitionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_ListTasks.go b/service/ecs/api_op_ListTasks.go index c12ed43c04f..a4c74c6a08c 100644 --- a/service/ecs/api_op_ListTasks.go +++ b/service/ecs/api_op_ListTasks.go @@ -109,6 +109,9 @@ func addOperationListTasksMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationListTasksMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_PutAccountSetting.go b/service/ecs/api_op_PutAccountSetting.go index ea8d4382c07..0c2185a6c00 100644 --- a/service/ecs/api_op_PutAccountSetting.go +++ b/service/ecs/api_op_PutAccountSetting.go @@ -100,6 +100,9 @@ func addOperationPutAccountSettingMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationPutAccountSettingMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_PutAccountSettingDefault.go b/service/ecs/api_op_PutAccountSettingDefault.go index 23b6814ab64..71bd16cc4cf 100644 --- a/service/ecs/api_op_PutAccountSettingDefault.go +++ b/service/ecs/api_op_PutAccountSettingDefault.go @@ -68,6 +68,9 @@ func addOperationPutAccountSettingDefaultMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutAccountSettingDefaultMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_PutAttributes.go b/service/ecs/api_op_PutAttributes.go index 7d5fcce14c9..b19efc369d4 100644 --- a/service/ecs/api_op_PutAttributes.go +++ b/service/ecs/api_op_PutAttributes.go @@ -64,6 +64,9 @@ func addOperationPutAttributesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationPutAttributesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_PutClusterCapacityProviders.go b/service/ecs/api_op_PutClusterCapacityProviders.go index 12e18ca1449..d7b69ce28b2 100644 --- a/service/ecs/api_op_PutClusterCapacityProviders.go +++ b/service/ecs/api_op_PutClusterCapacityProviders.go @@ -99,6 +99,9 @@ func addOperationPutClusterCapacityProvidersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationPutClusterCapacityProvidersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_RegisterContainerInstance.go b/service/ecs/api_op_RegisterContainerInstance.go index b599f1672ba..32506b7a188 100644 --- a/service/ecs/api_op_RegisterContainerInstance.go +++ b/service/ecs/api_op_RegisterContainerInstance.go @@ -112,6 +112,9 @@ func addOperationRegisterContainerInstanceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationRegisterContainerInstanceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_RegisterTaskDefinition.go b/service/ecs/api_op_RegisterTaskDefinition.go index ae495ba6a07..0b9ae4257f7 100644 --- a/service/ecs/api_op_RegisterTaskDefinition.go +++ b/service/ecs/api_op_RegisterTaskDefinition.go @@ -291,6 +291,9 @@ func addOperationRegisterTaskDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -333,6 +336,9 @@ func addOperationRegisterTaskDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_RunTask.go b/service/ecs/api_op_RunTask.go index 312be81509f..7214f6013ad 100644 --- a/service/ecs/api_op_RunTask.go +++ b/service/ecs/api_op_RunTask.go @@ -212,6 +212,9 @@ func addOperationRunTaskMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -254,6 +257,9 @@ func addOperationRunTaskMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_StartTask.go b/service/ecs/api_op_StartTask.go index 7b6eb637988..3cf762cc180 100644 --- a/service/ecs/api_op_StartTask.go +++ b/service/ecs/api_op_StartTask.go @@ -145,6 +145,9 @@ func addOperationStartTaskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationStartTaskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_StopTask.go b/service/ecs/api_op_StopTask.go index bded67a52f6..ee4f266997f 100644 --- a/service/ecs/api_op_StopTask.go +++ b/service/ecs/api_op_StopTask.go @@ -73,6 +73,9 @@ func addOperationStopTaskMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationStopTaskMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_SubmitAttachmentStateChanges.go b/service/ecs/api_op_SubmitAttachmentStateChanges.go index 724ddf96511..443aa2890bc 100644 --- a/service/ecs/api_op_SubmitAttachmentStateChanges.go +++ b/service/ecs/api_op_SubmitAttachmentStateChanges.go @@ -58,6 +58,9 @@ func addOperationSubmitAttachmentStateChangesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationSubmitAttachmentStateChangesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_SubmitContainerStateChange.go b/service/ecs/api_op_SubmitContainerStateChange.go index 125e14c8085..b4be9a281f2 100644 --- a/service/ecs/api_op_SubmitContainerStateChange.go +++ b/service/ecs/api_op_SubmitContainerStateChange.go @@ -74,6 +74,9 @@ func addOperationSubmitContainerStateChangeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSubmitContainerStateChangeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_SubmitTaskStateChange.go b/service/ecs/api_op_SubmitTaskStateChange.go index 23386be0087..c5f6e51f0c8 100644 --- a/service/ecs/api_op_SubmitTaskStateChange.go +++ b/service/ecs/api_op_SubmitTaskStateChange.go @@ -78,6 +78,9 @@ func addOperationSubmitTaskStateChangeMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationSubmitTaskStateChangeMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_TagResource.go b/service/ecs/api_op_TagResource.go index 6495aaa24d6..ddb74a18c1b 100644 --- a/service/ecs/api_op_TagResource.go +++ b/service/ecs/api_op_TagResource.go @@ -85,6 +85,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UntagResource.go b/service/ecs/api_op_UntagResource.go index 00a448143c5..2c4dbd41db2 100644 --- a/service/ecs/api_op_UntagResource.go +++ b/service/ecs/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UpdateClusterSettings.go b/service/ecs/api_op_UpdateClusterSettings.go index d7b42b0fde8..253bef78ed0 100644 --- a/service/ecs/api_op_UpdateClusterSettings.go +++ b/service/ecs/api_op_UpdateClusterSettings.go @@ -64,6 +64,9 @@ func addOperationUpdateClusterSettingsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateClusterSettingsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UpdateContainerAgent.go b/service/ecs/api_op_UpdateContainerAgent.go index 5e6e540f396..a32f9cfd70a 100644 --- a/service/ecs/api_op_UpdateContainerAgent.go +++ b/service/ecs/api_op_UpdateContainerAgent.go @@ -68,6 +68,9 @@ func addOperationUpdateContainerAgentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateContainerAgentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UpdateContainerInstancesState.go b/service/ecs/api_op_UpdateContainerInstancesState.go index ed2de4f0737..96a3737cd5c 100644 --- a/service/ecs/api_op_UpdateContainerInstancesState.go +++ b/service/ecs/api_op_UpdateContainerInstancesState.go @@ -112,6 +112,9 @@ func addOperationUpdateContainerInstancesStateMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationUpdateContainerInstancesStateMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UpdateService.go b/service/ecs/api_op_UpdateService.go index 744eb8e5e08..dbca9a5a66a 100644 --- a/service/ecs/api_op_UpdateService.go +++ b/service/ecs/api_op_UpdateService.go @@ -233,6 +233,9 @@ func addOperationUpdateServiceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -275,6 +278,9 @@ func addOperationUpdateServiceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UpdateServicePrimaryTaskSet.go b/service/ecs/api_op_UpdateServicePrimaryTaskSet.go index 152ccbb7bf6..1b6b80d8ee8 100644 --- a/service/ecs/api_op_UpdateServicePrimaryTaskSet.go +++ b/service/ecs/api_op_UpdateServicePrimaryTaskSet.go @@ -74,6 +74,9 @@ func addOperationUpdateServicePrimaryTaskSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateServicePrimaryTaskSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/api_op_UpdateTaskSet.go b/service/ecs/api_op_UpdateTaskSet.go index 91da71299c2..11eaf6a2c5a 100644 --- a/service/ecs/api_op_UpdateTaskSet.go +++ b/service/ecs/api_op_UpdateTaskSet.go @@ -77,6 +77,9 @@ func addOperationUpdateTaskSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateTaskSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ecs/go.mod b/service/ecs/go.mod index dc81ea85d5b..fe357227b38 100644 --- a/service/ecs/go.mod +++ b/service/ecs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ecs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ecs/go.sum b/service/ecs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ecs/go.sum +++ b/service/ecs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/efs/api_client.go b/service/efs/api_client.go index 3e07b897807..4c4456adfa1 100644 --- a/service/efs/api_client.go +++ b/service/efs/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/efs/api_op_CreateAccessPoint.go b/service/efs/api_op_CreateAccessPoint.go index 29539dac533..0e5485ad4cd 100644 --- a/service/efs/api_op_CreateAccessPoint.go +++ b/service/efs/api_op_CreateAccessPoint.go @@ -116,6 +116,9 @@ func addOperationCreateAccessPointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationCreateAccessPointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_CreateFileSystem.go b/service/efs/api_op_CreateFileSystem.go index 0fee1329725..5d9210a4ed0 100644 --- a/service/efs/api_op_CreateFileSystem.go +++ b/service/efs/api_op_CreateFileSystem.go @@ -247,6 +247,9 @@ func addOperationCreateFileSystemMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -292,6 +295,9 @@ func addOperationCreateFileSystemMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_CreateMountTarget.go b/service/efs/api_op_CreateMountTarget.go index c6c5924044a..c4d93469d77 100644 --- a/service/efs/api_op_CreateMountTarget.go +++ b/service/efs/api_op_CreateMountTarget.go @@ -207,6 +207,9 @@ func addOperationCreateMountTargetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -249,6 +252,9 @@ func addOperationCreateMountTargetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_CreateTags.go b/service/efs/api_op_CreateTags.go index 9ad5c77cd3f..7ba26dab750 100644 --- a/service/efs/api_op_CreateTags.go +++ b/service/efs/api_op_CreateTags.go @@ -61,6 +61,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DeleteAccessPoint.go b/service/efs/api_op_DeleteAccessPoint.go index 1ee7702dd0e..eb1fb82c50a 100644 --- a/service/efs/api_op_DeleteAccessPoint.go +++ b/service/efs/api_op_DeleteAccessPoint.go @@ -52,6 +52,9 @@ func addOperationDeleteAccessPointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteAccessPointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DeleteFileSystem.go b/service/efs/api_op_DeleteFileSystem.go index 2d905608ba3..83de0f80d85 100644 --- a/service/efs/api_op_DeleteFileSystem.go +++ b/service/efs/api_op_DeleteFileSystem.go @@ -59,6 +59,9 @@ func addOperationDeleteFileSystemMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteFileSystemMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DeleteFileSystemPolicy.go b/service/efs/api_op_DeleteFileSystemPolicy.go index 90213a6f66b..8af9db3bffc 100644 --- a/service/efs/api_op_DeleteFileSystemPolicy.go +++ b/service/efs/api_op_DeleteFileSystemPolicy.go @@ -54,6 +54,9 @@ func addOperationDeleteFileSystemPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteFileSystemPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DeleteMountTarget.go b/service/efs/api_op_DeleteMountTarget.go index 5d57b9b105c..1f634d14d08 100644 --- a/service/efs/api_op_DeleteMountTarget.go +++ b/service/efs/api_op_DeleteMountTarget.go @@ -69,6 +69,9 @@ func addOperationDeleteMountTargetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteMountTargetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DeleteTags.go b/service/efs/api_op_DeleteTags.go index a35da408c27..d9886bf3589 100644 --- a/service/efs/api_op_DeleteTags.go +++ b/service/efs/api_op_DeleteTags.go @@ -60,6 +60,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeAccessPoints.go b/service/efs/api_op_DescribeAccessPoints.go index 0cea17f122a..dd87bdeeab4 100644 --- a/service/efs/api_op_DescribeAccessPoints.go +++ b/service/efs/api_op_DescribeAccessPoints.go @@ -74,6 +74,9 @@ func addOperationDescribeAccessPointsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeAccessPointsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeBackupPolicy.go b/service/efs/api_op_DescribeBackupPolicy.go index afb460e1251..635c3239f93 100644 --- a/service/efs/api_op_DescribeBackupPolicy.go +++ b/service/efs/api_op_DescribeBackupPolicy.go @@ -54,6 +54,9 @@ func addOperationDescribeBackupPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeBackupPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeFileSystemPolicy.go b/service/efs/api_op_DescribeFileSystemPolicy.go index 80097a54e1c..68fbd158b93 100644 --- a/service/efs/api_op_DescribeFileSystemPolicy.go +++ b/service/efs/api_op_DescribeFileSystemPolicy.go @@ -56,6 +56,9 @@ func addOperationDescribeFileSystemPolicyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeFileSystemPolicyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeFileSystems.go b/service/efs/api_op_DescribeFileSystems.go index f59969c5926..9421a05aa33 100644 --- a/service/efs/api_op_DescribeFileSystems.go +++ b/service/efs/api_op_DescribeFileSystems.go @@ -91,6 +91,9 @@ func addOperationDescribeFileSystemsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeFileSystemsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeLifecycleConfiguration.go b/service/efs/api_op_DescribeLifecycleConfiguration.go index 7e9ea279491..3b1855248ef 100644 --- a/service/efs/api_op_DescribeLifecycleConfiguration.go +++ b/service/efs/api_op_DescribeLifecycleConfiguration.go @@ -60,6 +60,9 @@ func addOperationDescribeLifecycleConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeLifecycleConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeMountTargetSecurityGroups.go b/service/efs/api_op_DescribeMountTargetSecurityGroups.go index 29ef0733265..7a634896355 100644 --- a/service/efs/api_op_DescribeMountTargetSecurityGroups.go +++ b/service/efs/api_op_DescribeMountTargetSecurityGroups.go @@ -65,6 +65,9 @@ func addOperationDescribeMountTargetSecurityGroupsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeMountTargetSecurityGroupsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeMountTargets.go b/service/efs/api_op_DescribeMountTargets.go index 8dd65a5a668..180fec9e49b 100644 --- a/service/efs/api_op_DescribeMountTargets.go +++ b/service/efs/api_op_DescribeMountTargets.go @@ -90,6 +90,9 @@ func addOperationDescribeMountTargetsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeMountTargetsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_DescribeTags.go b/service/efs/api_op_DescribeTags.go index 620604d6016..6e0458ffc07 100644 --- a/service/efs/api_op_DescribeTags.go +++ b/service/efs/api_op_DescribeTags.go @@ -80,6 +80,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_ListTagsForResource.go b/service/efs/api_op_ListTagsForResource.go index d99c2a05f71..6cda5136de5 100644 --- a/service/efs/api_op_ListTagsForResource.go +++ b/service/efs/api_op_ListTagsForResource.go @@ -68,6 +68,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_ModifyMountTargetSecurityGroups.go b/service/efs/api_op_ModifyMountTargetSecurityGroups.go index cd301b2bc96..185d68cf18c 100644 --- a/service/efs/api_op_ModifyMountTargetSecurityGroups.go +++ b/service/efs/api_op_ModifyMountTargetSecurityGroups.go @@ -65,6 +65,9 @@ func addOperationModifyMountTargetSecurityGroupsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationModifyMountTargetSecurityGroupsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_PutBackupPolicy.go b/service/efs/api_op_PutBackupPolicy.go index fe4f462398b..2f0d5d734f9 100644 --- a/service/efs/api_op_PutBackupPolicy.go +++ b/service/efs/api_op_PutBackupPolicy.go @@ -60,6 +60,9 @@ func addOperationPutBackupPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutBackupPolicyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_PutFileSystemPolicy.go b/service/efs/api_op_PutFileSystemPolicy.go index e39650fe1f2..7f54b9fe454 100644 --- a/service/efs/api_op_PutFileSystemPolicy.go +++ b/service/efs/api_op_PutFileSystemPolicy.go @@ -82,6 +82,9 @@ func addOperationPutFileSystemPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationPutFileSystemPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_PutLifecycleConfiguration.go b/service/efs/api_op_PutLifecycleConfiguration.go index 0791bac065a..14c3dcddc69 100644 --- a/service/efs/api_op_PutLifecycleConfiguration.go +++ b/service/efs/api_op_PutLifecycleConfiguration.go @@ -86,6 +86,9 @@ func addOperationPutLifecycleConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationPutLifecycleConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_TagResource.go b/service/efs/api_op_TagResource.go index 50ab71cade4..3fd612f5403 100644 --- a/service/efs/api_op_TagResource.go +++ b/service/efs/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_UntagResource.go b/service/efs/api_op_UntagResource.go index bc8beed9dfb..a8b1f8f57f8 100644 --- a/service/efs/api_op_UntagResource.go +++ b/service/efs/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/api_op_UpdateFileSystem.go b/service/efs/api_op_UpdateFileSystem.go index cb9694fc838..dfe79eb42ec 100644 --- a/service/efs/api_op_UpdateFileSystem.go +++ b/service/efs/api_op_UpdateFileSystem.go @@ -156,6 +156,9 @@ func addOperationUpdateFileSystemMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -198,6 +201,9 @@ func addOperationUpdateFileSystemMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/efs/go.mod b/service/efs/go.mod index 49ed949616e..9f13763e5f2 100644 --- a/service/efs/go.mod +++ b/service/efs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/efs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/efs/go.sum b/service/efs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/efs/go.sum +++ b/service/efs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/eks/api_client.go b/service/eks/api_client.go index 1c20e3a4f09..54ca5d2e1df 100644 --- a/service/eks/api_client.go +++ b/service/eks/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/eks/api_op_CreateCluster.go b/service/eks/api_op_CreateCluster.go index f7a4d97c05a..df11ca171d7 100644 --- a/service/eks/api_op_CreateCluster.go +++ b/service/eks/api_op_CreateCluster.go @@ -137,6 +137,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_CreateFargateProfile.go b/service/eks/api_op_CreateFargateProfile.go index f933592001b..51b9aefc364 100644 --- a/service/eks/api_op_CreateFargateProfile.go +++ b/service/eks/api_op_CreateFargateProfile.go @@ -117,6 +117,9 @@ func addOperationCreateFargateProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationCreateFargateProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_CreateNodegroup.go b/service/eks/api_op_CreateNodegroup.go index 5ee0cb54857..ad48d2c5871 100644 --- a/service/eks/api_op_CreateNodegroup.go +++ b/service/eks/api_op_CreateNodegroup.go @@ -186,6 +186,9 @@ func addOperationCreateNodegroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -231,6 +234,9 @@ func addOperationCreateNodegroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DeleteCluster.go b/service/eks/api_op_DeleteCluster.go index 4354d5b8d11..0e85f5a3600 100644 --- a/service/eks/api_op_DeleteCluster.go +++ b/service/eks/api_op_DeleteCluster.go @@ -61,6 +61,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DeleteFargateProfile.go b/service/eks/api_op_DeleteFargateProfile.go index ef3195decaf..a69d01e5b0a 100644 --- a/service/eks/api_op_DeleteFargateProfile.go +++ b/service/eks/api_op_DeleteFargateProfile.go @@ -66,6 +66,9 @@ func addOperationDeleteFargateProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteFargateProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DeleteNodegroup.go b/service/eks/api_op_DeleteNodegroup.go index 789015c74e1..6738b4ac40c 100644 --- a/service/eks/api_op_DeleteNodegroup.go +++ b/service/eks/api_op_DeleteNodegroup.go @@ -58,6 +58,9 @@ func addOperationDeleteNodegroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteNodegroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DescribeCluster.go b/service/eks/api_op_DescribeCluster.go index c9f003e590e..1f317eb9602 100644 --- a/service/eks/api_op_DescribeCluster.go +++ b/service/eks/api_op_DescribeCluster.go @@ -59,6 +59,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DescribeFargateProfile.go b/service/eks/api_op_DescribeFargateProfile.go index 7c7f07d2c5a..213b0484ab7 100644 --- a/service/eks/api_op_DescribeFargateProfile.go +++ b/service/eks/api_op_DescribeFargateProfile.go @@ -58,6 +58,9 @@ func addOperationDescribeFargateProfileMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeFargateProfileMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DescribeNodegroup.go b/service/eks/api_op_DescribeNodegroup.go index a22ec22634f..63f15256f06 100644 --- a/service/eks/api_op_DescribeNodegroup.go +++ b/service/eks/api_op_DescribeNodegroup.go @@ -58,6 +58,9 @@ func addOperationDescribeNodegroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeNodegroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_DescribeUpdate.go b/service/eks/api_op_DescribeUpdate.go index 47d63d13aaa..0647d35b001 100644 --- a/service/eks/api_op_DescribeUpdate.go +++ b/service/eks/api_op_DescribeUpdate.go @@ -64,6 +64,9 @@ func addOperationDescribeUpdateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeUpdateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_ListClusters.go b/service/eks/api_op_ListClusters.go index 946db904f73..c35e8b643b6 100644 --- a/service/eks/api_op_ListClusters.go +++ b/service/eks/api_op_ListClusters.go @@ -70,6 +70,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_ListFargateProfiles.go b/service/eks/api_op_ListFargateProfiles.go index 57478c0b85a..a8d3db2df29 100644 --- a/service/eks/api_op_ListFargateProfiles.go +++ b/service/eks/api_op_ListFargateProfiles.go @@ -75,6 +75,9 @@ func addOperationListFargateProfilesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListFargateProfilesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_ListNodegroups.go b/service/eks/api_op_ListNodegroups.go index 373dd834227..eb85a328442 100644 --- a/service/eks/api_op_ListNodegroups.go +++ b/service/eks/api_op_ListNodegroups.go @@ -75,6 +75,9 @@ func addOperationListNodegroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListNodegroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_ListTagsForResource.go b/service/eks/api_op_ListTagsForResource.go index df16ee4db85..61d6010e299 100644 --- a/service/eks/api_op_ListTagsForResource.go +++ b/service/eks/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_ListUpdates.go b/service/eks/api_op_ListUpdates.go index 5b08da4c400..9a90cf969f7 100644 --- a/service/eks/api_op_ListUpdates.go +++ b/service/eks/api_op_ListUpdates.go @@ -77,6 +77,9 @@ func addOperationListUpdatesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListUpdatesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_TagResource.go b/service/eks/api_op_TagResource.go index 2273097cfa0..abe3ed4bb03 100644 --- a/service/eks/api_op_TagResource.go +++ b/service/eks/api_op_TagResource.go @@ -60,6 +60,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_UntagResource.go b/service/eks/api_op_UntagResource.go index 593afcc1ead..f03817e7066 100644 --- a/service/eks/api_op_UntagResource.go +++ b/service/eks/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_UpdateClusterConfig.go b/service/eks/api_op_UpdateClusterConfig.go index ec509783574..8c30f458df1 100644 --- a/service/eks/api_op_UpdateClusterConfig.go +++ b/service/eks/api_op_UpdateClusterConfig.go @@ -90,6 +90,9 @@ func addOperationUpdateClusterConfigMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationUpdateClusterConfigMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_UpdateClusterVersion.go b/service/eks/api_op_UpdateClusterVersion.go index f3637f07fd4..c8719e02bc8 100644 --- a/service/eks/api_op_UpdateClusterVersion.go +++ b/service/eks/api_op_UpdateClusterVersion.go @@ -72,6 +72,9 @@ func addOperationUpdateClusterVersionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateClusterVersionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_UpdateNodegroupConfig.go b/service/eks/api_op_UpdateNodegroupConfig.go index f21082ae793..27439b887d1 100644 --- a/service/eks/api_op_UpdateNodegroupConfig.go +++ b/service/eks/api_op_UpdateNodegroupConfig.go @@ -74,6 +74,9 @@ func addOperationUpdateNodegroupConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateNodegroupConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/api_op_UpdateNodegroupVersion.go b/service/eks/api_op_UpdateNodegroupVersion.go index fac2cac8dc7..e5810dca002 100644 --- a/service/eks/api_op_UpdateNodegroupVersion.go +++ b/service/eks/api_op_UpdateNodegroupVersion.go @@ -117,6 +117,9 @@ func addOperationUpdateNodegroupVersionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationUpdateNodegroupVersionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eks/go.mod b/service/eks/go.mod index 5f1ba0201bd..9c10252a7e4 100644 --- a/service/eks/go.mod +++ b/service/eks/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/eks go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/eks/go.sum b/service/eks/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/eks/go.sum +++ b/service/eks/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticache/api_client.go b/service/elasticache/api_client.go index 75125a1cde5..f3ffc1a7514 100644 --- a/service/elasticache/api_client.go +++ b/service/elasticache/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elasticache/api_op_AddTagsToResource.go b/service/elasticache/api_op_AddTagsToResource.go index ec60043761b..c293b015dd7 100644 --- a/service/elasticache/api_op_AddTagsToResource.go +++ b/service/elasticache/api_op_AddTagsToResource.go @@ -77,6 +77,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go b/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go index d5beafaade5..45b36dd4a31 100644 --- a/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go +++ b/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go @@ -78,6 +78,9 @@ func addOperationAuthorizeCacheSecurityGroupIngressMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationAuthorizeCacheSecurityGroupIngressMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_BatchApplyUpdateAction.go b/service/elasticache/api_op_BatchApplyUpdateAction.go index f420fe3e15e..f7b553f21cf 100644 --- a/service/elasticache/api_op_BatchApplyUpdateAction.go +++ b/service/elasticache/api_op_BatchApplyUpdateAction.go @@ -64,6 +64,9 @@ func addOperationBatchApplyUpdateActionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchApplyUpdateActionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_BatchStopUpdateAction.go b/service/elasticache/api_op_BatchStopUpdateAction.go index 4b910bc6dc0..e7718c1a123 100644 --- a/service/elasticache/api_op_BatchStopUpdateAction.go +++ b/service/elasticache/api_op_BatchStopUpdateAction.go @@ -64,6 +64,9 @@ func addOperationBatchStopUpdateActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchStopUpdateActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CompleteMigration.go b/service/elasticache/api_op_CompleteMigration.go index 82ebf1b0473..f11fff2baee 100644 --- a/service/elasticache/api_op_CompleteMigration.go +++ b/service/elasticache/api_op_CompleteMigration.go @@ -58,6 +58,9 @@ func addOperationCompleteMigrationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCompleteMigrationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CopySnapshot.go b/service/elasticache/api_op_CopySnapshot.go index 70789698396..d27fffc7e7b 100644 --- a/service/elasticache/api_op_CopySnapshot.go +++ b/service/elasticache/api_op_CopySnapshot.go @@ -139,6 +139,9 @@ func addOperationCopySnapshotMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationCopySnapshotMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateCacheCluster.go b/service/elasticache/api_op_CreateCacheCluster.go index a8a530360c3..116cc78acda 100644 --- a/service/elasticache/api_op_CreateCacheCluster.go +++ b/service/elasticache/api_op_CreateCacheCluster.go @@ -304,6 +304,9 @@ func addOperationCreateCacheClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -346,6 +349,9 @@ func addOperationCreateCacheClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateCacheParameterGroup.go b/service/elasticache/api_op_CreateCacheParameterGroup.go index 50b055083d9..45e35747daa 100644 --- a/service/elasticache/api_op_CreateCacheParameterGroup.go +++ b/service/elasticache/api_op_CreateCacheParameterGroup.go @@ -80,6 +80,9 @@ func addOperationCreateCacheParameterGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateCacheParameterGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateCacheSecurityGroup.go b/service/elasticache/api_op_CreateCacheSecurityGroup.go index 074238a322a..433bc090529 100644 --- a/service/elasticache/api_op_CreateCacheSecurityGroup.go +++ b/service/elasticache/api_op_CreateCacheSecurityGroup.go @@ -74,6 +74,9 @@ func addOperationCreateCacheSecurityGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateCacheSecurityGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateCacheSubnetGroup.go b/service/elasticache/api_op_CreateCacheSubnetGroup.go index 34c0a26bd14..fa19de61c29 100644 --- a/service/elasticache/api_op_CreateCacheSubnetGroup.go +++ b/service/elasticache/api_op_CreateCacheSubnetGroup.go @@ -72,6 +72,9 @@ func addOperationCreateCacheSubnetGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateCacheSubnetGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateGlobalReplicationGroup.go b/service/elasticache/api_op_CreateGlobalReplicationGroup.go index 5ff7f31fca6..6c35d842559 100644 --- a/service/elasticache/api_op_CreateGlobalReplicationGroup.go +++ b/service/elasticache/api_op_CreateGlobalReplicationGroup.go @@ -87,6 +87,9 @@ func addOperationCreateGlobalReplicationGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateGlobalReplicationGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateReplicationGroup.go b/service/elasticache/api_op_CreateReplicationGroup.go index 1fb5e090fa4..314d5945906 100644 --- a/service/elasticache/api_op_CreateReplicationGroup.go +++ b/service/elasticache/api_op_CreateReplicationGroup.go @@ -371,6 +371,9 @@ func addOperationCreateReplicationGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -413,6 +416,9 @@ func addOperationCreateReplicationGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateSnapshot.go b/service/elasticache/api_op_CreateSnapshot.go index ea654739ec4..c19f30aa22a 100644 --- a/service/elasticache/api_op_CreateSnapshot.go +++ b/service/elasticache/api_op_CreateSnapshot.go @@ -67,6 +67,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateUser.go b/service/elasticache/api_op_CreateUser.go index 04e389d8b31..402ebad3047 100644 --- a/service/elasticache/api_op_CreateUser.go +++ b/service/elasticache/api_op_CreateUser.go @@ -98,6 +98,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_CreateUserGroup.go b/service/elasticache/api_op_CreateUserGroup.go index 2cf1c5857f6..d32db675f88 100644 --- a/service/elasticache/api_op_CreateUserGroup.go +++ b/service/elasticache/api_op_CreateUserGroup.go @@ -82,6 +82,9 @@ func addOperationCreateUserGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateUserGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go b/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go index ccf1993fc55..8cb62a3673b 100644 --- a/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go +++ b/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go @@ -85,6 +85,9 @@ func addOperationDecreaseNodeGroupsInGlobalReplicationGroupMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDecreaseNodeGroupsInGlobalReplicationGroupMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DecreaseReplicaCount.go b/service/elasticache/api_op_DecreaseReplicaCount.go index ee170e98d62..2564c4bba28 100644 --- a/service/elasticache/api_op_DecreaseReplicaCount.go +++ b/service/elasticache/api_op_DecreaseReplicaCount.go @@ -90,6 +90,9 @@ func addOperationDecreaseReplicaCountMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDecreaseReplicaCountMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteCacheCluster.go b/service/elasticache/api_op_DeleteCacheCluster.go index e0aab4f8394..a8a2f73c884 100644 --- a/service/elasticache/api_op_DeleteCacheCluster.go +++ b/service/elasticache/api_op_DeleteCacheCluster.go @@ -77,6 +77,9 @@ func addOperationDeleteCacheClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDeleteCacheClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteCacheParameterGroup.go b/service/elasticache/api_op_DeleteCacheParameterGroup.go index 9ba398134ad..d6e8268ecbc 100644 --- a/service/elasticache/api_op_DeleteCacheParameterGroup.go +++ b/service/elasticache/api_op_DeleteCacheParameterGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteCacheParameterGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteCacheParameterGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteCacheSecurityGroup.go b/service/elasticache/api_op_DeleteCacheSecurityGroup.go index 2119caeb433..c6e475b1bc0 100644 --- a/service/elasticache/api_op_DeleteCacheSecurityGroup.go +++ b/service/elasticache/api_op_DeleteCacheSecurityGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteCacheSecurityGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteCacheSecurityGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteCacheSubnetGroup.go b/service/elasticache/api_op_DeleteCacheSubnetGroup.go index 113861c28fd..d16d7fe8a2f 100644 --- a/service/elasticache/api_op_DeleteCacheSubnetGroup.go +++ b/service/elasticache/api_op_DeleteCacheSubnetGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteCacheSubnetGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteCacheSubnetGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteGlobalReplicationGroup.go b/service/elasticache/api_op_DeleteGlobalReplicationGroup.go index b2e9ad06ee9..1dc857e1e69 100644 --- a/service/elasticache/api_op_DeleteGlobalReplicationGroup.go +++ b/service/elasticache/api_op_DeleteGlobalReplicationGroup.go @@ -79,6 +79,9 @@ func addOperationDeleteGlobalReplicationGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteGlobalReplicationGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteReplicationGroup.go b/service/elasticache/api_op_DeleteReplicationGroup.go index 401113dfa85..8a034177330 100644 --- a/service/elasticache/api_op_DeleteReplicationGroup.go +++ b/service/elasticache/api_op_DeleteReplicationGroup.go @@ -72,6 +72,9 @@ func addOperationDeleteReplicationGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDeleteReplicationGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteSnapshot.go b/service/elasticache/api_op_DeleteSnapshot.go index 540615c70b3..93724fc3a98 100644 --- a/service/elasticache/api_op_DeleteSnapshot.go +++ b/service/elasticache/api_op_DeleteSnapshot.go @@ -57,6 +57,9 @@ func addOperationDeleteSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteUser.go b/service/elasticache/api_op_DeleteUser.go index a9e636d7b86..85e6972ea25 100644 --- a/service/elasticache/api_op_DeleteUser.go +++ b/service/elasticache/api_op_DeleteUser.go @@ -77,6 +77,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DeleteUserGroup.go b/service/elasticache/api_op_DeleteUserGroup.go index bfb42bf5a19..10b41b86534 100644 --- a/service/elasticache/api_op_DeleteUserGroup.go +++ b/service/elasticache/api_op_DeleteUserGroup.go @@ -75,6 +75,9 @@ func addOperationDeleteUserGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteUserGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeCacheClusters.go b/service/elasticache/api_op_DescribeCacheClusters.go index bed8033662c..e2df30c4dea 100644 --- a/service/elasticache/api_op_DescribeCacheClusters.go +++ b/service/elasticache/api_op_DescribeCacheClusters.go @@ -93,6 +93,9 @@ func addOperationDescribeCacheClustersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeCacheClustersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeCacheEngineVersions.go b/service/elasticache/api_op_DescribeCacheEngineVersions.go index 58098a24ec2..4b1dcd82029 100644 --- a/service/elasticache/api_op_DescribeCacheEngineVersions.go +++ b/service/elasticache/api_op_DescribeCacheEngineVersions.go @@ -89,6 +89,9 @@ func addOperationDescribeCacheEngineVersionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeCacheEngineVersionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeCacheParameterGroups.go b/service/elasticache/api_op_DescribeCacheParameterGroups.go index 5a810060545..a2e22448c0e 100644 --- a/service/elasticache/api_op_DescribeCacheParameterGroups.go +++ b/service/elasticache/api_op_DescribeCacheParameterGroups.go @@ -70,6 +70,9 @@ func addOperationDescribeCacheParameterGroupsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeCacheParameterGroupsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeCacheParameters.go b/service/elasticache/api_op_DescribeCacheParameters.go index c212a26c1fa..7c75e4c3d7c 100644 --- a/service/elasticache/api_op_DescribeCacheParameters.go +++ b/service/elasticache/api_op_DescribeCacheParameters.go @@ -77,6 +77,9 @@ func addOperationDescribeCacheParametersMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeCacheParametersMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeCacheSecurityGroups.go b/service/elasticache/api_op_DescribeCacheSecurityGroups.go index 7829abf7c98..d287bbb2e90 100644 --- a/service/elasticache/api_op_DescribeCacheSecurityGroups.go +++ b/service/elasticache/api_op_DescribeCacheSecurityGroups.go @@ -71,6 +71,9 @@ func addOperationDescribeCacheSecurityGroupsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeCacheSecurityGroupsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeCacheSubnetGroups.go b/service/elasticache/api_op_DescribeCacheSubnetGroups.go index a8cbbb78079..62ec63071d5 100644 --- a/service/elasticache/api_op_DescribeCacheSubnetGroups.go +++ b/service/elasticache/api_op_DescribeCacheSubnetGroups.go @@ -72,6 +72,9 @@ func addOperationDescribeCacheSubnetGroupsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeCacheSubnetGroupsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeEngineDefaultParameters.go b/service/elasticache/api_op_DescribeEngineDefaultParameters.go index 3966efce49e..87f3cb6e8c1 100644 --- a/service/elasticache/api_op_DescribeEngineDefaultParameters.go +++ b/service/elasticache/api_op_DescribeEngineDefaultParameters.go @@ -68,6 +68,9 @@ func addOperationDescribeEngineDefaultParametersMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeEngineDefaultParametersMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeEvents.go b/service/elasticache/api_op_DescribeEvents.go index 879059aad11..ad0d6d23185 100644 --- a/service/elasticache/api_op_DescribeEvents.go +++ b/service/elasticache/api_op_DescribeEvents.go @@ -90,6 +90,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeGlobalReplicationGroups.go b/service/elasticache/api_op_DescribeGlobalReplicationGroups.go index 871fb7c79c4..067af5c9d14 100644 --- a/service/elasticache/api_op_DescribeGlobalReplicationGroups.go +++ b/service/elasticache/api_op_DescribeGlobalReplicationGroups.go @@ -72,6 +72,9 @@ func addOperationDescribeGlobalReplicationGroupsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeGlobalReplicationGroupsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeReplicationGroups.go b/service/elasticache/api_op_DescribeReplicationGroups.go index 96bc352578f..7759cb36b53 100644 --- a/service/elasticache/api_op_DescribeReplicationGroups.go +++ b/service/elasticache/api_op_DescribeReplicationGroups.go @@ -73,6 +73,9 @@ func addOperationDescribeReplicationGroupsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeReplicationGroupsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeReservedCacheNodes.go b/service/elasticache/api_op_DescribeReservedCacheNodes.go index e793951eb19..8db137e0b6d 100644 --- a/service/elasticache/api_op_DescribeReservedCacheNodes.go +++ b/service/elasticache/api_op_DescribeReservedCacheNodes.go @@ -157,6 +157,9 @@ func addOperationDescribeReservedCacheNodesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -196,6 +199,9 @@ func addOperationDescribeReservedCacheNodesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go b/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go index 3c021b3d4e3..c605b83c9b3 100644 --- a/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go +++ b/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go @@ -152,6 +152,9 @@ func addOperationDescribeReservedCacheNodesOfferingsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationDescribeReservedCacheNodesOfferingsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeServiceUpdates.go b/service/elasticache/api_op_DescribeServiceUpdates.go index b7f8e576e6b..21aff90a3fa 100644 --- a/service/elasticache/api_op_DescribeServiceUpdates.go +++ b/service/elasticache/api_op_DescribeServiceUpdates.go @@ -69,6 +69,9 @@ func addOperationDescribeServiceUpdatesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeServiceUpdatesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeSnapshots.go b/service/elasticache/api_op_DescribeSnapshots.go index f6cfe6e4296..a9ba23955ab 100644 --- a/service/elasticache/api_op_DescribeSnapshots.go +++ b/service/elasticache/api_op_DescribeSnapshots.go @@ -94,6 +94,9 @@ func addOperationDescribeSnapshotsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeSnapshotsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeUpdateActions.go b/service/elasticache/api_op_DescribeUpdateActions.go index b7f0aaa7a36..c8c8aa4094c 100644 --- a/service/elasticache/api_op_DescribeUpdateActions.go +++ b/service/elasticache/api_op_DescribeUpdateActions.go @@ -88,6 +88,9 @@ func addOperationDescribeUpdateActionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeUpdateActionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeUserGroups.go b/service/elasticache/api_op_DescribeUserGroups.go index 9fff4e133ac..1d00c74a738 100644 --- a/service/elasticache/api_op_DescribeUserGroups.go +++ b/service/elasticache/api_op_DescribeUserGroups.go @@ -68,6 +68,9 @@ func addOperationDescribeUserGroupsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeUserGroupsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DescribeUsers.go b/service/elasticache/api_op_DescribeUsers.go index 7af487aa2e9..2af333f42f6 100644 --- a/service/elasticache/api_op_DescribeUsers.go +++ b/service/elasticache/api_op_DescribeUsers.go @@ -74,6 +74,9 @@ func addOperationDescribeUsersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeUsersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go b/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go index 82fb14b96a4..a5e9db31576 100644 --- a/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go +++ b/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go @@ -71,6 +71,9 @@ func addOperationDisassociateGlobalReplicationGroupMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDisassociateGlobalReplicationGroupMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_FailoverGlobalReplicationGroup.go b/service/elasticache/api_op_FailoverGlobalReplicationGroup.go index f39e0530025..27346b190a8 100644 --- a/service/elasticache/api_op_FailoverGlobalReplicationGroup.go +++ b/service/elasticache/api_op_FailoverGlobalReplicationGroup.go @@ -71,6 +71,9 @@ func addOperationFailoverGlobalReplicationGroupMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationFailoverGlobalReplicationGroupMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go b/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go index d4621608113..76ebd0f1651 100644 --- a/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go +++ b/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go @@ -74,6 +74,9 @@ func addOperationIncreaseNodeGroupsInGlobalReplicationGroupMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationIncreaseNodeGroupsInGlobalReplicationGroupMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_IncreaseReplicaCount.go b/service/elasticache/api_op_IncreaseReplicaCount.go index dd81cab057d..b50c3901e9e 100644 --- a/service/elasticache/api_op_IncreaseReplicaCount.go +++ b/service/elasticache/api_op_IncreaseReplicaCount.go @@ -74,6 +74,9 @@ func addOperationIncreaseReplicaCountMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationIncreaseReplicaCountMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ListAllowedNodeTypeModifications.go b/service/elasticache/api_op_ListAllowedNodeTypeModifications.go index aa44b36efdb..8f1113454ac 100644 --- a/service/elasticache/api_op_ListAllowedNodeTypeModifications.go +++ b/service/elasticache/api_op_ListAllowedNodeTypeModifications.go @@ -76,6 +76,9 @@ func addOperationListAllowedNodeTypeModificationsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListAllowedNodeTypeModificationsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ListTagsForResource.go b/service/elasticache/api_op_ListTagsForResource.go index bcf1d723445..2c480cf3190 100644 --- a/service/elasticache/api_op_ListTagsForResource.go +++ b/service/elasticache/api_op_ListTagsForResource.go @@ -67,6 +67,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyCacheCluster.go b/service/elasticache/api_op_ModifyCacheCluster.go index 8a36888786b..168caba66d7 100644 --- a/service/elasticache/api_op_ModifyCacheCluster.go +++ b/service/elasticache/api_op_ModifyCacheCluster.go @@ -286,6 +286,9 @@ func addOperationModifyCacheClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -328,6 +331,9 @@ func addOperationModifyCacheClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyCacheParameterGroup.go b/service/elasticache/api_op_ModifyCacheParameterGroup.go index ef0cc6809d4..8bf137daeb2 100644 --- a/service/elasticache/api_op_ModifyCacheParameterGroup.go +++ b/service/elasticache/api_op_ModifyCacheParameterGroup.go @@ -69,6 +69,9 @@ func addOperationModifyCacheParameterGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationModifyCacheParameterGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyCacheSubnetGroup.go b/service/elasticache/api_op_ModifyCacheSubnetGroup.go index be39e6c3e63..c824bd98656 100644 --- a/service/elasticache/api_op_ModifyCacheSubnetGroup.go +++ b/service/elasticache/api_op_ModifyCacheSubnetGroup.go @@ -67,6 +67,9 @@ func addOperationModifyCacheSubnetGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationModifyCacheSubnetGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyGlobalReplicationGroup.go b/service/elasticache/api_op_ModifyGlobalReplicationGroup.go index 642412647a5..61c08b69556 100644 --- a/service/elasticache/api_op_ModifyGlobalReplicationGroup.go +++ b/service/elasticache/api_op_ModifyGlobalReplicationGroup.go @@ -81,6 +81,9 @@ func addOperationModifyGlobalReplicationGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationModifyGlobalReplicationGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyReplicationGroup.go b/service/elasticache/api_op_ModifyReplicationGroup.go index 13ac626c6c9..267b2c63bc1 100644 --- a/service/elasticache/api_op_ModifyReplicationGroup.go +++ b/service/elasticache/api_op_ModifyReplicationGroup.go @@ -216,6 +216,9 @@ func addOperationModifyReplicationGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -258,6 +261,9 @@ func addOperationModifyReplicationGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go b/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go index 8d14c08b184..28ee2cdcfca 100644 --- a/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go +++ b/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go @@ -90,6 +90,9 @@ func addOperationModifyReplicationGroupShardConfigurationMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationModifyReplicationGroupShardConfigurationMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyUser.go b/service/elasticache/api_op_ModifyUser.go index 7a3f4da4709..a6584b82ae3 100644 --- a/service/elasticache/api_op_ModifyUser.go +++ b/service/elasticache/api_op_ModifyUser.go @@ -86,6 +86,9 @@ func addOperationModifyUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationModifyUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ModifyUserGroup.go b/service/elasticache/api_op_ModifyUserGroup.go index f184c1744e1..71787e545e1 100644 --- a/service/elasticache/api_op_ModifyUserGroup.go +++ b/service/elasticache/api_op_ModifyUserGroup.go @@ -78,6 +78,9 @@ func addOperationModifyUserGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationModifyUserGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go b/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go index 42269dfc97e..364ee569e73 100644 --- a/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go +++ b/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go @@ -64,6 +64,9 @@ func addOperationPurchaseReservedCacheNodesOfferingMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationPurchaseReservedCacheNodesOfferingMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go b/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go index 4da7fffdce4..17a1286556e 100644 --- a/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go +++ b/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go @@ -65,6 +65,9 @@ func addOperationRebalanceSlotsInGlobalReplicationGroupMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationRebalanceSlotsInGlobalReplicationGroupMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_RebootCacheCluster.go b/service/elasticache/api_op_RebootCacheCluster.go index c96cbc37d92..2d5eb0a3f59 100644 --- a/service/elasticache/api_op_RebootCacheCluster.go +++ b/service/elasticache/api_op_RebootCacheCluster.go @@ -71,6 +71,9 @@ func addOperationRebootCacheClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationRebootCacheClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_RemoveTagsFromResource.go b/service/elasticache/api_op_RemoveTagsFromResource.go index 2f0a7923387..18d0c434c7c 100644 --- a/service/elasticache/api_op_RemoveTagsFromResource.go +++ b/service/elasticache/api_op_RemoveTagsFromResource.go @@ -66,6 +66,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_ResetCacheParameterGroup.go b/service/elasticache/api_op_ResetCacheParameterGroup.go index 3c00b3c9fd9..8048f9546ac 100644 --- a/service/elasticache/api_op_ResetCacheParameterGroup.go +++ b/service/elasticache/api_op_ResetCacheParameterGroup.go @@ -74,6 +74,9 @@ func addOperationResetCacheParameterGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationResetCacheParameterGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go b/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go index 2231e3b8f88..b8bd8d2e323 100644 --- a/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go +++ b/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go @@ -75,6 +75,9 @@ func addOperationRevokeCacheSecurityGroupIngressMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRevokeCacheSecurityGroupIngressMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_StartMigration.go b/service/elasticache/api_op_StartMigration.go index 187712bbf9f..3ec998d6301 100644 --- a/service/elasticache/api_op_StartMigration.go +++ b/service/elasticache/api_op_StartMigration.go @@ -59,6 +59,9 @@ func addOperationStartMigrationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationStartMigrationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/api_op_TestFailover.go b/service/elasticache/api_op_TestFailover.go index 0ea21de269a..f6e67dd5544 100644 --- a/service/elasticache/api_op_TestFailover.go +++ b/service/elasticache/api_op_TestFailover.go @@ -110,6 +110,9 @@ func addOperationTestFailoverMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationTestFailoverMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticache/go.mod b/service/elasticache/go.mod index 50e236c2c91..f618150b575 100644 --- a/service/elasticache/go.mod +++ b/service/elasticache/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elasticache go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticache/go.sum b/service/elasticache/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elasticache/go.sum +++ b/service/elasticache/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticbeanstalk/api_client.go b/service/elasticbeanstalk/api_client.go index 0efe9216cae..f08b092859e 100644 --- a/service/elasticbeanstalk/api_client.go +++ b/service/elasticbeanstalk/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go b/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go index 3231453ffad..39996bb177c 100644 --- a/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go +++ b/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go @@ -53,6 +53,9 @@ func addOperationAbortEnvironmentUpdateMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationAbortEnvironmentUpdateMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go b/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go index 039a363c55e..9a7f9f21bfb 100644 --- a/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go +++ b/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go @@ -72,6 +72,9 @@ func addOperationApplyEnvironmentManagedActionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationApplyEnvironmentManagedActionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go b/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go index 62734a44644..0842c132cf7 100644 --- a/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go +++ b/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go @@ -60,6 +60,9 @@ func addOperationAssociateEnvironmentOperationsRoleMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAssociateEnvironmentOperationsRoleMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CheckDNSAvailability.go b/service/elasticbeanstalk/api_op_CheckDNSAvailability.go index 2ce7a127ff3..1dc0563bd42 100644 --- a/service/elasticbeanstalk/api_op_CheckDNSAvailability.go +++ b/service/elasticbeanstalk/api_op_CheckDNSAvailability.go @@ -63,6 +63,9 @@ func addOperationCheckDNSAvailabilityMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCheckDNSAvailabilityMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ComposeEnvironments.go b/service/elasticbeanstalk/api_op_ComposeEnvironments.go index a647f66c28e..f8ddd6d56ea 100644 --- a/service/elasticbeanstalk/api_op_ComposeEnvironments.go +++ b/service/elasticbeanstalk/api_op_ComposeEnvironments.go @@ -76,6 +76,9 @@ func addOperationComposeEnvironmentsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationComposeEnvironmentsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CreateApplication.go b/service/elasticbeanstalk/api_op_CreateApplication.go index aaeaa25ccb2..cd168015b92 100644 --- a/service/elasticbeanstalk/api_op_CreateApplication.go +++ b/service/elasticbeanstalk/api_op_CreateApplication.go @@ -68,6 +68,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CreateApplicationVersion.go b/service/elasticbeanstalk/api_op_CreateApplicationVersion.go index 7d59bc1a9bb..cbed3bd3216 100644 --- a/service/elasticbeanstalk/api_op_CreateApplicationVersion.go +++ b/service/elasticbeanstalk/api_op_CreateApplicationVersion.go @@ -111,6 +111,9 @@ func addOperationCreateApplicationVersionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationCreateApplicationVersionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go b/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go index 3826759c9e6..06ee04a8630 100644 --- a/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go +++ b/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go @@ -168,6 +168,9 @@ func addOperationCreateConfigurationTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -210,6 +213,9 @@ func addOperationCreateConfigurationTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CreateEnvironment.go b/service/elasticbeanstalk/api_op_CreateEnvironment.go index 09c0ec92b33..eecdf9df38b 100644 --- a/service/elasticbeanstalk/api_op_CreateEnvironment.go +++ b/service/elasticbeanstalk/api_op_CreateEnvironment.go @@ -238,6 +238,9 @@ func addOperationCreateEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -280,6 +283,9 @@ func addOperationCreateEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CreatePlatformVersion.go b/service/elasticbeanstalk/api_op_CreatePlatformVersion.go index aa30dbd57bf..9b9011da0a4 100644 --- a/service/elasticbeanstalk/api_op_CreatePlatformVersion.go +++ b/service/elasticbeanstalk/api_op_CreatePlatformVersion.go @@ -78,6 +78,9 @@ func addOperationCreatePlatformVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreatePlatformVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_CreateStorageLocation.go b/service/elasticbeanstalk/api_op_CreateStorageLocation.go index 2afe824af24..7b20546685c 100644 --- a/service/elasticbeanstalk/api_op_CreateStorageLocation.go +++ b/service/elasticbeanstalk/api_op_CreateStorageLocation.go @@ -52,6 +52,9 @@ func addOperationCreateStorageLocationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationCreateStorageLocationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DeleteApplication.go b/service/elasticbeanstalk/api_op_DeleteApplication.go index 008b5505a3e..19b50f3d1a2 100644 --- a/service/elasticbeanstalk/api_op_DeleteApplication.go +++ b/service/elasticbeanstalk/api_op_DeleteApplication.go @@ -55,6 +55,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go b/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go index aac615ef183..b060bdd911e 100644 --- a/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go +++ b/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go @@ -60,6 +60,9 @@ func addOperationDeleteApplicationVersionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteApplicationVersionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go b/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go index c8ec55c4cac..fdd67dbf450 100644 --- a/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go +++ b/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go @@ -57,6 +57,9 @@ func addOperationDeleteConfigurationTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteConfigurationTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go b/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go index 6a2f1a6666f..431d6bb2ae3 100644 --- a/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go +++ b/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go @@ -60,6 +60,9 @@ func addOperationDeleteEnvironmentConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteEnvironmentConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DeletePlatformVersion.go b/service/elasticbeanstalk/api_op_DeletePlatformVersion.go index 89313177bd5..afaad24e65c 100644 --- a/service/elasticbeanstalk/api_op_DeletePlatformVersion.go +++ b/service/elasticbeanstalk/api_op_DeletePlatformVersion.go @@ -51,6 +51,9 @@ func addOperationDeletePlatformVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeletePlatformVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go b/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go index fd96cb4337a..976a3a1875b 100644 --- a/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go +++ b/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go @@ -50,6 +50,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go b/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go index 564704e914a..45713283c68 100644 --- a/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go +++ b/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go @@ -72,6 +72,9 @@ func addOperationDescribeApplicationVersionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeApplicationVersionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeApplications.go b/service/elasticbeanstalk/api_op_DescribeApplications.go index d1d891831ce..3643e6dce46 100644 --- a/service/elasticbeanstalk/api_op_DescribeApplications.go +++ b/service/elasticbeanstalk/api_op_DescribeApplications.go @@ -54,6 +54,9 @@ func addOperationDescribeApplicationsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDescribeApplicationsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go b/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go index 59c2dbe963b..e133f13f258 100644 --- a/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go +++ b/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go @@ -81,6 +81,9 @@ func addOperationDescribeConfigurationOptionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeConfigurationOptionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go b/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go index 4a8862ddbe3..738a23d4b51 100644 --- a/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go +++ b/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go @@ -79,6 +79,9 @@ func addOperationDescribeConfigurationSettingsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeConfigurationSettingsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go index a966273b8f9..060e29c9890 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go @@ -92,6 +92,9 @@ func addOperationDescribeEnvironmentHealthMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeEnvironmentHealthMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go index 98e85390474..b7713045a53 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go @@ -66,6 +66,9 @@ func addOperationDescribeEnvironmentManagedActionHistoryMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeEnvironmentManagedActionHistoryMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go index 1512707653d..a33e70b34ff 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go @@ -59,6 +59,9 @@ func addOperationDescribeEnvironmentManagedActionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeEnvironmentManagedActionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go index 2c7457d7700..e8e12a741c7 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go @@ -60,6 +60,9 @@ func addOperationDescribeEnvironmentResourcesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeEnvironmentResourcesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironments.go b/service/elasticbeanstalk/api_op_DescribeEnvironments.go index f9cdd6b1d2c..7a8213e9f46 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironments.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironments.go @@ -91,6 +91,9 @@ func addOperationDescribeEnvironmentsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeEnvironmentsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeEvents.go b/service/elasticbeanstalk/api_op_DescribeEvents.go index 3faa88ea1af..a1386288541 100644 --- a/service/elasticbeanstalk/api_op_DescribeEvents.go +++ b/service/elasticbeanstalk/api_op_DescribeEvents.go @@ -104,6 +104,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go b/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go index 87dde20d09a..485def93cd1 100644 --- a/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go +++ b/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go @@ -75,6 +75,9 @@ func addOperationDescribeInstancesHealthMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeInstancesHealthMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DescribePlatformVersion.go b/service/elasticbeanstalk/api_op_DescribePlatformVersion.go index 29b0f314284..6289eb68b74 100644 --- a/service/elasticbeanstalk/api_op_DescribePlatformVersion.go +++ b/service/elasticbeanstalk/api_op_DescribePlatformVersion.go @@ -55,6 +55,9 @@ func addOperationDescribePlatformVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribePlatformVersionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go b/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go index a16474ce8f2..7d6d85925ab 100644 --- a/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go +++ b/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go @@ -54,6 +54,9 @@ func addOperationDisassociateEnvironmentOperationsRoleMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateEnvironmentOperationsRoleMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go b/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go index dd6b029bf81..7ae2df45f44 100644 --- a/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go +++ b/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go @@ -53,6 +53,9 @@ func addOperationListAvailableSolutionStacksMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationListAvailableSolutionStacksMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ListPlatformBranches.go b/service/elasticbeanstalk/api_op_ListPlatformBranches.go index 5179add8177..e845c74d02f 100644 --- a/service/elasticbeanstalk/api_op_ListPlatformBranches.go +++ b/service/elasticbeanstalk/api_op_ListPlatformBranches.go @@ -100,6 +100,9 @@ func addOperationListPlatformBranchesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationListPlatformBranchesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ListPlatformVersions.go b/service/elasticbeanstalk/api_op_ListPlatformVersions.go index f61211d8665..097a450f5c6 100644 --- a/service/elasticbeanstalk/api_op_ListPlatformVersions.go +++ b/service/elasticbeanstalk/api_op_ListPlatformVersions.go @@ -70,6 +70,9 @@ func addOperationListPlatformVersionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListPlatformVersionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ListTagsForResource.go b/service/elasticbeanstalk/api_op_ListTagsForResource.go index 4d37065e65d..26cce7b39c4 100644 --- a/service/elasticbeanstalk/api_op_ListTagsForResource.go +++ b/service/elasticbeanstalk/api_op_ListTagsForResource.go @@ -62,6 +62,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_RebuildEnvironment.go b/service/elasticbeanstalk/api_op_RebuildEnvironment.go index 143a730d3be..9a81c24e449 100644 --- a/service/elasticbeanstalk/api_op_RebuildEnvironment.go +++ b/service/elasticbeanstalk/api_op_RebuildEnvironment.go @@ -55,6 +55,9 @@ func addOperationRebuildEnvironmentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationRebuildEnvironmentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go b/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go index 68429099f96..8eab49c8865 100644 --- a/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go +++ b/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go @@ -71,6 +71,9 @@ func addOperationRequestEnvironmentInfoMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationRequestEnvironmentInfoMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_RestartAppServer.go b/service/elasticbeanstalk/api_op_RestartAppServer.go index 6eb231d0de2..42c52f4096a 100644 --- a/service/elasticbeanstalk/api_op_RestartAppServer.go +++ b/service/elasticbeanstalk/api_op_RestartAppServer.go @@ -55,6 +55,9 @@ func addOperationRestartAppServerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationRestartAppServerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go b/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go index fb2a3857a69..5c679efa95a 100644 --- a/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go +++ b/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go @@ -70,6 +70,9 @@ func addOperationRetrieveEnvironmentInfoMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationRetrieveEnvironmentInfoMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go b/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go index 376adfdff70..51ebadf4f49 100644 --- a/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go +++ b/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go @@ -68,6 +68,9 @@ func addOperationSwapEnvironmentCNAMEsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSwapEnvironmentCNAMEsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_TerminateEnvironment.go b/service/elasticbeanstalk/api_op_TerminateEnvironment.go index 8bd8237f7f2..313c12e569e 100644 --- a/service/elasticbeanstalk/api_op_TerminateEnvironment.go +++ b/service/elasticbeanstalk/api_op_TerminateEnvironment.go @@ -184,6 +184,9 @@ func addOperationTerminateEnvironmentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -223,6 +226,9 @@ func addOperationTerminateEnvironmentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_UpdateApplication.go b/service/elasticbeanstalk/api_op_UpdateApplication.go index 218801ca603..b62006242ef 100644 --- a/service/elasticbeanstalk/api_op_UpdateApplication.go +++ b/service/elasticbeanstalk/api_op_UpdateApplication.go @@ -62,6 +62,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go b/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go index a914b0a3f38..8e930a39c61 100644 --- a/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go +++ b/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go @@ -61,6 +61,9 @@ func addOperationUpdateApplicationResourceLifecycleMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateApplicationResourceLifecycleMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go b/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go index 6808f73ef5c..c62a5508e8c 100644 --- a/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go +++ b/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go @@ -67,6 +67,9 @@ func addOperationUpdateApplicationVersionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateApplicationVersionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go b/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go index 40718b49dd2..633b3202181 100644 --- a/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go +++ b/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go @@ -123,6 +123,9 @@ func addOperationUpdateConfigurationTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationUpdateConfigurationTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_UpdateEnvironment.go b/service/elasticbeanstalk/api_op_UpdateEnvironment.go index 1a35dd658e3..19155800398 100644 --- a/service/elasticbeanstalk/api_op_UpdateEnvironment.go +++ b/service/elasticbeanstalk/api_op_UpdateEnvironment.go @@ -219,6 +219,9 @@ func addOperationUpdateEnvironmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -258,6 +261,9 @@ func addOperationUpdateEnvironmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_UpdateTagsForResource.go b/service/elasticbeanstalk/api_op_UpdateTagsForResource.go index 3d255b610ab..df258dcd3ef 100644 --- a/service/elasticbeanstalk/api_op_UpdateTagsForResource.go +++ b/service/elasticbeanstalk/api_op_UpdateTagsForResource.go @@ -71,6 +71,9 @@ func addOperationUpdateTagsForResourceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateTagsForResourceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go b/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go index 37fb379f4c5..a3be6080888 100644 --- a/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go +++ b/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go @@ -72,6 +72,9 @@ func addOperationValidateConfigurationSettingsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationValidateConfigurationSettingsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticbeanstalk/go.mod b/service/elasticbeanstalk/go.mod index d90304f38cb..c1a7537afc3 100644 --- a/service/elasticbeanstalk/go.mod +++ b/service/elasticbeanstalk/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticbeanstalk/go.sum b/service/elasticbeanstalk/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elasticbeanstalk/go.sum +++ b/service/elasticbeanstalk/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticinference/api_client.go b/service/elasticinference/api_client.go index 9a65dc66c59..ca4290c2342 100644 --- a/service/elasticinference/api_client.go +++ b/service/elasticinference/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elasticinference/api_op_DescribeAcceleratorOfferings.go b/service/elasticinference/api_op_DescribeAcceleratorOfferings.go index 4f1421fddb4..c1d7798cf80 100644 --- a/service/elasticinference/api_op_DescribeAcceleratorOfferings.go +++ b/service/elasticinference/api_op_DescribeAcceleratorOfferings.go @@ -62,6 +62,9 @@ func addOperationDescribeAcceleratorOfferingsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeAcceleratorOfferingsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticinference/api_op_DescribeAcceleratorTypes.go b/service/elasticinference/api_op_DescribeAcceleratorTypes.go index 9aa20396448..0509918f8b9 100644 --- a/service/elasticinference/api_op_DescribeAcceleratorTypes.go +++ b/service/elasticinference/api_op_DescribeAcceleratorTypes.go @@ -49,6 +49,9 @@ func addOperationDescribeAcceleratorTypesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationDescribeAcceleratorTypesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticinference/api_op_DescribeAccelerators.go b/service/elasticinference/api_op_DescribeAccelerators.go index dc55a530b4a..a0b04e16098 100644 --- a/service/elasticinference/api_op_DescribeAccelerators.go +++ b/service/elasticinference/api_op_DescribeAccelerators.go @@ -72,6 +72,9 @@ func addOperationDescribeAcceleratorsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeAcceleratorsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticinference/api_op_ListTagsForResource.go b/service/elasticinference/api_op_ListTagsForResource.go index 341c3467c5b..cac261b444c 100644 --- a/service/elasticinference/api_op_ListTagsForResource.go +++ b/service/elasticinference/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticinference/api_op_TagResource.go b/service/elasticinference/api_op_TagResource.go index 56d02d60707..a3525a4ba3c 100644 --- a/service/elasticinference/api_op_TagResource.go +++ b/service/elasticinference/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticinference/api_op_UntagResource.go b/service/elasticinference/api_op_UntagResource.go index c0266cff3e8..f939c53cf0d 100644 --- a/service/elasticinference/api_op_UntagResource.go +++ b/service/elasticinference/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticinference/go.mod b/service/elasticinference/go.mod index 20f374b27f2..ba37552a328 100644 --- a/service/elasticinference/go.mod +++ b/service/elasticinference/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elasticinference go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticinference/go.sum b/service/elasticinference/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elasticinference/go.sum +++ b/service/elasticinference/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticloadbalancing/api_client.go b/service/elasticloadbalancing/api_client.go index f07ac0af8b4..1805ec77501 100644 --- a/service/elasticloadbalancing/api_client.go +++ b/service/elasticloadbalancing/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elasticloadbalancing/api_op_AddTags.go b/service/elasticloadbalancing/api_op_AddTags.go index c1470bef41c..78e218a111b 100644 --- a/service/elasticloadbalancing/api_op_AddTags.go +++ b/service/elasticloadbalancing/api_op_AddTags.go @@ -61,6 +61,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go b/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go index f92235edaf3..7963f8b15a0 100644 --- a/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go @@ -65,6 +65,9 @@ func addOperationApplySecurityGroupsToLoadBalancerMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationApplySecurityGroupsToLoadBalancerMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go b/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go index 154ddc2f474..47f94031637 100644 --- a/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go +++ b/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go @@ -65,6 +65,9 @@ func addOperationAttachLoadBalancerToSubnetsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAttachLoadBalancerToSubnetsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go b/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go index 769f5d101e2..3cba73112fb 100644 --- a/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go +++ b/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go @@ -64,6 +64,9 @@ func addOperationConfigureHealthCheckMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationConfigureHealthCheckMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go b/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go index ed1edf3918f..bedb2b4ad4d 100644 --- a/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go +++ b/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go @@ -73,6 +73,9 @@ func addOperationCreateAppCookieStickinessPolicyMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateAppCookieStickinessPolicyMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go b/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go index 461e441ae34..2a6428f0cb0 100644 --- a/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go +++ b/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go @@ -75,6 +75,9 @@ func addOperationCreateLBCookieStickinessPolicyMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateLBCookieStickinessPolicyMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_CreateLoadBalancer.go b/service/elasticloadbalancing/api_op_CreateLoadBalancer.go index b90b2490f1b..a9bcdeaf199 100644 --- a/service/elasticloadbalancing/api_op_CreateLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_CreateLoadBalancer.go @@ -102,6 +102,9 @@ func addOperationCreateLoadBalancerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateLoadBalancerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go b/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go index a3c652ba768..6b04fd0ba0d 100644 --- a/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go +++ b/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go @@ -61,6 +61,9 @@ func addOperationCreateLoadBalancerListenersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateLoadBalancerListenersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go b/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go index a8d305491b6..ce9bf3bcd9f 100644 --- a/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go +++ b/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go @@ -68,6 +68,9 @@ func addOperationCreateLoadBalancerPolicyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateLoadBalancerPolicyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go b/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go index dfb8cfa9779..2770b6f56fb 100644 --- a/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go @@ -56,6 +56,9 @@ func addOperationDeleteLoadBalancerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteLoadBalancerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go b/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go index bad767f9cea..4c889e1eb51 100644 --- a/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go +++ b/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go @@ -55,6 +55,9 @@ func addOperationDeleteLoadBalancerListenersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteLoadBalancerListenersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go b/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go index 6fd3d5f0bed..1cc5fefd842 100644 --- a/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go +++ b/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go @@ -56,6 +56,9 @@ func addOperationDeleteLoadBalancerPolicyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteLoadBalancerPolicyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go b/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go index 1b7bfb98048..e4a41cfcf0c 100644 --- a/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go @@ -66,6 +66,9 @@ func addOperationDeregisterInstancesFromLoadBalancerMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeregisterInstancesFromLoadBalancerMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeAccountLimits.go b/service/elasticloadbalancing/api_op_DescribeAccountLimits.go index 43909e14468..6a5e46d1a31 100644 --- a/service/elasticloadbalancing/api_op_DescribeAccountLimits.go +++ b/service/elasticloadbalancing/api_op_DescribeAccountLimits.go @@ -62,6 +62,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go index 8e313880f8f..c72ad429450 100644 --- a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go +++ b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go @@ -62,6 +62,9 @@ func addOperationDescribeInstanceHealthMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeInstanceHealthMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go index 197114101fc..61532d04ba7 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go @@ -55,6 +55,9 @@ func addOperationDescribeLoadBalancerAttributesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeLoadBalancerAttributesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go index 7092678323f..ba42c522974 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go @@ -62,6 +62,9 @@ func addOperationDescribeLoadBalancerPoliciesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeLoadBalancerPoliciesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go index 44cbacaa1b2..3443cbb8262 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go @@ -61,6 +61,9 @@ func addOperationDescribeLoadBalancerPolicyTypesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeLoadBalancerPolicyTypesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go index c9237a87d5b..6fb2542b212 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go @@ -66,6 +66,9 @@ func addOperationDescribeLoadBalancersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeLoadBalancersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DescribeTags.go b/service/elasticloadbalancing/api_op_DescribeTags.go index fcde275c828..9926fcd2030 100644 --- a/service/elasticloadbalancing/api_op_DescribeTags.go +++ b/service/elasticloadbalancing/api_op_DescribeTags.go @@ -55,6 +55,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go b/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go index 9722d1cfb3e..edc04a1db0b 100644 --- a/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go +++ b/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go @@ -62,6 +62,9 @@ func addOperationDetachLoadBalancerFromSubnetsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDetachLoadBalancerFromSubnetsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go b/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go index d148dbf87be..f50993a9693 100644 --- a/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go @@ -68,6 +68,9 @@ func addOperationDisableAvailabilityZonesForLoadBalancerMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDisableAvailabilityZonesForLoadBalancerMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go b/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go index 150378942f0..7c77b609da5 100644 --- a/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go @@ -65,6 +65,9 @@ func addOperationEnableAvailabilityZonesForLoadBalancerMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationEnableAvailabilityZonesForLoadBalancerMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go b/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go index fdcea9b1128..6901a786199 100644 --- a/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go +++ b/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go @@ -83,6 +83,9 @@ func addOperationModifyLoadBalancerAttributesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationModifyLoadBalancerAttributesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go b/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go index 976932abb9f..9b677ab29dd 100644 --- a/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go @@ -77,6 +77,9 @@ func addOperationRegisterInstancesWithLoadBalancerMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationRegisterInstancesWithLoadBalancerMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_RemoveTags.go b/service/elasticloadbalancing/api_op_RemoveTags.go index d020ec07960..4fa7584bf9f 100644 --- a/service/elasticloadbalancing/api_op_RemoveTags.go +++ b/service/elasticloadbalancing/api_op_RemoveTags.go @@ -57,6 +57,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go b/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go index a375c0db46a..2bd8ed0701e 100644 --- a/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go +++ b/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go @@ -65,6 +65,9 @@ func addOperationSetLoadBalancerListenerSSLCertificateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSetLoadBalancerListenerSSLCertificateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go index 1da3f3c763d..c1a0cab56de 100644 --- a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go +++ b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go @@ -74,6 +74,9 @@ func addOperationSetLoadBalancerPoliciesForBackendServerMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationSetLoadBalancerPoliciesForBackendServerMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go index f877fc03399..2fa37f299d3 100644 --- a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go +++ b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go @@ -71,6 +71,9 @@ func addOperationSetLoadBalancerPoliciesOfListenerMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSetLoadBalancerPoliciesOfListenerMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancing/go.mod b/service/elasticloadbalancing/go.mod index c0afb9f1eac..d409632dcaa 100644 --- a/service/elasticloadbalancing/go.mod +++ b/service/elasticloadbalancing/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticloadbalancing/go.sum b/service/elasticloadbalancing/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elasticloadbalancing/go.sum +++ b/service/elasticloadbalancing/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticloadbalancingv2/api_client.go b/service/elasticloadbalancingv2/api_client.go index 5192b834bce..f954b034309 100644 --- a/service/elasticloadbalancingv2/api_client.go +++ b/service/elasticloadbalancingv2/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go b/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go index ecc6f428ba4..00ea908a985 100644 --- a/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go +++ b/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go @@ -67,6 +67,9 @@ func addOperationAddListenerCertificatesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationAddListenerCertificatesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_AddTags.go b/service/elasticloadbalancingv2/api_op_AddTags.go index a251e8a75d0..40e6d33074a 100644 --- a/service/elasticloadbalancingv2/api_op_AddTags.go +++ b/service/elasticloadbalancingv2/api_op_AddTags.go @@ -59,6 +59,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_CreateListener.go b/service/elasticloadbalancingv2/api_op_CreateListener.go index 25fb7db73f9..f5122804b25 100644 --- a/service/elasticloadbalancingv2/api_op_CreateListener.go +++ b/service/elasticloadbalancingv2/api_op_CreateListener.go @@ -145,6 +145,9 @@ func addOperationCreateListenerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationCreateListenerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go b/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go index 3084f14c8b8..3ef71516b7f 100644 --- a/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go +++ b/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go @@ -126,6 +126,9 @@ func addOperationCreateLoadBalancerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationCreateLoadBalancerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_CreateRule.go b/service/elasticloadbalancingv2/api_op_CreateRule.go index f7c50e90b22..c5873d36404 100644 --- a/service/elasticloadbalancingv2/api_op_CreateRule.go +++ b/service/elasticloadbalancingv2/api_op_CreateRule.go @@ -80,6 +80,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go b/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go index f9ed4fbaf78..8e734cabba9 100644 --- a/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go +++ b/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go @@ -162,6 +162,9 @@ func addOperationCreateTargetGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationCreateTargetGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DeleteListener.go b/service/elasticloadbalancingv2/api_op_DeleteListener.go index 270a8bcba48..0359e09cbf7 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteListener.go +++ b/service/elasticloadbalancingv2/api_op_DeleteListener.go @@ -49,6 +49,9 @@ func addOperationDeleteListenerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteListenerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go b/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go index e6dcfabf79e..3b224f098ea 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go +++ b/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go @@ -54,6 +54,9 @@ func addOperationDeleteLoadBalancerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteLoadBalancerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DeleteRule.go b/service/elasticloadbalancingv2/api_op_DeleteRule.go index 5720b3f5588..b743f181afd 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteRule.go +++ b/service/elasticloadbalancingv2/api_op_DeleteRule.go @@ -48,6 +48,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go b/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go index 65a2f6547d8..b2903af471b 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go +++ b/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go @@ -50,6 +50,9 @@ func addOperationDeleteTargetGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteTargetGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DeregisterTargets.go b/service/elasticloadbalancingv2/api_op_DeregisterTargets.go index cc92c831918..4cb42b72fea 100644 --- a/service/elasticloadbalancingv2/api_op_DeregisterTargets.go +++ b/service/elasticloadbalancingv2/api_op_DeregisterTargets.go @@ -56,6 +56,9 @@ func addOperationDeregisterTargetsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeregisterTargetsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go b/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go index abf3d20b40c..bcb5a7bf9f6 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go +++ b/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go @@ -64,6 +64,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeAccountLimitsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go b/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go index c61b27e300c..42d2858a23c 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go +++ b/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go @@ -69,6 +69,9 @@ func addOperationDescribeListenerCertificatesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeListenerCertificatesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeListeners.go b/service/elasticloadbalancingv2/api_op_DescribeListeners.go index b381f27e154..f6e6887d00f 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeListeners.go +++ b/service/elasticloadbalancingv2/api_op_DescribeListeners.go @@ -69,6 +69,9 @@ func addOperationDescribeListenersMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeListenersMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go index faabca0396a..3e8e7ded43e 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go +++ b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go @@ -58,6 +58,9 @@ func addOperationDescribeLoadBalancerAttributesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeLoadBalancerAttributesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go index 0856f6359ee..99507aa39bc 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go +++ b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go @@ -68,6 +68,9 @@ func addOperationDescribeLoadBalancersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeLoadBalancersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeRules.go b/service/elasticloadbalancingv2/api_op_DescribeRules.go index 447bab75a05..ca23e22c4c3 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeRules.go +++ b/service/elasticloadbalancingv2/api_op_DescribeRules.go @@ -66,6 +66,9 @@ func addOperationDescribeRulesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeRulesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go b/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go index e7224c28d8a..b81864235d7 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go +++ b/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go @@ -65,6 +65,9 @@ func addOperationDescribeSSLPoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeSSLPoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeTags.go b/service/elasticloadbalancingv2/api_op_DescribeTags.go index 41c07123633..49b001e2ccc 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTags.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTags.go @@ -56,6 +56,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go b/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go index 414add60038..e5eb21027a7 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go @@ -58,6 +58,9 @@ func addOperationDescribeTargetGroupAttributesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeTargetGroupAttributesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go b/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go index c1a8188a852..6eb28ab0324 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go @@ -73,6 +73,9 @@ func addOperationDescribeTargetGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeTargetGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go b/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go index 66cbd12dc00..ad60929b15f 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go @@ -56,6 +56,9 @@ func addOperationDescribeTargetHealthMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeTargetHealthMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_ModifyListener.go b/service/elasticloadbalancingv2/api_op_ModifyListener.go index e5aef971193..cfa192159d6 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyListener.go +++ b/service/elasticloadbalancingv2/api_op_ModifyListener.go @@ -130,6 +130,9 @@ func addOperationModifyListenerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationModifyListenerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go b/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go index c9f4d46fea8..fbc683b7386 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go +++ b/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go @@ -61,6 +61,9 @@ func addOperationModifyLoadBalancerAttributesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationModifyLoadBalancerAttributesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_ModifyRule.go b/service/elasticloadbalancingv2/api_op_ModifyRule.go index 12d3b843cc5..16467552c4b 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyRule.go +++ b/service/elasticloadbalancingv2/api_op_ModifyRule.go @@ -63,6 +63,9 @@ func addOperationModifyRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationModifyRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go b/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go index 806a042a9c5..ede50b12096 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go +++ b/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go @@ -99,6 +99,9 @@ func addOperationModifyTargetGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationModifyTargetGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go b/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go index 76eaff9d756..6b3cde4c5c8 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go +++ b/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go @@ -58,6 +58,9 @@ func addOperationModifyTargetGroupAttributesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationModifyTargetGroupAttributesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_RegisterTargets.go b/service/elasticloadbalancingv2/api_op_RegisterTargets.go index 6f26fb24d33..d788b5a9ff8 100644 --- a/service/elasticloadbalancingv2/api_op_RegisterTargets.go +++ b/service/elasticloadbalancingv2/api_op_RegisterTargets.go @@ -63,6 +63,9 @@ func addOperationRegisterTargetsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRegisterTargetsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go b/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go index 96e18794d7d..d7aa1886125 100644 --- a/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go +++ b/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go @@ -58,6 +58,9 @@ func addOperationRemoveListenerCertificatesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRemoveListenerCertificatesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_RemoveTags.go b/service/elasticloadbalancingv2/api_op_RemoveTags.go index 923189db6b2..b6c2451740a 100644 --- a/service/elasticloadbalancingv2/api_op_RemoveTags.go +++ b/service/elasticloadbalancingv2/api_op_RemoveTags.go @@ -56,6 +56,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_SetIpAddressType.go b/service/elasticloadbalancingv2/api_op_SetIpAddressType.go index 4b6d06418e3..b0992d6ea9d 100644 --- a/service/elasticloadbalancingv2/api_op_SetIpAddressType.go +++ b/service/elasticloadbalancingv2/api_op_SetIpAddressType.go @@ -61,6 +61,9 @@ func addOperationSetIpAddressTypeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationSetIpAddressTypeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_SetRulePriorities.go b/service/elasticloadbalancingv2/api_op_SetRulePriorities.go index f3fdcb27d05..5b445f85ec7 100644 --- a/service/elasticloadbalancingv2/api_op_SetRulePriorities.go +++ b/service/elasticloadbalancingv2/api_op_SetRulePriorities.go @@ -55,6 +55,9 @@ func addOperationSetRulePrioritiesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationSetRulePrioritiesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go b/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go index 0c7a264eb04..fa30853fc2f 100644 --- a/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go +++ b/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go @@ -59,6 +59,9 @@ func addOperationSetSecurityGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationSetSecurityGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/api_op_SetSubnets.go b/service/elasticloadbalancingv2/api_op_SetSubnets.go index bc5451f3e74..256accd311d 100644 --- a/service/elasticloadbalancingv2/api_op_SetSubnets.go +++ b/service/elasticloadbalancingv2/api_op_SetSubnets.go @@ -72,6 +72,9 @@ func addOperationSetSubnetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSetSubnetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticloadbalancingv2/go.mod b/service/elasticloadbalancingv2/go.mod index 3b4812a559d..5ece2f8293a 100644 --- a/service/elasticloadbalancingv2/go.mod +++ b/service/elasticloadbalancingv2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticloadbalancingv2/go.sum b/service/elasticloadbalancingv2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elasticloadbalancingv2/go.sum +++ b/service/elasticloadbalancingv2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticsearchservice/api_client.go b/service/elasticsearchservice/api_client.go index b39faf6c5c5..da84790beaa 100644 --- a/service/elasticsearchservice/api_client.go +++ b/service/elasticsearchservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go index 5eafae51a2f..ecaaa044339 100644 --- a/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go @@ -59,6 +59,9 @@ func addOperationAcceptInboundCrossClusterSearchConnectionMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAcceptInboundCrossClusterSearchConnectionMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_AddTags.go b/service/elasticsearchservice/api_op_AddTags.go index b519451a5fc..e3c5030c682 100644 --- a/service/elasticsearchservice/api_op_AddTags.go +++ b/service/elasticsearchservice/api_op_AddTags.go @@ -59,6 +59,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_AssociatePackage.go b/service/elasticsearchservice/api_op_AssociatePackage.go index b2a92b11876..4fe0354a00c 100644 --- a/service/elasticsearchservice/api_op_AssociatePackage.go +++ b/service/elasticsearchservice/api_op_AssociatePackage.go @@ -61,6 +61,9 @@ func addOperationAssociatePackageMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAssociatePackageMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go b/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go index 63b788cd80f..1bd32ce2f9a 100644 --- a/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go +++ b/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go @@ -61,6 +61,9 @@ func addOperationCancelElasticsearchServiceSoftwareUpdateMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCancelElasticsearchServiceSoftwareUpdateMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go b/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go index 4b1d688bfbf..14b5987ce6c 100644 --- a/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go @@ -116,6 +116,9 @@ func addOperationCreateElasticsearchDomainMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationCreateElasticsearchDomainMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go index f316414a523..2f5de2bf9ef 100644 --- a/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go @@ -83,6 +83,9 @@ func addOperationCreateOutboundCrossClusterSearchConnectionMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateOutboundCrossClusterSearchConnectionMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_CreatePackage.go b/service/elasticsearchservice/api_op_CreatePackage.go index bfc7986fd08..5aab836ee21 100644 --- a/service/elasticsearchservice/api_op_CreatePackage.go +++ b/service/elasticsearchservice/api_op_CreatePackage.go @@ -68,6 +68,9 @@ func addOperationCreatePackageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreatePackageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go b/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go index 085fde9df25..ca89aaf5ae3 100644 --- a/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go @@ -59,6 +59,9 @@ func addOperationDeleteElasticsearchDomainMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteElasticsearchDomainMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go b/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go index ce3b0c400e4..26a0a5426e4 100644 --- a/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go +++ b/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go @@ -48,6 +48,9 @@ func addOperationDeleteElasticsearchServiceRoleMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDeleteElasticsearchServiceRoleMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go index eb3761fcc19..e92f03d7a28 100644 --- a/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go @@ -58,6 +58,9 @@ func addOperationDeleteInboundCrossClusterSearchConnectionMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteInboundCrossClusterSearchConnectionMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go index af5e21c4d69..b161f259731 100644 --- a/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go @@ -59,6 +59,9 @@ func addOperationDeleteOutboundCrossClusterSearchConnectionMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteOutboundCrossClusterSearchConnectionMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DeletePackage.go b/service/elasticsearchservice/api_op_DeletePackage.go index 178c31da890..98ba371fb08 100644 --- a/service/elasticsearchservice/api_op_DeletePackage.go +++ b/service/elasticsearchservice/api_op_DeletePackage.go @@ -56,6 +56,9 @@ func addOperationDeletePackageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeletePackageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go b/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go index 4975b84d173..43fd6b1839a 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go @@ -59,6 +59,9 @@ func addOperationDescribeElasticsearchDomainMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeElasticsearchDomainMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go b/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go index 0f7c41bb266..1ef03c43d88 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go @@ -62,6 +62,9 @@ func addOperationDescribeElasticsearchDomainConfigMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeElasticsearchDomainConfigMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go b/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go index a03239e6db7..a5dc0a2369a 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go @@ -60,6 +60,9 @@ func addOperationDescribeElasticsearchDomainsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeElasticsearchDomainsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go b/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go index fb1b1aa66ff..ff214963d3a 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go @@ -80,6 +80,9 @@ func addOperationDescribeElasticsearchInstanceTypeLimitsMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeElasticsearchInstanceTypeLimitsMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go b/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go index 77768a138c7..b019d68e717 100644 --- a/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go +++ b/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go @@ -82,6 +82,9 @@ func addOperationDescribeInboundCrossClusterSearchConnectionsMiddlewares(stack * if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeInboundCrossClusterSearchConnectionsMiddlewares(stack * if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go b/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go index 68e71b01671..62f4dc5c3a4 100644 --- a/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go +++ b/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go @@ -82,6 +82,9 @@ func addOperationDescribeOutboundCrossClusterSearchConnectionsMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeOutboundCrossClusterSearchConnectionsMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribePackages.go b/service/elasticsearchservice/api_op_DescribePackages.go index bf13cd39812..a24caa65906 100644 --- a/service/elasticsearchservice/api_op_DescribePackages.go +++ b/service/elasticsearchservice/api_op_DescribePackages.go @@ -62,6 +62,9 @@ func addOperationDescribePackagesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribePackagesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go index 4235d3765f6..f3cbc7d8499 100644 --- a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go +++ b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go @@ -65,6 +65,9 @@ func addOperationDescribeReservedElasticsearchInstanceOfferingsMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeReservedElasticsearchInstanceOfferingsMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go index 3e1195eb647..6581be7e1bd 100644 --- a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go +++ b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go @@ -65,6 +65,9 @@ func addOperationDescribeReservedElasticsearchInstancesMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeReservedElasticsearchInstancesMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_DissociatePackage.go b/service/elasticsearchservice/api_op_DissociatePackage.go index b22e0b2c5d7..974c52dda90 100644 --- a/service/elasticsearchservice/api_op_DissociatePackage.go +++ b/service/elasticsearchservice/api_op_DissociatePackage.go @@ -61,6 +61,9 @@ func addOperationDissociatePackageMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDissociatePackageMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go b/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go index f5a7d6e5a3c..7415eea6058 100644 --- a/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go +++ b/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go @@ -60,6 +60,9 @@ func addOperationGetCompatibleElasticsearchVersionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetCompatibleElasticsearchVersionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_GetUpgradeHistory.go b/service/elasticsearchservice/api_op_GetUpgradeHistory.go index cd6e8322abf..7f8912e1ca4 100644 --- a/service/elasticsearchservice/api_op_GetUpgradeHistory.go +++ b/service/elasticsearchservice/api_op_GetUpgradeHistory.go @@ -73,6 +73,9 @@ func addOperationGetUpgradeHistoryMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetUpgradeHistoryMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_GetUpgradeStatus.go b/service/elasticsearchservice/api_op_GetUpgradeStatus.go index 653aec590d2..66e9088dae7 100644 --- a/service/elasticsearchservice/api_op_GetUpgradeStatus.go +++ b/service/elasticsearchservice/api_op_GetUpgradeStatus.go @@ -82,6 +82,9 @@ func addOperationGetUpgradeStatusMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetUpgradeStatusMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_ListDomainNames.go b/service/elasticsearchservice/api_op_ListDomainNames.go index f279f68bb16..778267fd0bd 100644 --- a/service/elasticsearchservice/api_op_ListDomainNames.go +++ b/service/elasticsearchservice/api_op_ListDomainNames.go @@ -51,6 +51,9 @@ func addOperationListDomainNamesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationListDomainNamesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_ListDomainsForPackage.go b/service/elasticsearchservice/api_op_ListDomainsForPackage.go index 900d973e637..8c9c8b507cf 100644 --- a/service/elasticsearchservice/api_op_ListDomainsForPackage.go +++ b/service/elasticsearchservice/api_op_ListDomainsForPackage.go @@ -64,6 +64,9 @@ func addOperationListDomainsForPackageMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDomainsForPackageMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go b/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go index 0f37a5525ed..ab8114975cd 100644 --- a/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go +++ b/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go @@ -77,6 +77,9 @@ func addOperationListElasticsearchInstanceTypesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListElasticsearchInstanceTypesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_ListElasticsearchVersions.go b/service/elasticsearchservice/api_op_ListElasticsearchVersions.go index f894834fa93..1c501d7cdbc 100644 --- a/service/elasticsearchservice/api_op_ListElasticsearchVersions.go +++ b/service/elasticsearchservice/api_op_ListElasticsearchVersions.go @@ -68,6 +68,9 @@ func addOperationListElasticsearchVersionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListElasticsearchVersionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_ListPackagesForDomain.go b/service/elasticsearchservice/api_op_ListPackagesForDomain.go index 62d176ff452..42c7959dde2 100644 --- a/service/elasticsearchservice/api_op_ListPackagesForDomain.go +++ b/service/elasticsearchservice/api_op_ListPackagesForDomain.go @@ -66,6 +66,9 @@ func addOperationListPackagesForDomainMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListPackagesForDomainMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_ListTags.go b/service/elasticsearchservice/api_op_ListTags.go index 786a9b0c344..82671f8b7ba 100644 --- a/service/elasticsearchservice/api_op_ListTags.go +++ b/service/elasticsearchservice/api_op_ListTags.go @@ -59,6 +59,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go b/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go index a064797c8ba..c5ba0afe320 100644 --- a/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go +++ b/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go @@ -66,6 +66,9 @@ func addOperationPurchaseReservedElasticsearchInstanceOfferingMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationPurchaseReservedElasticsearchInstanceOfferingMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go index 5864c97f4e9..74b2b2f34b8 100644 --- a/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go @@ -59,6 +59,9 @@ func addOperationRejectInboundCrossClusterSearchConnectionMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRejectInboundCrossClusterSearchConnectionMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_RemoveTags.go b/service/elasticsearchservice/api_op_RemoveTags.go index 95272c1de90..92725e6e47b 100644 --- a/service/elasticsearchservice/api_op_RemoveTags.go +++ b/service/elasticsearchservice/api_op_RemoveTags.go @@ -57,6 +57,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go b/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go index 2a9ee926ba2..6a8a1939afc 100644 --- a/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go +++ b/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go @@ -58,6 +58,9 @@ func addOperationStartElasticsearchServiceSoftwareUpdateMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationStartElasticsearchServiceSoftwareUpdateMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go b/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go index e321192f227..78e31f58734 100644 --- a/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go +++ b/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go @@ -102,6 +102,9 @@ func addOperationUpdateElasticsearchDomainConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationUpdateElasticsearchDomainConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go b/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go index a755d20447d..0e012e37ae8 100644 --- a/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go @@ -77,6 +77,9 @@ func addOperationUpgradeElasticsearchDomainMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpgradeElasticsearchDomainMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elasticsearchservice/go.mod b/service/elasticsearchservice/go.mod index e8f2bc10099..c426d3d38c0 100644 --- a/service/elasticsearchservice/go.mod +++ b/service/elasticsearchservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elasticsearchservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticsearchservice/go.sum b/service/elasticsearchservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elasticsearchservice/go.sum +++ b/service/elasticsearchservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elastictranscoder/api_client.go b/service/elastictranscoder/api_client.go index 8dcdeb8cd6f..668b075e801 100644 --- a/service/elastictranscoder/api_client.go +++ b/service/elastictranscoder/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/elastictranscoder/api_op_CancelJob.go b/service/elastictranscoder/api_op_CancelJob.go index d0ea42962ca..3c88a90d11b 100644 --- a/service/elastictranscoder/api_op_CancelJob.go +++ b/service/elastictranscoder/api_op_CancelJob.go @@ -56,6 +56,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_CreateJob.go b/service/elastictranscoder/api_op_CreateJob.go index 009c4862784..679b6881e58 100644 --- a/service/elastictranscoder/api_op_CreateJob.go +++ b/service/elastictranscoder/api_op_CreateJob.go @@ -98,6 +98,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_CreatePipeline.go b/service/elastictranscoder/api_op_CreatePipeline.go index 73cf6b22cc1..69450890d20 100644 --- a/service/elastictranscoder/api_op_CreatePipeline.go +++ b/service/elastictranscoder/api_op_CreatePipeline.go @@ -267,6 +267,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -309,6 +312,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_CreatePreset.go b/service/elastictranscoder/api_op_CreatePreset.go index 73d26866778..5726aa639c3 100644 --- a/service/elastictranscoder/api_op_CreatePreset.go +++ b/service/elastictranscoder/api_op_CreatePreset.go @@ -93,6 +93,9 @@ func addOperationCreatePresetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreatePresetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_DeletePipeline.go b/service/elastictranscoder/api_op_DeletePipeline.go index 3b6ce31fd3e..a11123d5441 100644 --- a/service/elastictranscoder/api_op_DeletePipeline.go +++ b/service/elastictranscoder/api_op_DeletePipeline.go @@ -53,6 +53,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_DeletePreset.go b/service/elastictranscoder/api_op_DeletePreset.go index 95fd8139252..972f7c2da16 100644 --- a/service/elastictranscoder/api_op_DeletePreset.go +++ b/service/elastictranscoder/api_op_DeletePreset.go @@ -51,6 +51,9 @@ func addOperationDeletePresetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeletePresetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ListJobsByPipeline.go b/service/elastictranscoder/api_op_ListJobsByPipeline.go index 9a17b93c265..d394082eb11 100644 --- a/service/elastictranscoder/api_op_ListJobsByPipeline.go +++ b/service/elastictranscoder/api_op_ListJobsByPipeline.go @@ -71,6 +71,9 @@ func addOperationListJobsByPipelineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListJobsByPipelineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ListJobsByStatus.go b/service/elastictranscoder/api_op_ListJobsByStatus.go index 0f9674408a9..e100bbc2978 100644 --- a/service/elastictranscoder/api_op_ListJobsByStatus.go +++ b/service/elastictranscoder/api_op_ListJobsByStatus.go @@ -72,6 +72,9 @@ func addOperationListJobsByStatusMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListJobsByStatusMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ListPipelines.go b/service/elastictranscoder/api_op_ListPipelines.go index 2a47c55fb43..53d33cc4aa3 100644 --- a/service/elastictranscoder/api_op_ListPipelines.go +++ b/service/elastictranscoder/api_op_ListPipelines.go @@ -65,6 +65,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ListPresets.go b/service/elastictranscoder/api_op_ListPresets.go index b67e4ff592c..a5b7defe4ec 100644 --- a/service/elastictranscoder/api_op_ListPresets.go +++ b/service/elastictranscoder/api_op_ListPresets.go @@ -65,6 +65,9 @@ func addOperationListPresetsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListPresetsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ReadJob.go b/service/elastictranscoder/api_op_ReadJob.go index 7953af6e0c0..172d99d0eb3 100644 --- a/service/elastictranscoder/api_op_ReadJob.go +++ b/service/elastictranscoder/api_op_ReadJob.go @@ -55,6 +55,9 @@ func addOperationReadJobMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationReadJobMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ReadPipeline.go b/service/elastictranscoder/api_op_ReadPipeline.go index d97e62bc740..4d719ccda58 100644 --- a/service/elastictranscoder/api_op_ReadPipeline.go +++ b/service/elastictranscoder/api_op_ReadPipeline.go @@ -61,6 +61,9 @@ func addOperationReadPipelineMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationReadPipelineMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_ReadPreset.go b/service/elastictranscoder/api_op_ReadPreset.go index 8599b4e32ff..7fe7dbe8df6 100644 --- a/service/elastictranscoder/api_op_ReadPreset.go +++ b/service/elastictranscoder/api_op_ReadPreset.go @@ -55,6 +55,9 @@ func addOperationReadPresetMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationReadPresetMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_TestRole.go b/service/elastictranscoder/api_op_TestRole.go index 40f51209f2f..b5c0e96be57 100644 --- a/service/elastictranscoder/api_op_TestRole.go +++ b/service/elastictranscoder/api_op_TestRole.go @@ -83,6 +83,9 @@ func addOperationTestRoleMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationTestRoleMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_UpdatePipeline.go b/service/elastictranscoder/api_op_UpdatePipeline.go index 37ea9121541..2bec0b4c815 100644 --- a/service/elastictranscoder/api_op_UpdatePipeline.go +++ b/service/elastictranscoder/api_op_UpdatePipeline.go @@ -238,6 +238,9 @@ func addOperationUpdatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -280,6 +283,9 @@ func addOperationUpdatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_UpdatePipelineNotifications.go b/service/elastictranscoder/api_op_UpdatePipelineNotifications.go index 1f209dcf139..bf7ffacb3fc 100644 --- a/service/elastictranscoder/api_op_UpdatePipelineNotifications.go +++ b/service/elastictranscoder/api_op_UpdatePipelineNotifications.go @@ -86,6 +86,9 @@ func addOperationUpdatePipelineNotificationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationUpdatePipelineNotificationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/api_op_UpdatePipelineStatus.go b/service/elastictranscoder/api_op_UpdatePipelineStatus.go index 1822fdb7312..8d4e70465b8 100644 --- a/service/elastictranscoder/api_op_UpdatePipelineStatus.go +++ b/service/elastictranscoder/api_op_UpdatePipelineStatus.go @@ -71,6 +71,9 @@ func addOperationUpdatePipelineStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdatePipelineStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/elastictranscoder/go.mod b/service/elastictranscoder/go.mod index 05ce10eadf2..715356fadad 100644 --- a/service/elastictranscoder/go.mod +++ b/service/elastictranscoder/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/elastictranscoder go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elastictranscoder/go.sum b/service/elastictranscoder/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/elastictranscoder/go.sum +++ b/service/elastictranscoder/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/emr/api_client.go b/service/emr/api_client.go index 42c1d319f8e..d1a0ec391ed 100644 --- a/service/emr/api_client.go +++ b/service/emr/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/emr/api_op_AddInstanceFleet.go b/service/emr/api_op_AddInstanceFleet.go index b4485a59b9b..7a2e544220e 100644 --- a/service/emr/api_op_AddInstanceFleet.go +++ b/service/emr/api_op_AddInstanceFleet.go @@ -65,6 +65,9 @@ func addOperationAddInstanceFleetMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAddInstanceFleetMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_AddInstanceGroups.go b/service/emr/api_op_AddInstanceGroups.go index 238f221ec90..90d82b460b1 100644 --- a/service/emr/api_op_AddInstanceGroups.go +++ b/service/emr/api_op_AddInstanceGroups.go @@ -66,6 +66,9 @@ func addOperationAddInstanceGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationAddInstanceGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_AddJobFlowSteps.go b/service/emr/api_op_AddJobFlowSteps.go index cead84f6073..dad6b895673 100644 --- a/service/emr/api_op_AddJobFlowSteps.go +++ b/service/emr/api_op_AddJobFlowSteps.go @@ -77,6 +77,9 @@ func addOperationAddJobFlowStepsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAddJobFlowStepsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_AddTags.go b/service/emr/api_op_AddTags.go index aaba5b9a5cc..0553e23d525 100644 --- a/service/emr/api_op_AddTags.go +++ b/service/emr/api_op_AddTags.go @@ -63,6 +63,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_CancelSteps.go b/service/emr/api_op_CancelSteps.go index f3dc129518e..19614c1a8ae 100644 --- a/service/emr/api_op_CancelSteps.go +++ b/service/emr/api_op_CancelSteps.go @@ -72,6 +72,9 @@ func addOperationCancelStepsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCancelStepsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_CreateSecurityConfiguration.go b/service/emr/api_op_CreateSecurityConfiguration.go index 5982cf7a8ec..de21c754531 100644 --- a/service/emr/api_op_CreateSecurityConfiguration.go +++ b/service/emr/api_op_CreateSecurityConfiguration.go @@ -69,6 +69,9 @@ func addOperationCreateSecurityConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateSecurityConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_DeleteSecurityConfiguration.go b/service/emr/api_op_DeleteSecurityConfiguration.go index 3e6b26b04e3..77b87008dfc 100644 --- a/service/emr/api_op_DeleteSecurityConfiguration.go +++ b/service/emr/api_op_DeleteSecurityConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeleteSecurityConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteSecurityConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_DescribeCluster.go b/service/emr/api_op_DescribeCluster.go index 2ada4e4081e..47c73a0cf0d 100644 --- a/service/emr/api_op_DescribeCluster.go +++ b/service/emr/api_op_DescribeCluster.go @@ -56,6 +56,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_DescribeJobFlows.go b/service/emr/api_op_DescribeJobFlows.go index c5cbc2ca82c..743d9005cf4 100644 --- a/service/emr/api_op_DescribeJobFlows.go +++ b/service/emr/api_op_DescribeJobFlows.go @@ -79,6 +79,9 @@ func addOperationDescribeJobFlowsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeJobFlowsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_DescribeNotebookExecution.go b/service/emr/api_op_DescribeNotebookExecution.go index 3766e44f2a8..bd96a77dfd8 100644 --- a/service/emr/api_op_DescribeNotebookExecution.go +++ b/service/emr/api_op_DescribeNotebookExecution.go @@ -53,6 +53,9 @@ func addOperationDescribeNotebookExecutionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeNotebookExecutionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_DescribeSecurityConfiguration.go b/service/emr/api_op_DescribeSecurityConfiguration.go index 55dd57b6538..b5346f6e106 100644 --- a/service/emr/api_op_DescribeSecurityConfiguration.go +++ b/service/emr/api_op_DescribeSecurityConfiguration.go @@ -60,6 +60,9 @@ func addOperationDescribeSecurityConfigurationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeSecurityConfigurationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_DescribeStep.go b/service/emr/api_op_DescribeStep.go index 262a6e7af0d..dd3c668ad62 100644 --- a/service/emr/api_op_DescribeStep.go +++ b/service/emr/api_op_DescribeStep.go @@ -60,6 +60,9 @@ func addOperationDescribeStepMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeStepMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_GetBlockPublicAccessConfiguration.go b/service/emr/api_op_GetBlockPublicAccessConfiguration.go index 44afc64b9ee..70edaf025a7 100644 --- a/service/emr/api_op_GetBlockPublicAccessConfiguration.go +++ b/service/emr/api_op_GetBlockPublicAccessConfiguration.go @@ -75,6 +75,9 @@ func addOperationGetBlockPublicAccessConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetBlockPublicAccessConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_GetManagedScalingPolicy.go b/service/emr/api_op_GetManagedScalingPolicy.go index 9e4800c3c15..03f594045f9 100644 --- a/service/emr/api_op_GetManagedScalingPolicy.go +++ b/service/emr/api_op_GetManagedScalingPolicy.go @@ -54,6 +54,9 @@ func addOperationGetManagedScalingPolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetManagedScalingPolicyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListBootstrapActions.go b/service/emr/api_op_ListBootstrapActions.go index 076b8db7b7c..92d55c7dcaa 100644 --- a/service/emr/api_op_ListBootstrapActions.go +++ b/service/emr/api_op_ListBootstrapActions.go @@ -61,6 +61,9 @@ func addOperationListBootstrapActionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListBootstrapActionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListClusters.go b/service/emr/api_op_ListClusters.go index 44f2244b60e..7f8dfe39392 100644 --- a/service/emr/api_op_ListClusters.go +++ b/service/emr/api_op_ListClusters.go @@ -72,6 +72,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListInstanceFleets.go b/service/emr/api_op_ListInstanceFleets.go index 0d776fc9920..2f31d7c0ff2 100644 --- a/service/emr/api_op_ListInstanceFleets.go +++ b/service/emr/api_op_ListInstanceFleets.go @@ -61,6 +61,9 @@ func addOperationListInstanceFleetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListInstanceFleetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListInstanceGroups.go b/service/emr/api_op_ListInstanceGroups.go index 2ac5c54c143..bf1a105391d 100644 --- a/service/emr/api_op_ListInstanceGroups.go +++ b/service/emr/api_op_ListInstanceGroups.go @@ -61,6 +61,9 @@ func addOperationListInstanceGroupsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListInstanceGroupsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListInstances.go b/service/emr/api_op_ListInstances.go index 051ea2bafab..24211679f26 100644 --- a/service/emr/api_op_ListInstances.go +++ b/service/emr/api_op_ListInstances.go @@ -80,6 +80,9 @@ func addOperationListInstancesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListInstancesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListNotebookExecutions.go b/service/emr/api_op_ListNotebookExecutions.go index 717fca902c8..e13595fa146 100644 --- a/service/emr/api_op_ListNotebookExecutions.go +++ b/service/emr/api_op_ListNotebookExecutions.go @@ -105,6 +105,9 @@ func addOperationListNotebookExecutionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationListNotebookExecutionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListSecurityConfigurations.go b/service/emr/api_op_ListSecurityConfigurations.go index 977498f4f89..a88870b6d76 100644 --- a/service/emr/api_op_ListSecurityConfigurations.go +++ b/service/emr/api_op_ListSecurityConfigurations.go @@ -59,6 +59,9 @@ func addOperationListSecurityConfigurationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListSecurityConfigurationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ListSteps.go b/service/emr/api_op_ListSteps.go index b04dfc9bb21..34522fbdc63 100644 --- a/service/emr/api_op_ListSteps.go +++ b/service/emr/api_op_ListSteps.go @@ -72,6 +72,9 @@ func addOperationListStepsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListStepsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ModifyCluster.go b/service/emr/api_op_ModifyCluster.go index 3beed3f3ba9..610f693aeec 100644 --- a/service/emr/api_op_ModifyCluster.go +++ b/service/emr/api_op_ModifyCluster.go @@ -57,6 +57,9 @@ func addOperationModifyClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationModifyClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ModifyInstanceFleet.go b/service/emr/api_op_ModifyInstanceFleet.go index b4e239ff90b..4f40455ff89 100644 --- a/service/emr/api_op_ModifyInstanceFleet.go +++ b/service/emr/api_op_ModifyInstanceFleet.go @@ -58,6 +58,9 @@ func addOperationModifyInstanceFleetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationModifyInstanceFleetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_ModifyInstanceGroups.go b/service/emr/api_op_ModifyInstanceGroups.go index b44c1b5abff..7b5bfe22314 100644 --- a/service/emr/api_op_ModifyInstanceGroups.go +++ b/service/emr/api_op_ModifyInstanceGroups.go @@ -54,6 +54,9 @@ func addOperationModifyInstanceGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationModifyInstanceGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_PutAutoScalingPolicy.go b/service/emr/api_op_PutAutoScalingPolicy.go index ad63751c550..7c84cde1ff1 100644 --- a/service/emr/api_op_PutAutoScalingPolicy.go +++ b/service/emr/api_op_PutAutoScalingPolicy.go @@ -78,6 +78,9 @@ func addOperationPutAutoScalingPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationPutAutoScalingPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_PutBlockPublicAccessConfiguration.go b/service/emr/api_op_PutBlockPublicAccessConfiguration.go index 7ad5a72b620..6bbfba51a40 100644 --- a/service/emr/api_op_PutBlockPublicAccessConfiguration.go +++ b/service/emr/api_op_PutBlockPublicAccessConfiguration.go @@ -65,6 +65,9 @@ func addOperationPutBlockPublicAccessConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationPutBlockPublicAccessConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_PutManagedScalingPolicy.go b/service/emr/api_op_PutManagedScalingPolicy.go index 88e709cfb2d..80f1dd27f49 100644 --- a/service/emr/api_op_PutManagedScalingPolicy.go +++ b/service/emr/api_op_PutManagedScalingPolicy.go @@ -58,6 +58,9 @@ func addOperationPutManagedScalingPolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutManagedScalingPolicyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_RemoveAutoScalingPolicy.go b/service/emr/api_op_RemoveAutoScalingPolicy.go index fca54132fc5..3be6539b822 100644 --- a/service/emr/api_op_RemoveAutoScalingPolicy.go +++ b/service/emr/api_op_RemoveAutoScalingPolicy.go @@ -55,6 +55,9 @@ func addOperationRemoveAutoScalingPolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRemoveAutoScalingPolicyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_RemoveManagedScalingPolicy.go b/service/emr/api_op_RemoveManagedScalingPolicy.go index b83ce7db6a2..f79263db83e 100644 --- a/service/emr/api_op_RemoveManagedScalingPolicy.go +++ b/service/emr/api_op_RemoveManagedScalingPolicy.go @@ -49,6 +49,9 @@ func addOperationRemoveManagedScalingPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationRemoveManagedScalingPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_RemoveTags.go b/service/emr/api_op_RemoveTags.go index fd3953dfc51..a454a29a766 100644 --- a/service/emr/api_op_RemoveTags.go +++ b/service/emr/api_op_RemoveTags.go @@ -60,6 +60,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRemoveTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_RunJobFlow.go b/service/emr/api_op_RunJobFlow.go index ef433de0c4c..773354cc7c3 100644 --- a/service/emr/api_op_RunJobFlow.go +++ b/service/emr/api_op_RunJobFlow.go @@ -259,6 +259,9 @@ func addOperationRunJobFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -301,6 +304,9 @@ func addOperationRunJobFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_SetTerminationProtection.go b/service/emr/api_op_SetTerminationProtection.go index c7b4392211d..233eb7eef0d 100644 --- a/service/emr/api_op_SetTerminationProtection.go +++ b/service/emr/api_op_SetTerminationProtection.go @@ -73,6 +73,9 @@ func addOperationSetTerminationProtectionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSetTerminationProtectionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_SetVisibleToAllUsers.go b/service/emr/api_op_SetVisibleToAllUsers.go index 5a9f622ea68..a8b01bbe6da 100644 --- a/service/emr/api_op_SetVisibleToAllUsers.go +++ b/service/emr/api_op_SetVisibleToAllUsers.go @@ -65,6 +65,9 @@ func addOperationSetVisibleToAllUsersMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSetVisibleToAllUsersMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_StartNotebookExecution.go b/service/emr/api_op_StartNotebookExecution.go index 1b3f60ef783..860190ed7da 100644 --- a/service/emr/api_op_StartNotebookExecution.go +++ b/service/emr/api_op_StartNotebookExecution.go @@ -91,6 +91,9 @@ func addOperationStartNotebookExecutionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationStartNotebookExecutionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_StopNotebookExecution.go b/service/emr/api_op_StopNotebookExecution.go index 4d81f020ed5..e1cd9b2e3d2 100644 --- a/service/emr/api_op_StopNotebookExecution.go +++ b/service/emr/api_op_StopNotebookExecution.go @@ -48,6 +48,9 @@ func addOperationStopNotebookExecutionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopNotebookExecutionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/api_op_TerminateJobFlows.go b/service/emr/api_op_TerminateJobFlows.go index d48b53d4f83..5ea0f856f0c 100644 --- a/service/emr/api_op_TerminateJobFlows.go +++ b/service/emr/api_op_TerminateJobFlows.go @@ -56,6 +56,9 @@ func addOperationTerminateJobFlowsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTerminateJobFlowsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/emr/go.mod b/service/emr/go.mod index 4cc5e37402e..676a600ddac 100644 --- a/service/emr/go.mod +++ b/service/emr/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/emr go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/emr/go.sum b/service/emr/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/emr/go.sum +++ b/service/emr/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go index b14c8593bf0..8f946066299 100644 --- a/service/eventbridge/api_client.go +++ b/service/eventbridge/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/eventbridge/api_op_ActivateEventSource.go b/service/eventbridge/api_op_ActivateEventSource.go index 47484849cb8..d4f90ade2a4 100644 --- a/service/eventbridge/api_op_ActivateEventSource.go +++ b/service/eventbridge/api_op_ActivateEventSource.go @@ -49,6 +49,9 @@ func addOperationActivateEventSourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationActivateEventSourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_CreateEventBus.go b/service/eventbridge/api_op_CreateEventBus.go index daeb5b448ae..871d0136823 100644 --- a/service/eventbridge/api_op_CreateEventBus.go +++ b/service/eventbridge/api_op_CreateEventBus.go @@ -66,6 +66,9 @@ func addOperationCreateEventBusMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateEventBusMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_CreatePartnerEventSource.go b/service/eventbridge/api_op_CreatePartnerEventSource.go index 12c7aa62204..f8b6f39d456 100644 --- a/service/eventbridge/api_op_CreatePartnerEventSource.go +++ b/service/eventbridge/api_op_CreatePartnerEventSource.go @@ -76,6 +76,9 @@ func addOperationCreatePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreatePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DeactivateEventSource.go b/service/eventbridge/api_op_DeactivateEventSource.go index c3d2a217a79..d266fc3a12e 100644 --- a/service/eventbridge/api_op_DeactivateEventSource.go +++ b/service/eventbridge/api_op_DeactivateEventSource.go @@ -52,6 +52,9 @@ func addOperationDeactivateEventSourceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeactivateEventSourceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DeleteEventBus.go b/service/eventbridge/api_op_DeleteEventBus.go index c7551e1bd8e..abcb3ab64b7 100644 --- a/service/eventbridge/api_op_DeleteEventBus.go +++ b/service/eventbridge/api_op_DeleteEventBus.go @@ -50,6 +50,9 @@ func addOperationDeleteEventBusMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteEventBusMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DeletePartnerEventSource.go b/service/eventbridge/api_op_DeletePartnerEventSource.go index 308c5625f1e..abe77814ca5 100644 --- a/service/eventbridge/api_op_DeletePartnerEventSource.go +++ b/service/eventbridge/api_op_DeletePartnerEventSource.go @@ -56,6 +56,9 @@ func addOperationDeletePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeletePartnerEventSourceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DeleteRule.go b/service/eventbridge/api_op_DeleteRule.go index a5617ca8457..383702b0c7c 100644 --- a/service/eventbridge/api_op_DeleteRule.go +++ b/service/eventbridge/api_op_DeleteRule.go @@ -66,6 +66,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DescribeEventBus.go b/service/eventbridge/api_op_DescribeEventBus.go index 1b82f9f8a7c..f78325a6efc 100644 --- a/service/eventbridge/api_op_DescribeEventBus.go +++ b/service/eventbridge/api_op_DescribeEventBus.go @@ -64,6 +64,9 @@ func addOperationDescribeEventBusMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeEventBusMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DescribeEventSource.go b/service/eventbridge/api_op_DescribeEventSource.go index bf43fdcf4c1..623831ae552 100644 --- a/service/eventbridge/api_op_DescribeEventSource.go +++ b/service/eventbridge/api_op_DescribeEventSource.go @@ -75,6 +75,9 @@ func addOperationDescribeEventSourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeEventSourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DescribePartnerEventSource.go b/service/eventbridge/api_op_DescribePartnerEventSource.go index 7d745d1c8c8..504aa11d844 100644 --- a/service/eventbridge/api_op_DescribePartnerEventSource.go +++ b/service/eventbridge/api_op_DescribePartnerEventSource.go @@ -58,6 +58,9 @@ func addOperationDescribePartnerEventSourceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribePartnerEventSourceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DescribeRule.go b/service/eventbridge/api_op_DescribeRule.go index 5ec6b2f0386..db89ac54f35 100644 --- a/service/eventbridge/api_op_DescribeRule.go +++ b/service/eventbridge/api_op_DescribeRule.go @@ -85,6 +85,9 @@ func addOperationDescribeRuleMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeRuleMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_DisableRule.go b/service/eventbridge/api_op_DisableRule.go index 9a442ab7e61..7d323a6479c 100644 --- a/service/eventbridge/api_op_DisableRule.go +++ b/service/eventbridge/api_op_DisableRule.go @@ -55,6 +55,9 @@ func addOperationDisableRuleMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisableRuleMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_EnableRule.go b/service/eventbridge/api_op_EnableRule.go index aaf4ec5bcd3..d46b38a30f6 100644 --- a/service/eventbridge/api_op_EnableRule.go +++ b/service/eventbridge/api_op_EnableRule.go @@ -54,6 +54,9 @@ func addOperationEnableRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationEnableRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListEventBuses.go b/service/eventbridge/api_op_ListEventBuses.go index 9347a5d1ce8..74478a0ef1e 100644 --- a/service/eventbridge/api_op_ListEventBuses.go +++ b/service/eventbridge/api_op_ListEventBuses.go @@ -65,6 +65,9 @@ func addOperationListEventBusesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListEventBusesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListEventSources.go b/service/eventbridge/api_op_ListEventSources.go index 04ca540b1db..c913298a5af 100644 --- a/service/eventbridge/api_op_ListEventSources.go +++ b/service/eventbridge/api_op_ListEventSources.go @@ -66,6 +66,9 @@ func addOperationListEventSourcesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListEventSourcesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go b/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go index 4271fdddb27..afacebc25f7 100644 --- a/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go +++ b/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go @@ -68,6 +68,9 @@ func addOperationListPartnerEventSourceAccountsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListPartnerEventSourceAccountsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListPartnerEventSources.go b/service/eventbridge/api_op_ListPartnerEventSources.go index a6572b354c0..a074ef4b85f 100644 --- a/service/eventbridge/api_op_ListPartnerEventSources.go +++ b/service/eventbridge/api_op_ListPartnerEventSources.go @@ -68,6 +68,9 @@ func addOperationListPartnerEventSourcesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListPartnerEventSourcesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListRuleNamesByTarget.go b/service/eventbridge/api_op_ListRuleNamesByTarget.go index c50b2434787..1529d587468 100644 --- a/service/eventbridge/api_op_ListRuleNamesByTarget.go +++ b/service/eventbridge/api_op_ListRuleNamesByTarget.go @@ -67,6 +67,9 @@ func addOperationListRuleNamesByTargetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListRuleNamesByTargetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListRules.go b/service/eventbridge/api_op_ListRules.go index 365e9256967..6b64e987422 100644 --- a/service/eventbridge/api_op_ListRules.go +++ b/service/eventbridge/api_op_ListRules.go @@ -68,6 +68,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListTagsForResource.go b/service/eventbridge/api_op_ListTagsForResource.go index 2ed47a25601..514ea5a9679 100644 --- a/service/eventbridge/api_op_ListTagsForResource.go +++ b/service/eventbridge/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_ListTargetsByRule.go b/service/eventbridge/api_op_ListTargetsByRule.go index 2628eef5662..f7586897a83 100644 --- a/service/eventbridge/api_op_ListTargetsByRule.go +++ b/service/eventbridge/api_op_ListTargetsByRule.go @@ -67,6 +67,9 @@ func addOperationListTargetsByRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListTargetsByRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_PutEvents.go b/service/eventbridge/api_op_PutEvents.go index ef8e13ff582..7ec9e75870f 100644 --- a/service/eventbridge/api_op_PutEvents.go +++ b/service/eventbridge/api_op_PutEvents.go @@ -60,6 +60,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_PutPartnerEvents.go b/service/eventbridge/api_op_PutPartnerEvents.go index a2d61a9fd62..25cad96a0a3 100644 --- a/service/eventbridge/api_op_PutPartnerEvents.go +++ b/service/eventbridge/api_op_PutPartnerEvents.go @@ -59,6 +59,9 @@ func addOperationPutPartnerEventsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutPartnerEventsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_PutPermission.go b/service/eventbridge/api_op_PutPermission.go index 3f8a18c6446..69fcd6b2500 100644 --- a/service/eventbridge/api_op_PutPermission.go +++ b/service/eventbridge/api_op_PutPermission.go @@ -98,6 +98,9 @@ func addOperationPutPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationPutPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_PutRule.go b/service/eventbridge/api_op_PutRule.go index 97f795ac227..d582b5e6e58 100644 --- a/service/eventbridge/api_op_PutRule.go +++ b/service/eventbridge/api_op_PutRule.go @@ -117,6 +117,9 @@ func addOperationPutRuleMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationPutRuleMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_PutTargets.go b/service/eventbridge/api_op_PutTargets.go index d68efc24607..6652370f0e3 100644 --- a/service/eventbridge/api_op_PutTargets.go +++ b/service/eventbridge/api_op_PutTargets.go @@ -171,6 +171,9 @@ func addOperationPutTargetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -213,6 +216,9 @@ func addOperationPutTargetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_RemovePermission.go b/service/eventbridge/api_op_RemovePermission.go index 25ee0cae957..e7d44ac67c5 100644 --- a/service/eventbridge/api_op_RemovePermission.go +++ b/service/eventbridge/api_op_RemovePermission.go @@ -56,6 +56,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_RemoveTargets.go b/service/eventbridge/api_op_RemoveTargets.go index e294b361d36..859a9b3762e 100644 --- a/service/eventbridge/api_op_RemoveTargets.go +++ b/service/eventbridge/api_op_RemoveTargets.go @@ -77,6 +77,9 @@ func addOperationRemoveTargetsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationRemoveTargetsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_TagResource.go b/service/eventbridge/api_op_TagResource.go index 64d8fdfc33a..29d935359b4 100644 --- a/service/eventbridge/api_op_TagResource.go +++ b/service/eventbridge/api_op_TagResource.go @@ -64,6 +64,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_TestEventPattern.go b/service/eventbridge/api_op_TestEventPattern.go index dcf691af82d..68c48e3e08b 100644 --- a/service/eventbridge/api_op_TestEventPattern.go +++ b/service/eventbridge/api_op_TestEventPattern.go @@ -63,6 +63,9 @@ func addOperationTestEventPatternMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTestEventPatternMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/api_op_UntagResource.go b/service/eventbridge/api_op_UntagResource.go index 3951e47b8e5..85bb880ccd2 100644 --- a/service/eventbridge/api_op_UntagResource.go +++ b/service/eventbridge/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/eventbridge/go.mod b/service/eventbridge/go.mod index d20181df9e8..3c50b66a4ce 100644 --- a/service/eventbridge/go.mod +++ b/service/eventbridge/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/eventbridge go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/eventbridge/go.sum b/service/eventbridge/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/eventbridge/go.sum +++ b/service/eventbridge/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/firehose/api_client.go b/service/firehose/api_client.go index fc1dcae2718..c2002a42009 100644 --- a/service/firehose/api_client.go +++ b/service/firehose/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/firehose/api_op_CreateDeliveryStream.go b/service/firehose/api_op_CreateDeliveryStream.go index 35eeac939cb..c8d2e7ea73e 100644 --- a/service/firehose/api_op_CreateDeliveryStream.go +++ b/service/firehose/api_op_CreateDeliveryStream.go @@ -161,6 +161,9 @@ func addOperationCreateDeliveryStreamMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -203,6 +206,9 @@ func addOperationCreateDeliveryStreamMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_DeleteDeliveryStream.go b/service/firehose/api_op_DeleteDeliveryStream.go index 87e875c89b3..bd6cde4e5a5 100644 --- a/service/firehose/api_op_DeleteDeliveryStream.go +++ b/service/firehose/api_op_DeleteDeliveryStream.go @@ -67,6 +67,9 @@ func addOperationDeleteDeliveryStreamMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteDeliveryStreamMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_DescribeDeliveryStream.go b/service/firehose/api_op_DescribeDeliveryStream.go index 41ceb81545c..4464183c7a0 100644 --- a/service/firehose/api_op_DescribeDeliveryStream.go +++ b/service/firehose/api_op_DescribeDeliveryStream.go @@ -70,6 +70,9 @@ func addOperationDescribeDeliveryStreamMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeDeliveryStreamMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_ListDeliveryStreams.go b/service/firehose/api_op_ListDeliveryStreams.go index d168db51fec..edc677f4895 100644 --- a/service/firehose/api_op_ListDeliveryStreams.go +++ b/service/firehose/api_op_ListDeliveryStreams.go @@ -83,6 +83,9 @@ func addOperationListDeliveryStreamsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListDeliveryStreamsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_ListTagsForDeliveryStream.go b/service/firehose/api_op_ListTagsForDeliveryStream.go index 05348a4f6a0..e13cc9ab35e 100644 --- a/service/firehose/api_op_ListTagsForDeliveryStream.go +++ b/service/firehose/api_op_ListTagsForDeliveryStream.go @@ -75,6 +75,9 @@ func addOperationListTagsForDeliveryStreamMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListTagsForDeliveryStreamMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_PutRecord.go b/service/firehose/api_op_PutRecord.go index 1e15c00a6ba..6a26e5e4370 100644 --- a/service/firehose/api_op_PutRecord.go +++ b/service/firehose/api_op_PutRecord.go @@ -91,6 +91,9 @@ func addOperationPutRecordMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationPutRecordMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_PutRecordBatch.go b/service/firehose/api_op_PutRecordBatch.go index 2a46fbcf04d..c24016f26ca 100644 --- a/service/firehose/api_op_PutRecordBatch.go +++ b/service/firehose/api_op_PutRecordBatch.go @@ -117,6 +117,9 @@ func addOperationPutRecordBatchMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationPutRecordBatchMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_StartDeliveryStreamEncryption.go b/service/firehose/api_op_StartDeliveryStreamEncryption.go index d37f1a631c5..13244a1cf57 100644 --- a/service/firehose/api_op_StartDeliveryStreamEncryption.go +++ b/service/firehose/api_op_StartDeliveryStreamEncryption.go @@ -85,6 +85,9 @@ func addOperationStartDeliveryStreamEncryptionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationStartDeliveryStreamEncryptionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_StopDeliveryStreamEncryption.go b/service/firehose/api_op_StopDeliveryStreamEncryption.go index 35065cf0008..f90ad1595e2 100644 --- a/service/firehose/api_op_StopDeliveryStreamEncryption.go +++ b/service/firehose/api_op_StopDeliveryStreamEncryption.go @@ -66,6 +66,9 @@ func addOperationStopDeliveryStreamEncryptionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationStopDeliveryStreamEncryptionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_TagDeliveryStream.go b/service/firehose/api_op_TagDeliveryStream.go index ddfbab88691..554c6f8eecc 100644 --- a/service/firehose/api_op_TagDeliveryStream.go +++ b/service/firehose/api_op_TagDeliveryStream.go @@ -63,6 +63,9 @@ func addOperationTagDeliveryStreamMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTagDeliveryStreamMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_UntagDeliveryStream.go b/service/firehose/api_op_UntagDeliveryStream.go index 818c85bbbce..895aba9a1a9 100644 --- a/service/firehose/api_op_UntagDeliveryStream.go +++ b/service/firehose/api_op_UntagDeliveryStream.go @@ -56,6 +56,9 @@ func addOperationUntagDeliveryStreamMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagDeliveryStreamMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/api_op_UpdateDestination.go b/service/firehose/api_op_UpdateDestination.go index eac81a4834b..0f9508af9f2 100644 --- a/service/firehose/api_op_UpdateDestination.go +++ b/service/firehose/api_op_UpdateDestination.go @@ -105,6 +105,9 @@ func addOperationUpdateDestinationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationUpdateDestinationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/firehose/go.mod b/service/firehose/go.mod index 17cea7f3532..12289c1b871 100644 --- a/service/firehose/go.mod +++ b/service/firehose/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/firehose go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/firehose/go.sum b/service/firehose/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/firehose/go.sum +++ b/service/firehose/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/fms/api_client.go b/service/fms/api_client.go index 0b4766e8008..1b20bc815ac 100644 --- a/service/fms/api_client.go +++ b/service/fms/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/fms/api_op_AssociateAdminAccount.go b/service/fms/api_op_AssociateAdminAccount.go index 1ecbd0f0299..4ee01f3c0d9 100644 --- a/service/fms/api_op_AssociateAdminAccount.go +++ b/service/fms/api_op_AssociateAdminAccount.go @@ -58,6 +58,9 @@ func addOperationAssociateAdminAccountMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAssociateAdminAccountMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_DeleteAppsList.go b/service/fms/api_op_DeleteAppsList.go index 84a3e81d1ae..c2e325eff46 100644 --- a/service/fms/api_op_DeleteAppsList.go +++ b/service/fms/api_op_DeleteAppsList.go @@ -49,6 +49,9 @@ func addOperationDeleteAppsListMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteAppsListMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_DeleteNotificationChannel.go b/service/fms/api_op_DeleteNotificationChannel.go index 6b97cdc5bee..b7aeb6b231d 100644 --- a/service/fms/api_op_DeleteNotificationChannel.go +++ b/service/fms/api_op_DeleteNotificationChannel.go @@ -45,6 +45,9 @@ func addOperationDeleteNotificationChannelMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationDeleteNotificationChannelMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_DeletePolicy.go b/service/fms/api_op_DeletePolicy.go index 3e2236bd40e..ca137577692 100644 --- a/service/fms/api_op_DeletePolicy.go +++ b/service/fms/api_op_DeletePolicy.go @@ -80,6 +80,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_DeleteProtocolsList.go b/service/fms/api_op_DeleteProtocolsList.go index 4311c148214..ec053bc6077 100644 --- a/service/fms/api_op_DeleteProtocolsList.go +++ b/service/fms/api_op_DeleteProtocolsList.go @@ -49,6 +49,9 @@ func addOperationDeleteProtocolsListMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteProtocolsListMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_DisassociateAdminAccount.go b/service/fms/api_op_DisassociateAdminAccount.go index ed34864ad22..358d961fa1d 100644 --- a/service/fms/api_op_DisassociateAdminAccount.go +++ b/service/fms/api_op_DisassociateAdminAccount.go @@ -45,6 +45,9 @@ func addOperationDisassociateAdminAccountMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationDisassociateAdminAccountMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetAdminAccount.go b/service/fms/api_op_GetAdminAccount.go index bd040eb110a..c15036feb2c 100644 --- a/service/fms/api_op_GetAdminAccount.go +++ b/service/fms/api_op_GetAdminAccount.go @@ -53,6 +53,9 @@ func addOperationGetAdminAccountMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetAdminAccountMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetAppsList.go b/service/fms/api_op_GetAppsList.go index 163931fe98a..02bd974790a 100644 --- a/service/fms/api_op_GetAppsList.go +++ b/service/fms/api_op_GetAppsList.go @@ -61,6 +61,9 @@ func addOperationGetAppsListMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetAppsListMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetComplianceDetail.go b/service/fms/api_op_GetComplianceDetail.go index 51591811cc1..655a18fd2de 100644 --- a/service/fms/api_op_GetComplianceDetail.go +++ b/service/fms/api_op_GetComplianceDetail.go @@ -66,6 +66,9 @@ func addOperationGetComplianceDetailMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetComplianceDetailMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetNotificationChannel.go b/service/fms/api_op_GetNotificationChannel.go index 32c2eb0dfe9..8b42786988f 100644 --- a/service/fms/api_op_GetNotificationChannel.go +++ b/service/fms/api_op_GetNotificationChannel.go @@ -51,6 +51,9 @@ func addOperationGetNotificationChannelMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetNotificationChannelMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetPolicy.go b/service/fms/api_op_GetPolicy.go index dea842a27a4..3fbe6480fbf 100644 --- a/service/fms/api_op_GetPolicy.go +++ b/service/fms/api_op_GetPolicy.go @@ -56,6 +56,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetProtectionStatus.go b/service/fms/api_op_GetProtectionStatus.go index af7d9675aa8..9a0cfd645cd 100644 --- a/service/fms/api_op_GetProtectionStatus.go +++ b/service/fms/api_op_GetProtectionStatus.go @@ -118,6 +118,9 @@ func addOperationGetProtectionStatusMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetProtectionStatusMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetProtocolsList.go b/service/fms/api_op_GetProtocolsList.go index d69c1f3e830..db3bf91d3dd 100644 --- a/service/fms/api_op_GetProtocolsList.go +++ b/service/fms/api_op_GetProtocolsList.go @@ -60,6 +60,9 @@ func addOperationGetProtocolsListMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetProtocolsListMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_GetViolationDetails.go b/service/fms/api_op_GetViolationDetails.go index 177b3c72951..7b119e701e7 100644 --- a/service/fms/api_op_GetViolationDetails.go +++ b/service/fms/api_op_GetViolationDetails.go @@ -74,6 +74,9 @@ func addOperationGetViolationDetailsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetViolationDetailsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_ListAppsLists.go b/service/fms/api_op_ListAppsLists.go index fa6f9957b67..c86349db8bf 100644 --- a/service/fms/api_op_ListAppsLists.go +++ b/service/fms/api_op_ListAppsLists.go @@ -73,6 +73,9 @@ func addOperationListAppsListsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListAppsListsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_ListComplianceStatus.go b/service/fms/api_op_ListComplianceStatus.go index f5d83a9822b..3805d6efae9 100644 --- a/service/fms/api_op_ListComplianceStatus.go +++ b/service/fms/api_op_ListComplianceStatus.go @@ -77,6 +77,9 @@ func addOperationListComplianceStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListComplianceStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_ListMemberAccounts.go b/service/fms/api_op_ListMemberAccounts.go index 21d3fcaacd5..9bc39711e06 100644 --- a/service/fms/api_op_ListMemberAccounts.go +++ b/service/fms/api_op_ListMemberAccounts.go @@ -69,6 +69,9 @@ func addOperationListMemberAccountsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListMemberAccountsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_ListPolicies.go b/service/fms/api_op_ListPolicies.go index 4af2778a254..0cb6db076b1 100644 --- a/service/fms/api_op_ListPolicies.go +++ b/service/fms/api_op_ListPolicies.go @@ -68,6 +68,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_ListProtocolsLists.go b/service/fms/api_op_ListProtocolsLists.go index 4367f85e7a0..4bd15be343e 100644 --- a/service/fms/api_op_ListProtocolsLists.go +++ b/service/fms/api_op_ListProtocolsLists.go @@ -73,6 +73,9 @@ func addOperationListProtocolsListsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListProtocolsListsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_ListTagsForResource.go b/service/fms/api_op_ListTagsForResource.go index 363803fffdd..639692dd8e0 100644 --- a/service/fms/api_op_ListTagsForResource.go +++ b/service/fms/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_PutAppsList.go b/service/fms/api_op_PutAppsList.go index a4c8c4efb89..7d8bc8cffb3 100644 --- a/service/fms/api_op_PutAppsList.go +++ b/service/fms/api_op_PutAppsList.go @@ -59,6 +59,9 @@ func addOperationPutAppsListMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutAppsListMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_PutNotificationChannel.go b/service/fms/api_op_PutNotificationChannel.go index c27a69ed444..8b48f66c572 100644 --- a/service/fms/api_op_PutNotificationChannel.go +++ b/service/fms/api_op_PutNotificationChannel.go @@ -56,6 +56,9 @@ func addOperationPutNotificationChannelMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPutNotificationChannelMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_PutPolicy.go b/service/fms/api_op_PutPolicy.go index 013be932d2a..aae1f22174a 100644 --- a/service/fms/api_op_PutPolicy.go +++ b/service/fms/api_op_PutPolicy.go @@ -81,6 +81,9 @@ func addOperationPutPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationPutPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_PutProtocolsList.go b/service/fms/api_op_PutProtocolsList.go index b7f4f2b85d5..bf91556c80e 100644 --- a/service/fms/api_op_PutProtocolsList.go +++ b/service/fms/api_op_PutProtocolsList.go @@ -59,6 +59,9 @@ func addOperationPutProtocolsListMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutProtocolsListMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_TagResource.go b/service/fms/api_op_TagResource.go index e3193cf711f..c6616e972e0 100644 --- a/service/fms/api_op_TagResource.go +++ b/service/fms/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/api_op_UntagResource.go b/service/fms/api_op_UntagResource.go index 004b70d1f7f..3d4dfa6aa2a 100644 --- a/service/fms/api_op_UntagResource.go +++ b/service/fms/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fms/go.mod b/service/fms/go.mod index 9e893b0fca3..a801dc9f1e8 100644 --- a/service/fms/go.mod +++ b/service/fms/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/fms go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/fms/go.sum b/service/fms/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/fms/go.sum +++ b/service/fms/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/forecast/api_client.go b/service/forecast/api_client.go index 0b2eb4b38cf..7bacc36f5b8 100644 --- a/service/forecast/api_client.go +++ b/service/forecast/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/forecast/api_op_CreateDataset.go b/service/forecast/api_op_CreateDataset.go index 6df5a1ef5ee..7e90d9fff94 100644 --- a/service/forecast/api_op_CreateDataset.go +++ b/service/forecast/api_op_CreateDataset.go @@ -146,6 +146,9 @@ func addOperationCreateDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationCreateDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_CreateDatasetGroup.go b/service/forecast/api_op_CreateDatasetGroup.go index 52b6f3b6566..72a4d9c1a02 100644 --- a/service/forecast/api_op_CreateDatasetGroup.go +++ b/service/forecast/api_op_CreateDatasetGroup.go @@ -108,6 +108,9 @@ func addOperationCreateDatasetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateDatasetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_CreateDatasetImportJob.go b/service/forecast/api_op_CreateDatasetImportJob.go index 9d082a019cf..3f7ac9eb362 100644 --- a/service/forecast/api_op_CreateDatasetImportJob.go +++ b/service/forecast/api_op_CreateDatasetImportJob.go @@ -134,6 +134,9 @@ func addOperationCreateDatasetImportJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationCreateDatasetImportJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_CreateForecast.go b/service/forecast/api_op_CreateForecast.go index 2794655baee..e2d4b211c81 100644 --- a/service/forecast/api_op_CreateForecast.go +++ b/service/forecast/api_op_CreateForecast.go @@ -109,6 +109,9 @@ func addOperationCreateForecastMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateForecastMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_CreateForecastExportJob.go b/service/forecast/api_op_CreateForecastExportJob.go index caad874e4f0..eb6928857c2 100644 --- a/service/forecast/api_op_CreateForecastExportJob.go +++ b/service/forecast/api_op_CreateForecastExportJob.go @@ -110,6 +110,9 @@ func addOperationCreateForecastExportJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationCreateForecastExportJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_CreatePredictor.go b/service/forecast/api_op_CreatePredictor.go index 983d2856d13..9b56d53fcdc 100644 --- a/service/forecast/api_op_CreatePredictor.go +++ b/service/forecast/api_op_CreatePredictor.go @@ -204,6 +204,9 @@ func addOperationCreatePredictorMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -246,6 +249,9 @@ func addOperationCreatePredictorMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DeleteDataset.go b/service/forecast/api_op_DeleteDataset.go index 2f6bab7be32..2d4d95a769b 100644 --- a/service/forecast/api_op_DeleteDataset.go +++ b/service/forecast/api_op_DeleteDataset.go @@ -53,6 +53,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DeleteDatasetGroup.go b/service/forecast/api_op_DeleteDatasetGroup.go index dc1e3b4e652..3a108379d7f 100644 --- a/service/forecast/api_op_DeleteDatasetGroup.go +++ b/service/forecast/api_op_DeleteDatasetGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteDatasetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDatasetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DeleteDatasetImportJob.go b/service/forecast/api_op_DeleteDatasetImportJob.go index c8b1dc94e7d..2b8e1b2283a 100644 --- a/service/forecast/api_op_DeleteDatasetImportJob.go +++ b/service/forecast/api_op_DeleteDatasetImportJob.go @@ -50,6 +50,9 @@ func addOperationDeleteDatasetImportJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteDatasetImportJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DeleteForecast.go b/service/forecast/api_op_DeleteForecast.go index 29e1cec51a6..ff2b8d9728f 100644 --- a/service/forecast/api_op_DeleteForecast.go +++ b/service/forecast/api_op_DeleteForecast.go @@ -52,6 +52,9 @@ func addOperationDeleteForecastMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteForecastMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DeleteForecastExportJob.go b/service/forecast/api_op_DeleteForecastExportJob.go index a557666cfb1..ba7d6ec9ab7 100644 --- a/service/forecast/api_op_DeleteForecastExportJob.go +++ b/service/forecast/api_op_DeleteForecastExportJob.go @@ -50,6 +50,9 @@ func addOperationDeleteForecastExportJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteForecastExportJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DeletePredictor.go b/service/forecast/api_op_DeletePredictor.go index dfd18824a2c..805371fa850 100644 --- a/service/forecast/api_op_DeletePredictor.go +++ b/service/forecast/api_op_DeletePredictor.go @@ -50,6 +50,9 @@ func addOperationDeletePredictorMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeletePredictorMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DescribeDataset.go b/service/forecast/api_op_DescribeDataset.go index 7ccceceec84..be897e45bd8 100644 --- a/service/forecast/api_op_DescribeDataset.go +++ b/service/forecast/api_op_DescribeDataset.go @@ -115,6 +115,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DescribeDatasetGroup.go b/service/forecast/api_op_DescribeDatasetGroup.go index 0b8b5f5b45a..6a312ee97c4 100644 --- a/service/forecast/api_op_DescribeDatasetGroup.go +++ b/service/forecast/api_op_DescribeDatasetGroup.go @@ -101,6 +101,9 @@ func addOperationDescribeDatasetGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeDatasetGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DescribeDatasetImportJob.go b/service/forecast/api_op_DescribeDatasetImportJob.go index 22704f4cbbf..52013fa6e16 100644 --- a/service/forecast/api_op_DescribeDatasetImportJob.go +++ b/service/forecast/api_op_DescribeDatasetImportJob.go @@ -131,6 +131,9 @@ func addOperationDescribeDatasetImportJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationDescribeDatasetImportJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DescribeForecast.go b/service/forecast/api_op_DescribeForecast.go index 98b78f03823..980ed549b93 100644 --- a/service/forecast/api_op_DescribeForecast.go +++ b/service/forecast/api_op_DescribeForecast.go @@ -105,6 +105,9 @@ func addOperationDescribeForecastMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationDescribeForecastMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DescribeForecastExportJob.go b/service/forecast/api_op_DescribeForecastExportJob.go index 1a430e3c612..f82651b1055 100644 --- a/service/forecast/api_op_DescribeForecastExportJob.go +++ b/service/forecast/api_op_DescribeForecastExportJob.go @@ -99,6 +99,9 @@ func addOperationDescribeForecastExportJobMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDescribeForecastExportJobMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_DescribePredictor.go b/service/forecast/api_op_DescribePredictor.go index 507c025cc1c..ea09edcf2c2 100644 --- a/service/forecast/api_op_DescribePredictor.go +++ b/service/forecast/api_op_DescribePredictor.go @@ -155,6 +155,9 @@ func addOperationDescribePredictorMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -197,6 +200,9 @@ func addOperationDescribePredictorMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_GetAccuracyMetrics.go b/service/forecast/api_op_GetAccuracyMetrics.go index 5822823251d..47bb244e0a4 100644 --- a/service/forecast/api_op_GetAccuracyMetrics.go +++ b/service/forecast/api_op_GetAccuracyMetrics.go @@ -66,6 +66,9 @@ func addOperationGetAccuracyMetricsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetAccuracyMetricsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListDatasetGroups.go b/service/forecast/api_op_ListDatasetGroups.go index 1952e2c156c..c7ece5c186f 100644 --- a/service/forecast/api_op_ListDatasetGroups.go +++ b/service/forecast/api_op_ListDatasetGroups.go @@ -64,6 +64,9 @@ func addOperationListDatasetGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListDatasetGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListDatasetImportJobs.go b/service/forecast/api_op_ListDatasetImportJobs.go index 401b2bb9472..8f6e68ee273 100644 --- a/service/forecast/api_op_ListDatasetImportJobs.go +++ b/service/forecast/api_op_ListDatasetImportJobs.go @@ -85,6 +85,9 @@ func addOperationListDatasetImportJobsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListDatasetImportJobsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListDatasets.go b/service/forecast/api_op_ListDatasets.go index 967e6fc15b1..eb041271278 100644 --- a/service/forecast/api_op_ListDatasets.go +++ b/service/forecast/api_op_ListDatasets.go @@ -63,6 +63,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListForecastExportJobs.go b/service/forecast/api_op_ListForecastExportJobs.go index 9a8ad35db8a..480088286d4 100644 --- a/service/forecast/api_op_ListForecastExportJobs.go +++ b/service/forecast/api_op_ListForecastExportJobs.go @@ -86,6 +86,9 @@ func addOperationListForecastExportJobsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListForecastExportJobsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListForecasts.go b/service/forecast/api_op_ListForecasts.go index 6b0dbfde393..f8358b9c279 100644 --- a/service/forecast/api_op_ListForecasts.go +++ b/service/forecast/api_op_ListForecasts.go @@ -85,6 +85,9 @@ func addOperationListForecastsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListForecastsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListPredictors.go b/service/forecast/api_op_ListPredictors.go index 591ca265878..c529e8cc847 100644 --- a/service/forecast/api_op_ListPredictors.go +++ b/service/forecast/api_op_ListPredictors.go @@ -85,6 +85,9 @@ func addOperationListPredictorsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListPredictorsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_ListTagsForResource.go b/service/forecast/api_op_ListTagsForResource.go index 5e53f37cf23..faa511c607a 100644 --- a/service/forecast/api_op_ListTagsForResource.go +++ b/service/forecast/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_TagResource.go b/service/forecast/api_op_TagResource.go index a51800c07b4..e30e836cd23 100644 --- a/service/forecast/api_op_TagResource.go +++ b/service/forecast/api_op_TagResource.go @@ -87,6 +87,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_UntagResource.go b/service/forecast/api_op_UntagResource.go index 981aae80e36..9b6d02c4c81 100644 --- a/service/forecast/api_op_UntagResource.go +++ b/service/forecast/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/api_op_UpdateDatasetGroup.go b/service/forecast/api_op_UpdateDatasetGroup.go index 88efec5f5e2..022dd5f36fb 100644 --- a/service/forecast/api_op_UpdateDatasetGroup.go +++ b/service/forecast/api_op_UpdateDatasetGroup.go @@ -56,6 +56,9 @@ func addOperationUpdateDatasetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateDatasetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecast/go.mod b/service/forecast/go.mod index 2e299735e52..bbad1f6ec9a 100644 --- a/service/forecast/go.mod +++ b/service/forecast/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/forecast go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/forecast/go.sum b/service/forecast/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/forecast/go.sum +++ b/service/forecast/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/forecastquery/api_client.go b/service/forecastquery/api_client.go index 15f0177ed3a..e720187f8ab 100644 --- a/service/forecastquery/api_client.go +++ b/service/forecastquery/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/forecastquery/api_op_QueryForecast.go b/service/forecastquery/api_op_QueryForecast.go index 26c4746a126..4e20a8d1d2a 100644 --- a/service/forecastquery/api_op_QueryForecast.go +++ b/service/forecastquery/api_op_QueryForecast.go @@ -85,6 +85,9 @@ func addOperationQueryForecastMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationQueryForecastMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/forecastquery/go.mod b/service/forecastquery/go.mod index e456c627109..3763a79c1b0 100644 --- a/service/forecastquery/go.mod +++ b/service/forecastquery/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/forecastquery go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/forecastquery/go.sum b/service/forecastquery/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/forecastquery/go.sum +++ b/service/forecastquery/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/frauddetector/api_client.go b/service/frauddetector/api_client.go index 1bd5523e983..4bc0e6bd623 100644 --- a/service/frauddetector/api_client.go +++ b/service/frauddetector/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/frauddetector/api_op_BatchCreateVariable.go b/service/frauddetector/api_op_BatchCreateVariable.go index fdcba023c69..10221645cac 100644 --- a/service/frauddetector/api_op_BatchCreateVariable.go +++ b/service/frauddetector/api_op_BatchCreateVariable.go @@ -56,6 +56,9 @@ func addOperationBatchCreateVariableMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchCreateVariableMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_BatchGetVariable.go b/service/frauddetector/api_op_BatchGetVariable.go index df27b42a3dd..1e20ea2bbd7 100644 --- a/service/frauddetector/api_op_BatchGetVariable.go +++ b/service/frauddetector/api_op_BatchGetVariable.go @@ -56,6 +56,9 @@ func addOperationBatchGetVariableMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchGetVariableMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_CreateDetectorVersion.go b/service/frauddetector/api_op_CreateDetectorVersion.go index e231b99596e..585eecd7bd6 100644 --- a/service/frauddetector/api_op_CreateDetectorVersion.go +++ b/service/frauddetector/api_op_CreateDetectorVersion.go @@ -85,6 +85,9 @@ func addOperationCreateDetectorVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateDetectorVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_CreateModel.go b/service/frauddetector/api_op_CreateModel.go index b5c7a642eba..2bcc80d0936 100644 --- a/service/frauddetector/api_op_CreateModel.go +++ b/service/frauddetector/api_op_CreateModel.go @@ -65,6 +65,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_CreateModelVersion.go b/service/frauddetector/api_op_CreateModelVersion.go index c245e168aed..2aea56a8e78 100644 --- a/service/frauddetector/api_op_CreateModelVersion.go +++ b/service/frauddetector/api_op_CreateModelVersion.go @@ -84,6 +84,9 @@ func addOperationCreateModelVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateModelVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_CreateRule.go b/service/frauddetector/api_op_CreateRule.go index 35be3c92c98..6537473bb78 100644 --- a/service/frauddetector/api_op_CreateRule.go +++ b/service/frauddetector/api_op_CreateRule.go @@ -79,6 +79,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_CreateVariable.go b/service/frauddetector/api_op_CreateVariable.go index 196753742a7..7cee5558660 100644 --- a/service/frauddetector/api_op_CreateVariable.go +++ b/service/frauddetector/api_op_CreateVariable.go @@ -81,6 +81,9 @@ func addOperationCreateVariableMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateVariableMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_DeleteDetector.go b/service/frauddetector/api_op_DeleteDetector.go index ee35bdb4fc4..95428d987ab 100644 --- a/service/frauddetector/api_op_DeleteDetector.go +++ b/service/frauddetector/api_op_DeleteDetector.go @@ -49,6 +49,9 @@ func addOperationDeleteDetectorMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteDetectorMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_DeleteDetectorVersion.go b/service/frauddetector/api_op_DeleteDetectorVersion.go index db892439c8a..0881770d45a 100644 --- a/service/frauddetector/api_op_DeleteDetectorVersion.go +++ b/service/frauddetector/api_op_DeleteDetectorVersion.go @@ -54,6 +54,9 @@ func addOperationDeleteDetectorVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteDetectorVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_DeleteEvent.go b/service/frauddetector/api_op_DeleteEvent.go index f0a39337727..2d010ab9388 100644 --- a/service/frauddetector/api_op_DeleteEvent.go +++ b/service/frauddetector/api_op_DeleteEvent.go @@ -53,6 +53,9 @@ func addOperationDeleteEventMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteEventMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_DeleteRule.go b/service/frauddetector/api_op_DeleteRule.go index 7720ee41ae3..fe01f271ec0 100644 --- a/service/frauddetector/api_op_DeleteRule.go +++ b/service/frauddetector/api_op_DeleteRule.go @@ -50,6 +50,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_DescribeDetector.go b/service/frauddetector/api_op_DescribeDetector.go index b3f05b216d3..1830f7efa58 100644 --- a/service/frauddetector/api_op_DescribeDetector.go +++ b/service/frauddetector/api_op_DescribeDetector.go @@ -68,6 +68,9 @@ func addOperationDescribeDetectorMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeDetectorMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_DescribeModelVersions.go b/service/frauddetector/api_op_DescribeModelVersions.go index 537dd520c84..e45c61eacc9 100644 --- a/service/frauddetector/api_op_DescribeModelVersions.go +++ b/service/frauddetector/api_op_DescribeModelVersions.go @@ -68,6 +68,9 @@ func addOperationDescribeModelVersionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeModelVersionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetDetectorVersion.go b/service/frauddetector/api_op_GetDetectorVersion.go index b30e3b3d0a7..57f46f8b760 100644 --- a/service/frauddetector/api_op_GetDetectorVersion.go +++ b/service/frauddetector/api_op_GetDetectorVersion.go @@ -93,6 +93,9 @@ func addOperationGetDetectorVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationGetDetectorVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetDetectors.go b/service/frauddetector/api_op_GetDetectors.go index 98fe341179f..db42c450dd4 100644 --- a/service/frauddetector/api_op_GetDetectors.go +++ b/service/frauddetector/api_op_GetDetectors.go @@ -65,6 +65,9 @@ func addOperationGetDetectorsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetDetectorsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetEntityTypes.go b/service/frauddetector/api_op_GetEntityTypes.go index 76c2dfd8b49..af9520548c4 100644 --- a/service/frauddetector/api_op_GetEntityTypes.go +++ b/service/frauddetector/api_op_GetEntityTypes.go @@ -65,6 +65,9 @@ func addOperationGetEntityTypesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetEntityTypesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetEventPrediction.go b/service/frauddetector/api_op_GetEventPrediction.go index 1d7bfccbf42..aa8f20d7197 100644 --- a/service/frauddetector/api_op_GetEventPrediction.go +++ b/service/frauddetector/api_op_GetEventPrediction.go @@ -96,6 +96,9 @@ func addOperationGetEventPredictionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationGetEventPredictionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetEventTypes.go b/service/frauddetector/api_op_GetEventTypes.go index c95bb82bd49..7c99b5350b1 100644 --- a/service/frauddetector/api_op_GetEventTypes.go +++ b/service/frauddetector/api_op_GetEventTypes.go @@ -65,6 +65,9 @@ func addOperationGetEventTypesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetEventTypesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetExternalModels.go b/service/frauddetector/api_op_GetExternalModels.go index 98e1d81706d..6ea37c911a4 100644 --- a/service/frauddetector/api_op_GetExternalModels.go +++ b/service/frauddetector/api_op_GetExternalModels.go @@ -65,6 +65,9 @@ func addOperationGetExternalModelsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetExternalModelsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetKMSEncryptionKey.go b/service/frauddetector/api_op_GetKMSEncryptionKey.go index efeaffd61ce..07d5c29c297 100644 --- a/service/frauddetector/api_op_GetKMSEncryptionKey.go +++ b/service/frauddetector/api_op_GetKMSEncryptionKey.go @@ -49,6 +49,9 @@ func addOperationGetKMSEncryptionKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGetKMSEncryptionKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetLabels.go b/service/frauddetector/api_op_GetLabels.go index 5dccb50f5b4..009e6b918c9 100644 --- a/service/frauddetector/api_op_GetLabels.go +++ b/service/frauddetector/api_op_GetLabels.go @@ -65,6 +65,9 @@ func addOperationGetLabelsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetLabelsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetModelVersion.go b/service/frauddetector/api_op_GetModelVersion.go index cb86ddcb2b5..8cbdc68a2f9 100644 --- a/service/frauddetector/api_op_GetModelVersion.go +++ b/service/frauddetector/api_op_GetModelVersion.go @@ -84,6 +84,9 @@ func addOperationGetModelVersionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetModelVersionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetModels.go b/service/frauddetector/api_op_GetModels.go index 17beed0be2b..37064041269 100644 --- a/service/frauddetector/api_op_GetModels.go +++ b/service/frauddetector/api_op_GetModels.go @@ -70,6 +70,9 @@ func addOperationGetModelsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetModelsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetOutcomes.go b/service/frauddetector/api_op_GetOutcomes.go index ec5cf3057fa..7147a74f11e 100644 --- a/service/frauddetector/api_op_GetOutcomes.go +++ b/service/frauddetector/api_op_GetOutcomes.go @@ -64,6 +64,9 @@ func addOperationGetOutcomesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetOutcomesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetRules.go b/service/frauddetector/api_op_GetRules.go index ae30b363b08..dd35cd69339 100644 --- a/service/frauddetector/api_op_GetRules.go +++ b/service/frauddetector/api_op_GetRules.go @@ -75,6 +75,9 @@ func addOperationGetRulesMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetRulesMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_GetVariables.go b/service/frauddetector/api_op_GetVariables.go index bae4523a2c2..c9b28b59a9d 100644 --- a/service/frauddetector/api_op_GetVariables.go +++ b/service/frauddetector/api_op_GetVariables.go @@ -65,6 +65,9 @@ func addOperationGetVariablesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetVariablesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_ListTagsForResource.go b/service/frauddetector/api_op_ListTagsForResource.go index 6a14842c704..02f3267e12e 100644 --- a/service/frauddetector/api_op_ListTagsForResource.go +++ b/service/frauddetector/api_op_ListTagsForResource.go @@ -64,6 +64,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutDetector.go b/service/frauddetector/api_op_PutDetector.go index 8babdcd1fe1..023407ab4ac 100644 --- a/service/frauddetector/api_op_PutDetector.go +++ b/service/frauddetector/api_op_PutDetector.go @@ -60,6 +60,9 @@ func addOperationPutDetectorMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutDetectorMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutEntityType.go b/service/frauddetector/api_op_PutEntityType.go index 4168d13e226..0f6e9559725 100644 --- a/service/frauddetector/api_op_PutEntityType.go +++ b/service/frauddetector/api_op_PutEntityType.go @@ -58,6 +58,9 @@ func addOperationPutEntityTypeMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutEntityTypeMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutEventType.go b/service/frauddetector/api_op_PutEventType.go index 3d0e4ebd5cb..f03277856c6 100644 --- a/service/frauddetector/api_op_PutEventType.go +++ b/service/frauddetector/api_op_PutEventType.go @@ -75,6 +75,9 @@ func addOperationPutEventTypeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationPutEventTypeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutExternalModel.go b/service/frauddetector/api_op_PutExternalModel.go index 6d358143c6e..0039532f5ca 100644 --- a/service/frauddetector/api_op_PutExternalModel.go +++ b/service/frauddetector/api_op_PutExternalModel.go @@ -79,6 +79,9 @@ func addOperationPutExternalModelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationPutExternalModelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutKMSEncryptionKey.go b/service/frauddetector/api_op_PutKMSEncryptionKey.go index a275e10615b..cf6c9e9989c 100644 --- a/service/frauddetector/api_op_PutKMSEncryptionKey.go +++ b/service/frauddetector/api_op_PutKMSEncryptionKey.go @@ -49,6 +49,9 @@ func addOperationPutKMSEncryptionKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationPutKMSEncryptionKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutLabel.go b/service/frauddetector/api_op_PutLabel.go index 0de64e77f61..63eaaa0b37a 100644 --- a/service/frauddetector/api_op_PutLabel.go +++ b/service/frauddetector/api_op_PutLabel.go @@ -57,6 +57,9 @@ func addOperationPutLabelMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutLabelMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_PutOutcome.go b/service/frauddetector/api_op_PutOutcome.go index 22e12b49ada..1881e77c788 100644 --- a/service/frauddetector/api_op_PutOutcome.go +++ b/service/frauddetector/api_op_PutOutcome.go @@ -55,6 +55,9 @@ func addOperationPutOutcomeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationPutOutcomeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_TagResource.go b/service/frauddetector/api_op_TagResource.go index a9af8aa2962..ff24cc3a12e 100644 --- a/service/frauddetector/api_op_TagResource.go +++ b/service/frauddetector/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UntagResource.go b/service/frauddetector/api_op_UntagResource.go index 38650beb014..67157572403 100644 --- a/service/frauddetector/api_op_UntagResource.go +++ b/service/frauddetector/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateDetectorVersion.go b/service/frauddetector/api_op_UpdateDetectorVersion.go index 8ff5c5d1bc3..659cd0018e9 100644 --- a/service/frauddetector/api_op_UpdateDetectorVersion.go +++ b/service/frauddetector/api_op_UpdateDetectorVersion.go @@ -81,6 +81,9 @@ func addOperationUpdateDetectorVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdateDetectorVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go b/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go index 0c0d2867fee..2e895d29b6a 100644 --- a/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go +++ b/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go @@ -59,6 +59,9 @@ func addOperationUpdateDetectorVersionMetadataMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateDetectorVersionMetadataMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateDetectorVersionStatus.go b/service/frauddetector/api_op_UpdateDetectorVersionStatus.go index d1158763ca5..85ac2a0f674 100644 --- a/service/frauddetector/api_op_UpdateDetectorVersionStatus.go +++ b/service/frauddetector/api_op_UpdateDetectorVersionStatus.go @@ -61,6 +61,9 @@ func addOperationUpdateDetectorVersionStatusMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateDetectorVersionStatusMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateModel.go b/service/frauddetector/api_op_UpdateModel.go index c8d8679e64a..313a2d1c7c4 100644 --- a/service/frauddetector/api_op_UpdateModel.go +++ b/service/frauddetector/api_op_UpdateModel.go @@ -57,6 +57,9 @@ func addOperationUpdateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateModelVersion.go b/service/frauddetector/api_op_UpdateModelVersion.go index 46ff4e9f5de..3d4e64586b3 100644 --- a/service/frauddetector/api_op_UpdateModelVersion.go +++ b/service/frauddetector/api_op_UpdateModelVersion.go @@ -82,6 +82,9 @@ func addOperationUpdateModelVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateModelVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateModelVersionStatus.go b/service/frauddetector/api_op_UpdateModelVersionStatus.go index bc42042d868..12f3aaae982 100644 --- a/service/frauddetector/api_op_UpdateModelVersionStatus.go +++ b/service/frauddetector/api_op_UpdateModelVersionStatus.go @@ -70,6 +70,9 @@ func addOperationUpdateModelVersionStatusMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateModelVersionStatusMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateRuleMetadata.go b/service/frauddetector/api_op_UpdateRuleMetadata.go index bf7c378ef43..472af35f2bc 100644 --- a/service/frauddetector/api_op_UpdateRuleMetadata.go +++ b/service/frauddetector/api_op_UpdateRuleMetadata.go @@ -54,6 +54,9 @@ func addOperationUpdateRuleMetadataMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateRuleMetadataMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateRuleVersion.go b/service/frauddetector/api_op_UpdateRuleVersion.go index 702217cb5ea..2728f43c5a4 100644 --- a/service/frauddetector/api_op_UpdateRuleVersion.go +++ b/service/frauddetector/api_op_UpdateRuleVersion.go @@ -75,6 +75,9 @@ func addOperationUpdateRuleVersionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateRuleVersionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/api_op_UpdateVariable.go b/service/frauddetector/api_op_UpdateVariable.go index c9923166c22..b997c66e951 100644 --- a/service/frauddetector/api_op_UpdateVariable.go +++ b/service/frauddetector/api_op_UpdateVariable.go @@ -58,6 +58,9 @@ func addOperationUpdateVariableMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateVariableMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/frauddetector/go.mod b/service/frauddetector/go.mod index 29194ec9a2f..fd5f7cf485b 100644 --- a/service/frauddetector/go.mod +++ b/service/frauddetector/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/frauddetector go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/frauddetector/go.sum b/service/frauddetector/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/frauddetector/go.sum +++ b/service/frauddetector/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/fsx/api_client.go b/service/fsx/api_client.go index 91617e64955..60968eab700 100644 --- a/service/fsx/api_client.go +++ b/service/fsx/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/fsx/api_op_CancelDataRepositoryTask.go b/service/fsx/api_op_CancelDataRepositoryTask.go index e9f4738cf60..0c05501d14f 100644 --- a/service/fsx/api_op_CancelDataRepositoryTask.go +++ b/service/fsx/api_op_CancelDataRepositoryTask.go @@ -87,6 +87,9 @@ func addOperationCancelDataRepositoryTaskMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCancelDataRepositoryTaskMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_CreateBackup.go b/service/fsx/api_op_CreateBackup.go index 6586e35b423..4872f417e6b 100644 --- a/service/fsx/api_op_CreateBackup.go +++ b/service/fsx/api_op_CreateBackup.go @@ -105,6 +105,9 @@ func addOperationCreateBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateBackupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_CreateDataRepositoryTask.go b/service/fsx/api_op_CreateDataRepositoryTask.go index ed67c862a9f..f333bae2a03 100644 --- a/service/fsx/api_op_CreateDataRepositoryTask.go +++ b/service/fsx/api_op_CreateDataRepositoryTask.go @@ -95,6 +95,9 @@ func addOperationCreateDataRepositoryTaskMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateDataRepositoryTaskMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_CreateFileSystem.go b/service/fsx/api_op_CreateFileSystem.go index 8f4feb93a0e..fca6a365761 100644 --- a/service/fsx/api_op_CreateFileSystem.go +++ b/service/fsx/api_op_CreateFileSystem.go @@ -166,6 +166,9 @@ func addOperationCreateFileSystemMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -211,6 +214,9 @@ func addOperationCreateFileSystemMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_CreateFileSystemFromBackup.go b/service/fsx/api_op_CreateFileSystemFromBackup.go index 4614ad9830a..15c87c45adf 100644 --- a/service/fsx/api_op_CreateFileSystemFromBackup.go +++ b/service/fsx/api_op_CreateFileSystemFromBackup.go @@ -132,6 +132,9 @@ func addOperationCreateFileSystemFromBackupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationCreateFileSystemFromBackupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_DeleteBackup.go b/service/fsx/api_op_DeleteBackup.go index 63a475a5ab7..858a95792f9 100644 --- a/service/fsx/api_op_DeleteBackup.go +++ b/service/fsx/api_op_DeleteBackup.go @@ -67,6 +67,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_DeleteFileSystem.go b/service/fsx/api_op_DeleteFileSystem.go index 847868e8bc6..08c89535b19 100644 --- a/service/fsx/api_op_DeleteFileSystem.go +++ b/service/fsx/api_op_DeleteFileSystem.go @@ -92,6 +92,9 @@ func addOperationDeleteFileSystemMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDeleteFileSystemMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_DescribeBackups.go b/service/fsx/api_op_DescribeBackups.go index 51e2428498f..be907b77d53 100644 --- a/service/fsx/api_op_DescribeBackups.go +++ b/service/fsx/api_op_DescribeBackups.go @@ -92,6 +92,9 @@ func addOperationDescribeBackupsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeBackupsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_DescribeDataRepositoryTasks.go b/service/fsx/api_op_DescribeDataRepositoryTasks.go index 8600e197568..f1a0f68b70a 100644 --- a/service/fsx/api_op_DescribeDataRepositoryTasks.go +++ b/service/fsx/api_op_DescribeDataRepositoryTasks.go @@ -80,6 +80,9 @@ func addOperationDescribeDataRepositoryTasksMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeDataRepositoryTasksMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_DescribeFileSystems.go b/service/fsx/api_op_DescribeFileSystems.go index 90ede97f27b..2330129fc58 100644 --- a/service/fsx/api_op_DescribeFileSystems.go +++ b/service/fsx/api_op_DescribeFileSystems.go @@ -88,6 +88,9 @@ func addOperationDescribeFileSystemsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeFileSystemsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_ListTagsForResource.go b/service/fsx/api_op_ListTagsForResource.go index 73a2b295edf..d131de76ced 100644 --- a/service/fsx/api_op_ListTagsForResource.go +++ b/service/fsx/api_op_ListTagsForResource.go @@ -87,6 +87,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_TagResource.go b/service/fsx/api_op_TagResource.go index 4e572abbc3e..5d00af12411 100644 --- a/service/fsx/api_op_TagResource.go +++ b/service/fsx/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_UntagResource.go b/service/fsx/api_op_UntagResource.go index e63a24c2d46..f97c8417024 100644 --- a/service/fsx/api_op_UntagResource.go +++ b/service/fsx/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/api_op_UpdateFileSystem.go b/service/fsx/api_op_UpdateFileSystem.go index 42f71161e3a..6ecc5de4cb7 100644 --- a/service/fsx/api_op_UpdateFileSystem.go +++ b/service/fsx/api_op_UpdateFileSystem.go @@ -109,6 +109,9 @@ func addOperationUpdateFileSystemMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationUpdateFileSystemMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/fsx/go.mod b/service/fsx/go.mod index 98dfe4c0efa..f470989ce42 100644 --- a/service/fsx/go.mod +++ b/service/fsx/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/fsx go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/fsx/go.sum b/service/fsx/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/fsx/go.sum +++ b/service/fsx/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/gamelift/api_client.go b/service/gamelift/api_client.go index e620c8028bd..f64129c82b2 100644 --- a/service/gamelift/api_client.go +++ b/service/gamelift/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/gamelift/api_op_AcceptMatch.go b/service/gamelift/api_op_AcceptMatch.go index 6227d6b7824..c9386eaca7b 100644 --- a/service/gamelift/api_op_AcceptMatch.go +++ b/service/gamelift/api_op_AcceptMatch.go @@ -94,6 +94,9 @@ func addOperationAcceptMatchMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationAcceptMatchMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ClaimGameServer.go b/service/gamelift/api_op_ClaimGameServer.go index 7da540e81ca..c6607387670 100644 --- a/service/gamelift/api_op_ClaimGameServer.go +++ b/service/gamelift/api_op_ClaimGameServer.go @@ -111,6 +111,9 @@ func addOperationClaimGameServerMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationClaimGameServerMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateAlias.go b/service/gamelift/api_op_CreateAlias.go index b0302f9a30e..87cf8d266b8 100644 --- a/service/gamelift/api_op_CreateAlias.go +++ b/service/gamelift/api_op_CreateAlias.go @@ -100,6 +100,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateBuild.go b/service/gamelift/api_op_CreateBuild.go index 6efc856c3e6..bbc1ce6be00 100644 --- a/service/gamelift/api_op_CreateBuild.go +++ b/service/gamelift/api_op_CreateBuild.go @@ -136,6 +136,9 @@ func addOperationCreateBuildMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationCreateBuildMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateFleet.go b/service/gamelift/api_op_CreateFleet.go index be0db9863b8..8776cb07e34 100644 --- a/service/gamelift/api_op_CreateFleet.go +++ b/service/gamelift/api_op_CreateFleet.go @@ -255,6 +255,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -297,6 +300,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateGameServerGroup.go b/service/gamelift/api_op_CreateGameServerGroup.go index ababb417b38..c851e7395c8 100644 --- a/service/gamelift/api_op_CreateGameServerGroup.go +++ b/service/gamelift/api_op_CreateGameServerGroup.go @@ -222,6 +222,9 @@ func addOperationCreateGameServerGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -264,6 +267,9 @@ func addOperationCreateGameServerGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateGameSession.go b/service/gamelift/api_op_CreateGameSession.go index 31ad3e9ea53..96caa908eb8 100644 --- a/service/gamelift/api_op_CreateGameSession.go +++ b/service/gamelift/api_op_CreateGameSession.go @@ -146,6 +146,9 @@ func addOperationCreateGameSessionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationCreateGameSessionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateGameSessionQueue.go b/service/gamelift/api_op_CreateGameSessionQueue.go index b593ddf541e..75ac538ecf2 100644 --- a/service/gamelift/api_op_CreateGameSessionQueue.go +++ b/service/gamelift/api_op_CreateGameSessionQueue.go @@ -127,6 +127,9 @@ func addOperationCreateGameSessionQueueMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateGameSessionQueueMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateMatchmakingConfiguration.go b/service/gamelift/api_op_CreateMatchmakingConfiguration.go index a7ff95fd1e3..b0de1551aac 100644 --- a/service/gamelift/api_op_CreateMatchmakingConfiguration.go +++ b/service/gamelift/api_op_CreateMatchmakingConfiguration.go @@ -180,6 +180,9 @@ func addOperationCreateMatchmakingConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -222,6 +225,9 @@ func addOperationCreateMatchmakingConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateMatchmakingRuleSet.go b/service/gamelift/api_op_CreateMatchmakingRuleSet.go index dd9cd374a81..e04c56cc4dd 100644 --- a/service/gamelift/api_op_CreateMatchmakingRuleSet.go +++ b/service/gamelift/api_op_CreateMatchmakingRuleSet.go @@ -118,6 +118,9 @@ func addOperationCreateMatchmakingRuleSetMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateMatchmakingRuleSetMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreatePlayerSession.go b/service/gamelift/api_op_CreatePlayerSession.go index 0b6312f8afd..bb30e52d274 100644 --- a/service/gamelift/api_op_CreatePlayerSession.go +++ b/service/gamelift/api_op_CreatePlayerSession.go @@ -90,6 +90,9 @@ func addOperationCreatePlayerSessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreatePlayerSessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreatePlayerSessions.go b/service/gamelift/api_op_CreatePlayerSessions.go index 0c0d27b77d9..295e71a61f6 100644 --- a/service/gamelift/api_op_CreatePlayerSessions.go +++ b/service/gamelift/api_op_CreatePlayerSessions.go @@ -92,6 +92,9 @@ func addOperationCreatePlayerSessionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreatePlayerSessionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateScript.go b/service/gamelift/api_op_CreateScript.go index 12359d5eb78..f2a0bc84aa3 100644 --- a/service/gamelift/api_op_CreateScript.go +++ b/service/gamelift/api_op_CreateScript.go @@ -127,6 +127,9 @@ func addOperationCreateScriptMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateScriptMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateVpcPeeringAuthorization.go b/service/gamelift/api_op_CreateVpcPeeringAuthorization.go index 1ecb36e3a78..59efd7c5d94 100644 --- a/service/gamelift/api_op_CreateVpcPeeringAuthorization.go +++ b/service/gamelift/api_op_CreateVpcPeeringAuthorization.go @@ -104,6 +104,9 @@ func addOperationCreateVpcPeeringAuthorizationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateVpcPeeringAuthorizationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_CreateVpcPeeringConnection.go b/service/gamelift/api_op_CreateVpcPeeringConnection.go index c21d5a15708..b1f34fd8742 100644 --- a/service/gamelift/api_op_CreateVpcPeeringConnection.go +++ b/service/gamelift/api_op_CreateVpcPeeringConnection.go @@ -102,6 +102,9 @@ func addOperationCreateVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteAlias.go b/service/gamelift/api_op_DeleteAlias.go index 185b8657647..696b418d303 100644 --- a/service/gamelift/api_op_DeleteAlias.go +++ b/service/gamelift/api_op_DeleteAlias.go @@ -65,6 +65,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteBuild.go b/service/gamelift/api_op_DeleteBuild.go index 7f74637dddc..c934cac87ad 100644 --- a/service/gamelift/api_op_DeleteBuild.go +++ b/service/gamelift/api_op_DeleteBuild.go @@ -67,6 +67,9 @@ func addOperationDeleteBuildMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteBuildMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteFleet.go b/service/gamelift/api_op_DeleteFleet.go index bbecc9da0d6..1672d948d7d 100644 --- a/service/gamelift/api_op_DeleteFleet.go +++ b/service/gamelift/api_op_DeleteFleet.go @@ -73,6 +73,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteGameServerGroup.go b/service/gamelift/api_op_DeleteGameServerGroup.go index 983a835a494..5981a6f79f6 100644 --- a/service/gamelift/api_op_DeleteGameServerGroup.go +++ b/service/gamelift/api_op_DeleteGameServerGroup.go @@ -112,6 +112,9 @@ func addOperationDeleteGameServerGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationDeleteGameServerGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteGameSessionQueue.go b/service/gamelift/api_op_DeleteGameSessionQueue.go index b0fd8ac9121..15b998bd555 100644 --- a/service/gamelift/api_op_DeleteGameSessionQueue.go +++ b/service/gamelift/api_op_DeleteGameSessionQueue.go @@ -63,6 +63,9 @@ func addOperationDeleteGameSessionQueueMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteGameSessionQueueMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteMatchmakingConfiguration.go b/service/gamelift/api_op_DeleteMatchmakingConfiguration.go index 784b79754e6..a3ddfb68e03 100644 --- a/service/gamelift/api_op_DeleteMatchmakingConfiguration.go +++ b/service/gamelift/api_op_DeleteMatchmakingConfiguration.go @@ -72,6 +72,9 @@ func addOperationDeleteMatchmakingConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDeleteMatchmakingConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteMatchmakingRuleSet.go b/service/gamelift/api_op_DeleteMatchmakingRuleSet.go index 00587cfabcc..64d1162d641 100644 --- a/service/gamelift/api_op_DeleteMatchmakingRuleSet.go +++ b/service/gamelift/api_op_DeleteMatchmakingRuleSet.go @@ -80,6 +80,9 @@ func addOperationDeleteMatchmakingRuleSetMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteMatchmakingRuleSetMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteScalingPolicy.go b/service/gamelift/api_op_DeleteScalingPolicy.go index 2a96066ced3..ff955436914 100644 --- a/service/gamelift/api_op_DeleteScalingPolicy.go +++ b/service/gamelift/api_op_DeleteScalingPolicy.go @@ -83,6 +83,9 @@ func addOperationDeleteScalingPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDeleteScalingPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteScript.go b/service/gamelift/api_op_DeleteScript.go index a4d66b0450f..27afd369ab3 100644 --- a/service/gamelift/api_op_DeleteScript.go +++ b/service/gamelift/api_op_DeleteScript.go @@ -68,6 +68,9 @@ func addOperationDeleteScriptMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteScriptMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go b/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go index 722c2618875..12c02dc4b54 100644 --- a/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go +++ b/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go @@ -78,6 +78,9 @@ func addOperationDeleteVpcPeeringAuthorizationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteVpcPeeringAuthorizationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeleteVpcPeeringConnection.go b/service/gamelift/api_op_DeleteVpcPeeringConnection.go index 3f62127aa0c..c4451e730da 100644 --- a/service/gamelift/api_op_DeleteVpcPeeringConnection.go +++ b/service/gamelift/api_op_DeleteVpcPeeringConnection.go @@ -79,6 +79,9 @@ func addOperationDeleteVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteVpcPeeringConnectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DeregisterGameServer.go b/service/gamelift/api_op_DeregisterGameServer.go index 55c86eb88f1..052a428f441 100644 --- a/service/gamelift/api_op_DeregisterGameServer.go +++ b/service/gamelift/api_op_DeregisterGameServer.go @@ -76,6 +76,9 @@ func addOperationDeregisterGameServerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDeregisterGameServerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeAlias.go b/service/gamelift/api_op_DescribeAlias.go index 41a51022cba..efff935130a 100644 --- a/service/gamelift/api_op_DescribeAlias.go +++ b/service/gamelift/api_op_DescribeAlias.go @@ -72,6 +72,9 @@ func addOperationDescribeAliasMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeAliasMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeBuild.go b/service/gamelift/api_op_DescribeBuild.go index e939905491d..c9cfcd2ab8b 100644 --- a/service/gamelift/api_op_DescribeBuild.go +++ b/service/gamelift/api_op_DescribeBuild.go @@ -71,6 +71,9 @@ func addOperationDescribeBuildMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeBuildMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeEC2InstanceLimits.go b/service/gamelift/api_op_DescribeEC2InstanceLimits.go index 905872c0e1c..94949ef718d 100644 --- a/service/gamelift/api_op_DescribeEC2InstanceLimits.go +++ b/service/gamelift/api_op_DescribeEC2InstanceLimits.go @@ -85,6 +85,9 @@ func addOperationDescribeEC2InstanceLimitsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeEC2InstanceLimitsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeFleetAttributes.go b/service/gamelift/api_op_DescribeFleetAttributes.go index e282e5a0a70..ecabb3a8a3e 100644 --- a/service/gamelift/api_op_DescribeFleetAttributes.go +++ b/service/gamelift/api_op_DescribeFleetAttributes.go @@ -115,6 +115,9 @@ func addOperationDescribeFleetAttributesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationDescribeFleetAttributesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeFleetCapacity.go b/service/gamelift/api_op_DescribeFleetCapacity.go index d370c4a6fc3..aba781a3acf 100644 --- a/service/gamelift/api_op_DescribeFleetCapacity.go +++ b/service/gamelift/api_op_DescribeFleetCapacity.go @@ -116,6 +116,9 @@ func addOperationDescribeFleetCapacityMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationDescribeFleetCapacityMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeFleetEvents.go b/service/gamelift/api_op_DescribeFleetEvents.go index 035998a4960..ececfd2ceac 100644 --- a/service/gamelift/api_op_DescribeFleetEvents.go +++ b/service/gamelift/api_op_DescribeFleetEvents.go @@ -117,6 +117,9 @@ func addOperationDescribeFleetEventsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationDescribeFleetEventsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeFleetPortSettings.go b/service/gamelift/api_op_DescribeFleetPortSettings.go index 30eaf0e25ac..d3cb43520a0 100644 --- a/service/gamelift/api_op_DescribeFleetPortSettings.go +++ b/service/gamelift/api_op_DescribeFleetPortSettings.go @@ -96,6 +96,9 @@ func addOperationDescribeFleetPortSettingsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationDescribeFleetPortSettingsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeFleetUtilization.go b/service/gamelift/api_op_DescribeFleetUtilization.go index 4887d9ac6cc..a37a5bae40a 100644 --- a/service/gamelift/api_op_DescribeFleetUtilization.go +++ b/service/gamelift/api_op_DescribeFleetUtilization.go @@ -117,6 +117,9 @@ func addOperationDescribeFleetUtilizationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationDescribeFleetUtilizationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameServer.go b/service/gamelift/api_op_DescribeGameServer.go index 0679d179d00..7bf706bd497 100644 --- a/service/gamelift/api_op_DescribeGameServer.go +++ b/service/gamelift/api_op_DescribeGameServer.go @@ -81,6 +81,9 @@ func addOperationDescribeGameServerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeGameServerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameServerGroup.go b/service/gamelift/api_op_DescribeGameServerGroup.go index 6369a2e8f51..a202d353a32 100644 --- a/service/gamelift/api_op_DescribeGameServerGroup.go +++ b/service/gamelift/api_op_DescribeGameServerGroup.go @@ -82,6 +82,9 @@ func addOperationDescribeGameServerGroupMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeGameServerGroupMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameServerInstances.go b/service/gamelift/api_op_DescribeGameServerInstances.go index ebbab0e0bdb..b917e314259 100644 --- a/service/gamelift/api_op_DescribeGameServerInstances.go +++ b/service/gamelift/api_op_DescribeGameServerInstances.go @@ -106,6 +106,9 @@ func addOperationDescribeGameServerInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationDescribeGameServerInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameSessionDetails.go b/service/gamelift/api_op_DescribeGameSessionDetails.go index da524552060..ca513127e95 100644 --- a/service/gamelift/api_op_DescribeGameSessionDetails.go +++ b/service/gamelift/api_op_DescribeGameSessionDetails.go @@ -111,6 +111,9 @@ func addOperationDescribeGameSessionDetailsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeGameSessionDetailsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameSessionPlacement.go b/service/gamelift/api_op_DescribeGameSessionPlacement.go index ff952bfa19a..931e750355d 100644 --- a/service/gamelift/api_op_DescribeGameSessionPlacement.go +++ b/service/gamelift/api_op_DescribeGameSessionPlacement.go @@ -81,6 +81,9 @@ func addOperationDescribeGameSessionPlacementMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeGameSessionPlacementMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameSessionQueues.go b/service/gamelift/api_op_DescribeGameSessionQueues.go index 035efe99de4..89ff9f2ff03 100644 --- a/service/gamelift/api_op_DescribeGameSessionQueues.go +++ b/service/gamelift/api_op_DescribeGameSessionQueues.go @@ -83,6 +83,9 @@ func addOperationDescribeGameSessionQueuesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeGameSessionQueuesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeGameSessions.go b/service/gamelift/api_op_DescribeGameSessions.go index 7586c69b1ac..11ecc867783 100644 --- a/service/gamelift/api_op_DescribeGameSessions.go +++ b/service/gamelift/api_op_DescribeGameSessions.go @@ -111,6 +111,9 @@ func addOperationDescribeGameSessionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeGameSessionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeInstances.go b/service/gamelift/api_op_DescribeInstances.go index fd5f4190f58..bc0a7cbd896 100644 --- a/service/gamelift/api_op_DescribeInstances.go +++ b/service/gamelift/api_op_DescribeInstances.go @@ -87,6 +87,9 @@ func addOperationDescribeInstancesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeInstancesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeMatchmaking.go b/service/gamelift/api_op_DescribeMatchmaking.go index caa255fb253..fbb508d7cec 100644 --- a/service/gamelift/api_op_DescribeMatchmaking.go +++ b/service/gamelift/api_op_DescribeMatchmaking.go @@ -82,6 +82,9 @@ func addOperationDescribeMatchmakingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeMatchmakingMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeMatchmakingConfigurations.go b/service/gamelift/api_op_DescribeMatchmakingConfigurations.go index c18fea2b5eb..d7adabfdc8b 100644 --- a/service/gamelift/api_op_DescribeMatchmakingConfigurations.go +++ b/service/gamelift/api_op_DescribeMatchmakingConfigurations.go @@ -103,6 +103,9 @@ func addOperationDescribeMatchmakingConfigurationsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationDescribeMatchmakingConfigurationsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeMatchmakingRuleSets.go b/service/gamelift/api_op_DescribeMatchmakingRuleSets.go index 1fef1da55dc..e3d64c9c95b 100644 --- a/service/gamelift/api_op_DescribeMatchmakingRuleSets.go +++ b/service/gamelift/api_op_DescribeMatchmakingRuleSets.go @@ -101,6 +101,9 @@ func addOperationDescribeMatchmakingRuleSetsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeMatchmakingRuleSetsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribePlayerSessions.go b/service/gamelift/api_op_DescribePlayerSessions.go index 50c8f43ed6e..fe64e51da2d 100644 --- a/service/gamelift/api_op_DescribePlayerSessions.go +++ b/service/gamelift/api_op_DescribePlayerSessions.go @@ -118,6 +118,9 @@ func addOperationDescribePlayerSessionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationDescribePlayerSessionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeRuntimeConfiguration.go b/service/gamelift/api_op_DescribeRuntimeConfiguration.go index 87330c6cf20..b714c4b339e 100644 --- a/service/gamelift/api_op_DescribeRuntimeConfiguration.go +++ b/service/gamelift/api_op_DescribeRuntimeConfiguration.go @@ -97,6 +97,9 @@ func addOperationDescribeRuntimeConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeRuntimeConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeScalingPolicies.go b/service/gamelift/api_op_DescribeScalingPolicies.go index afa60542f31..1953f1f4623 100644 --- a/service/gamelift/api_op_DescribeScalingPolicies.go +++ b/service/gamelift/api_op_DescribeScalingPolicies.go @@ -125,6 +125,9 @@ func addOperationDescribeScalingPoliciesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationDescribeScalingPoliciesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeScript.go b/service/gamelift/api_op_DescribeScript.go index a08ab369411..fbad770ef41 100644 --- a/service/gamelift/api_op_DescribeScript.go +++ b/service/gamelift/api_op_DescribeScript.go @@ -69,6 +69,9 @@ func addOperationDescribeScriptMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeScriptMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go b/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go index 2f31bfab436..411a8ebf97c 100644 --- a/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go +++ b/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go @@ -66,6 +66,9 @@ func addOperationDescribeVpcPeeringAuthorizationsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeVpcPeeringAuthorizationsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_DescribeVpcPeeringConnections.go b/service/gamelift/api_op_DescribeVpcPeeringConnections.go index 8bac752d7b3..91bf4414f7f 100644 --- a/service/gamelift/api_op_DescribeVpcPeeringConnections.go +++ b/service/gamelift/api_op_DescribeVpcPeeringConnections.go @@ -74,6 +74,9 @@ func addOperationDescribeVpcPeeringConnectionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeVpcPeeringConnectionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_GetGameSessionLogUrl.go b/service/gamelift/api_op_GetGameSessionLogUrl.go index 4e19c33655f..19a41dcd6db 100644 --- a/service/gamelift/api_op_GetGameSessionLogUrl.go +++ b/service/gamelift/api_op_GetGameSessionLogUrl.go @@ -86,6 +86,9 @@ func addOperationGetGameSessionLogUrlMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetGameSessionLogUrlMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_GetInstanceAccess.go b/service/gamelift/api_op_GetInstanceAccess.go index e3624c38318..9b96f9362a1 100644 --- a/service/gamelift/api_op_GetInstanceAccess.go +++ b/service/gamelift/api_op_GetInstanceAccess.go @@ -86,6 +86,9 @@ func addOperationGetInstanceAccessMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetInstanceAccessMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListAliases.go b/service/gamelift/api_op_ListAliases.go index dd3b721ddfd..60739191689 100644 --- a/service/gamelift/api_op_ListAliases.go +++ b/service/gamelift/api_op_ListAliases.go @@ -97,6 +97,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListBuilds.go b/service/gamelift/api_op_ListBuilds.go index 4829e26c8ec..5ee6f0ca07f 100644 --- a/service/gamelift/api_op_ListBuilds.go +++ b/service/gamelift/api_op_ListBuilds.go @@ -95,6 +95,9 @@ func addOperationListBuildsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListBuildsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListFleets.go b/service/gamelift/api_op_ListFleets.go index c8a6afa5181..df4db5bc665 100644 --- a/service/gamelift/api_op_ListFleets.go +++ b/service/gamelift/api_op_ListFleets.go @@ -95,6 +95,9 @@ func addOperationListFleetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListFleetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListGameServerGroups.go b/service/gamelift/api_op_ListGameServerGroups.go index 9c93e1f5972..9c9044fe4b6 100644 --- a/service/gamelift/api_op_ListGameServerGroups.go +++ b/service/gamelift/api_op_ListGameServerGroups.go @@ -85,6 +85,9 @@ func addOperationListGameServerGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListGameServerGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListGameServers.go b/service/gamelift/api_op_ListGameServers.go index ece0dfa41f9..3bf646fc58e 100644 --- a/service/gamelift/api_op_ListGameServers.go +++ b/service/gamelift/api_op_ListGameServers.go @@ -94,6 +94,9 @@ func addOperationListGameServersMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationListGameServersMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListScripts.go b/service/gamelift/api_op_ListScripts.go index d042316dbbd..d0ff1882bcd 100644 --- a/service/gamelift/api_op_ListScripts.go +++ b/service/gamelift/api_op_ListScripts.go @@ -76,6 +76,9 @@ func addOperationListScriptsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListScriptsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ListTagsForResource.go b/service/gamelift/api_op_ListTagsForResource.go index 7f03b40490d..4600c2ae845 100644 --- a/service/gamelift/api_op_ListTagsForResource.go +++ b/service/gamelift/api_op_ListTagsForResource.go @@ -89,6 +89,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_PutScalingPolicy.go b/service/gamelift/api_op_PutScalingPolicy.go index 5f39a20fc25..6216c48db5a 100644 --- a/service/gamelift/api_op_PutScalingPolicy.go +++ b/service/gamelift/api_op_PutScalingPolicy.go @@ -230,6 +230,9 @@ func addOperationPutScalingPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -272,6 +275,9 @@ func addOperationPutScalingPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_RegisterGameServer.go b/service/gamelift/api_op_RegisterGameServer.go index 0917ade6405..e67c33fed0f 100644 --- a/service/gamelift/api_op_RegisterGameServer.go +++ b/service/gamelift/api_op_RegisterGameServer.go @@ -107,6 +107,9 @@ func addOperationRegisterGameServerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationRegisterGameServerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_RequestUploadCredentials.go b/service/gamelift/api_op_RequestUploadCredentials.go index a670219738c..f2038712847 100644 --- a/service/gamelift/api_op_RequestUploadCredentials.go +++ b/service/gamelift/api_op_RequestUploadCredentials.go @@ -79,6 +79,9 @@ func addOperationRequestUploadCredentialsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationRequestUploadCredentialsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ResolveAlias.go b/service/gamelift/api_op_ResolveAlias.go index a53e57d8334..ba8013ddf9d 100644 --- a/service/gamelift/api_op_ResolveAlias.go +++ b/service/gamelift/api_op_ResolveAlias.go @@ -73,6 +73,9 @@ func addOperationResolveAliasMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationResolveAliasMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ResumeGameServerGroup.go b/service/gamelift/api_op_ResumeGameServerGroup.go index e5450a10477..12c04c18d06 100644 --- a/service/gamelift/api_op_ResumeGameServerGroup.go +++ b/service/gamelift/api_op_ResumeGameServerGroup.go @@ -90,6 +90,9 @@ func addOperationResumeGameServerGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationResumeGameServerGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_SearchGameSessions.go b/service/gamelift/api_op_SearchGameSessions.go index f9352d4fd44..d4917a6bc47 100644 --- a/service/gamelift/api_op_SearchGameSessions.go +++ b/service/gamelift/api_op_SearchGameSessions.go @@ -207,6 +207,9 @@ func addOperationSearchGameSessionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -246,6 +249,9 @@ func addOperationSearchGameSessionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StartFleetActions.go b/service/gamelift/api_op_StartFleetActions.go index 31470f26e44..580e1224442 100644 --- a/service/gamelift/api_op_StartFleetActions.go +++ b/service/gamelift/api_op_StartFleetActions.go @@ -78,6 +78,9 @@ func addOperationStartFleetActionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationStartFleetActionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StartGameSessionPlacement.go b/service/gamelift/api_op_StartGameSessionPlacement.go index 34274c2ed3c..5995e767e7b 100644 --- a/service/gamelift/api_op_StartGameSessionPlacement.go +++ b/service/gamelift/api_op_StartGameSessionPlacement.go @@ -157,6 +157,9 @@ func addOperationStartGameSessionPlacementMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -199,6 +202,9 @@ func addOperationStartGameSessionPlacementMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StartMatchBackfill.go b/service/gamelift/api_op_StartMatchBackfill.go index d963b799911..b8414d0c2fa 100644 --- a/service/gamelift/api_op_StartMatchBackfill.go +++ b/service/gamelift/api_op_StartMatchBackfill.go @@ -127,6 +127,9 @@ func addOperationStartMatchBackfillMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationStartMatchBackfillMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StartMatchmaking.go b/service/gamelift/api_op_StartMatchmaking.go index 26bc2de73bf..a11b19c2052 100644 --- a/service/gamelift/api_op_StartMatchmaking.go +++ b/service/gamelift/api_op_StartMatchmaking.go @@ -137,6 +137,9 @@ func addOperationStartMatchmakingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationStartMatchmakingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StopFleetActions.go b/service/gamelift/api_op_StopFleetActions.go index a58086e5342..e38f92da7f8 100644 --- a/service/gamelift/api_op_StopFleetActions.go +++ b/service/gamelift/api_op_StopFleetActions.go @@ -78,6 +78,9 @@ func addOperationStopFleetActionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationStopFleetActionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StopGameSessionPlacement.go b/service/gamelift/api_op_StopGameSessionPlacement.go index b9f39bd5c5d..d4551c22032 100644 --- a/service/gamelift/api_op_StopGameSessionPlacement.go +++ b/service/gamelift/api_op_StopGameSessionPlacement.go @@ -81,6 +81,9 @@ func addOperationStopGameSessionPlacementMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationStopGameSessionPlacementMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_StopMatchmaking.go b/service/gamelift/api_op_StopMatchmaking.go index 5d0836fc525..e88f683f95e 100644 --- a/service/gamelift/api_op_StopMatchmaking.go +++ b/service/gamelift/api_op_StopMatchmaking.go @@ -71,6 +71,9 @@ func addOperationStopMatchmakingMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationStopMatchmakingMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_SuspendGameServerGroup.go b/service/gamelift/api_op_SuspendGameServerGroup.go index 150f8cc9e83..108714dfe27 100644 --- a/service/gamelift/api_op_SuspendGameServerGroup.go +++ b/service/gamelift/api_op_SuspendGameServerGroup.go @@ -98,6 +98,9 @@ func addOperationSuspendGameServerGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationSuspendGameServerGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_TagResource.go b/service/gamelift/api_op_TagResource.go index 93f346b6b1d..fadadec4b60 100644 --- a/service/gamelift/api_op_TagResource.go +++ b/service/gamelift/api_op_TagResource.go @@ -98,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UntagResource.go b/service/gamelift/api_op_UntagResource.go index 1a7b1eb7976..0dddc9a0687 100644 --- a/service/gamelift/api_op_UntagResource.go +++ b/service/gamelift/api_op_UntagResource.go @@ -94,6 +94,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateAlias.go b/service/gamelift/api_op_UpdateAlias.go index 93a584e19b9..cd893a33430 100644 --- a/service/gamelift/api_op_UpdateAlias.go +++ b/service/gamelift/api_op_UpdateAlias.go @@ -83,6 +83,9 @@ func addOperationUpdateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationUpdateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateBuild.go b/service/gamelift/api_op_UpdateBuild.go index 18f21cfd407..a1213582e18 100644 --- a/service/gamelift/api_op_UpdateBuild.go +++ b/service/gamelift/api_op_UpdateBuild.go @@ -80,6 +80,9 @@ func addOperationUpdateBuildMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateBuildMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateFleetAttributes.go b/service/gamelift/api_op_UpdateFleetAttributes.go index 2b705eac91c..a24f1afe5ee 100644 --- a/service/gamelift/api_op_UpdateFleetAttributes.go +++ b/service/gamelift/api_op_UpdateFleetAttributes.go @@ -114,6 +114,9 @@ func addOperationUpdateFleetAttributesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationUpdateFleetAttributesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateFleetCapacity.go b/service/gamelift/api_op_UpdateFleetCapacity.go index dff046a3579..bb218e93ddb 100644 --- a/service/gamelift/api_op_UpdateFleetCapacity.go +++ b/service/gamelift/api_op_UpdateFleetCapacity.go @@ -104,6 +104,9 @@ func addOperationUpdateFleetCapacityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationUpdateFleetCapacityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateFleetPortSettings.go b/service/gamelift/api_op_UpdateFleetPortSettings.go index c826caccb1b..b5df2548762 100644 --- a/service/gamelift/api_op_UpdateFleetPortSettings.go +++ b/service/gamelift/api_op_UpdateFleetPortSettings.go @@ -92,6 +92,9 @@ func addOperationUpdateFleetPortSettingsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateFleetPortSettingsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateGameServer.go b/service/gamelift/api_op_UpdateGameServer.go index caccd73899a..04e9ff82907 100644 --- a/service/gamelift/api_op_UpdateGameServer.go +++ b/service/gamelift/api_op_UpdateGameServer.go @@ -111,6 +111,9 @@ func addOperationUpdateGameServerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationUpdateGameServerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateGameServerGroup.go b/service/gamelift/api_op_UpdateGameServerGroup.go index 3588d4ccebb..ed64acf04bf 100644 --- a/service/gamelift/api_op_UpdateGameServerGroup.go +++ b/service/gamelift/api_op_UpdateGameServerGroup.go @@ -133,6 +133,9 @@ func addOperationUpdateGameServerGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationUpdateGameServerGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateGameSession.go b/service/gamelift/api_op_UpdateGameSession.go index df568c10077..70d74c4d24a 100644 --- a/service/gamelift/api_op_UpdateGameSession.go +++ b/service/gamelift/api_op_UpdateGameSession.go @@ -105,6 +105,9 @@ func addOperationUpdateGameSessionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationUpdateGameSessionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateGameSessionQueue.go b/service/gamelift/api_op_UpdateGameSessionQueue.go index acd72498b39..803bb12a129 100644 --- a/service/gamelift/api_op_UpdateGameSessionQueue.go +++ b/service/gamelift/api_op_UpdateGameSessionQueue.go @@ -92,6 +92,9 @@ func addOperationUpdateGameSessionQueueMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateGameSessionQueueMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateMatchmakingConfiguration.go b/service/gamelift/api_op_UpdateMatchmakingConfiguration.go index 45bbbaaec28..3cbf098663b 100644 --- a/service/gamelift/api_op_UpdateMatchmakingConfiguration.go +++ b/service/gamelift/api_op_UpdateMatchmakingConfiguration.go @@ -151,6 +151,9 @@ func addOperationUpdateMatchmakingConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -193,6 +196,9 @@ func addOperationUpdateMatchmakingConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateRuntimeConfiguration.go b/service/gamelift/api_op_UpdateRuntimeConfiguration.go index ec2dfb3f22d..7adcd80e520 100644 --- a/service/gamelift/api_op_UpdateRuntimeConfiguration.go +++ b/service/gamelift/api_op_UpdateRuntimeConfiguration.go @@ -104,6 +104,9 @@ func addOperationUpdateRuntimeConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationUpdateRuntimeConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_UpdateScript.go b/service/gamelift/api_op_UpdateScript.go index fc82102756b..e69bd564268 100644 --- a/service/gamelift/api_op_UpdateScript.go +++ b/service/gamelift/api_op_UpdateScript.go @@ -106,6 +106,9 @@ func addOperationUpdateScriptMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationUpdateScriptMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/api_op_ValidateMatchmakingRuleSet.go b/service/gamelift/api_op_ValidateMatchmakingRuleSet.go index 5d4d16bcaa6..a6ef812c3ed 100644 --- a/service/gamelift/api_op_ValidateMatchmakingRuleSet.go +++ b/service/gamelift/api_op_ValidateMatchmakingRuleSet.go @@ -83,6 +83,9 @@ func addOperationValidateMatchmakingRuleSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationValidateMatchmakingRuleSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/gamelift/go.mod b/service/gamelift/go.mod index 9437b7273e1..d920a17fa62 100644 --- a/service/gamelift/go.mod +++ b/service/gamelift/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/gamelift go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/gamelift/go.sum b/service/gamelift/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/gamelift/go.sum +++ b/service/gamelift/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/glacier/api_client.go b/service/glacier/api_client.go index 9a1b5ae2528..834d02d04fd 100644 --- a/service/glacier/api_client.go +++ b/service/glacier/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -400,3 +423,12 @@ func setDefaultAccountID(input interface{}, accountID string) interface{} { return input } } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/glacier/api_op_AbortMultipartUpload.go b/service/glacier/api_op_AbortMultipartUpload.go index 42346d3dcff..b0a20302946 100644 --- a/service/glacier/api_op_AbortMultipartUpload.go +++ b/service/glacier/api_op_AbortMultipartUpload.go @@ -85,6 +85,9 @@ func addOperationAbortMultipartUploadMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationAbortMultipartUploadMiddlewares(stack *middleware.Stack, option if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_AbortVaultLock.go b/service/glacier/api_op_AbortVaultLock.go index a140fdc3813..ce116bf6323 100644 --- a/service/glacier/api_op_AbortVaultLock.go +++ b/service/glacier/api_op_AbortVaultLock.go @@ -74,6 +74,9 @@ func addOperationAbortVaultLockMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationAbortVaultLockMiddlewares(stack *middleware.Stack, options Opti if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_AddTagsToVault.go b/service/glacier/api_op_AddTagsToVault.go index b5de5ab6efe..9e49d106c65 100644 --- a/service/glacier/api_op_AddTagsToVault.go +++ b/service/glacier/api_op_AddTagsToVault.go @@ -69,6 +69,9 @@ func addOperationAddTagsToVaultMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationAddTagsToVaultMiddlewares(stack *middleware.Stack, options Opti if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_CompleteMultipartUpload.go b/service/glacier/api_op_CompleteMultipartUpload.go index 3edc59ebfae..210a6c7e3d0 100644 --- a/service/glacier/api_op_CompleteMultipartUpload.go +++ b/service/glacier/api_op_CompleteMultipartUpload.go @@ -131,6 +131,9 @@ func addOperationCompleteMultipartUploadMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationCompleteMultipartUploadMiddlewares(stack *middleware.Stack, opt if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_CompleteVaultLock.go b/service/glacier/api_op_CompleteVaultLock.go index 32ffdab2230..d2fe24b2595 100644 --- a/service/glacier/api_op_CompleteVaultLock.go +++ b/service/glacier/api_op_CompleteVaultLock.go @@ -77,6 +77,9 @@ func addOperationCompleteVaultLockMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCompleteVaultLockMiddlewares(stack *middleware.Stack, options O if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_CreateVault.go b/service/glacier/api_op_CreateVault.go index 8fa74adcf8a..6f68d57d466 100644 --- a/service/glacier/api_op_CreateVault.go +++ b/service/glacier/api_op_CreateVault.go @@ -88,6 +88,9 @@ func addOperationCreateVaultMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateVaultMiddlewares(stack *middleware.Stack, options Options if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_DeleteArchive.go b/service/glacier/api_op_DeleteArchive.go index f6e45bb39d5..5db502c418a 100644 --- a/service/glacier/api_op_DeleteArchive.go +++ b/service/glacier/api_op_DeleteArchive.go @@ -90,6 +90,9 @@ func addOperationDeleteArchiveMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDeleteArchiveMiddlewares(stack *middleware.Stack, options Optio if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_DeleteVault.go b/service/glacier/api_op_DeleteVault.go index 18c917d39eb..78de81f0e77 100644 --- a/service/glacier/api_op_DeleteVault.go +++ b/service/glacier/api_op_DeleteVault.go @@ -80,6 +80,9 @@ func addOperationDeleteVaultMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDeleteVaultMiddlewares(stack *middleware.Stack, options Options if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_DeleteVaultAccessPolicy.go b/service/glacier/api_op_DeleteVaultAccessPolicy.go index 84e2637c83b..03123206e1b 100644 --- a/service/glacier/api_op_DeleteVaultAccessPolicy.go +++ b/service/glacier/api_op_DeleteVaultAccessPolicy.go @@ -66,6 +66,9 @@ func addOperationDeleteVaultAccessPolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteVaultAccessPolicyMiddlewares(stack *middleware.Stack, opt if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_DeleteVaultNotifications.go b/service/glacier/api_op_DeleteVaultNotifications.go index fa948dd5434..6d2c0505577 100644 --- a/service/glacier/api_op_DeleteVaultNotifications.go +++ b/service/glacier/api_op_DeleteVaultNotifications.go @@ -75,6 +75,9 @@ func addOperationDeleteVaultNotificationsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDeleteVaultNotificationsMiddlewares(stack *middleware.Stack, op if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_DescribeJob.go b/service/glacier/api_op_DescribeJob.go index 9be93e764c0..bbb2ac9195c 100644 --- a/service/glacier/api_op_DescribeJob.go +++ b/service/glacier/api_op_DescribeJob.go @@ -180,6 +180,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -231,6 +234,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_DescribeVault.go b/service/glacier/api_op_DescribeVault.go index 5183847da05..b1b18c5c7db 100644 --- a/service/glacier/api_op_DescribeVault.go +++ b/service/glacier/api_op_DescribeVault.go @@ -108,6 +108,9 @@ func addOperationDescribeVaultMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationDescribeVaultMiddlewares(stack *middleware.Stack, options Optio if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_GetDataRetrievalPolicy.go b/service/glacier/api_op_GetDataRetrievalPolicy.go index fbc2e3bb74f..2ae8cf0659e 100644 --- a/service/glacier/api_op_GetDataRetrievalPolicy.go +++ b/service/glacier/api_op_GetDataRetrievalPolicy.go @@ -64,6 +64,9 @@ func addOperationGetDataRetrievalPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetDataRetrievalPolicyMiddlewares(stack *middleware.Stack, opti if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_GetJobOutput.go b/service/glacier/api_op_GetJobOutput.go index ce27a582dc7..f25aaf02037 100644 --- a/service/glacier/api_op_GetJobOutput.go +++ b/service/glacier/api_op_GetJobOutput.go @@ -179,6 +179,9 @@ func addOperationGetJobOutputMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -227,6 +230,9 @@ func addOperationGetJobOutputMiddlewares(stack *middleware.Stack, options Option if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_GetVaultAccessPolicy.go b/service/glacier/api_op_GetVaultAccessPolicy.go index 90a774013a7..d753ff742d3 100644 --- a/service/glacier/api_op_GetVaultAccessPolicy.go +++ b/service/glacier/api_op_GetVaultAccessPolicy.go @@ -72,6 +72,9 @@ func addOperationGetVaultAccessPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetVaultAccessPolicyMiddlewares(stack *middleware.Stack, option if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_GetVaultLock.go b/service/glacier/api_op_GetVaultLock.go index 02b56949276..67260ef602f 100644 --- a/service/glacier/api_op_GetVaultLock.go +++ b/service/glacier/api_op_GetVaultLock.go @@ -98,6 +98,9 @@ func addOperationGetVaultLockMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationGetVaultLockMiddlewares(stack *middleware.Stack, options Option if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_GetVaultNotifications.go b/service/glacier/api_op_GetVaultNotifications.go index fabaf1c453c..3a70e8ef01f 100644 --- a/service/glacier/api_op_GetVaultNotifications.go +++ b/service/glacier/api_op_GetVaultNotifications.go @@ -83,6 +83,9 @@ func addOperationGetVaultNotificationsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetVaultNotificationsMiddlewares(stack *middleware.Stack, optio if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_InitiateJob.go b/service/glacier/api_op_InitiateJob.go index c8cfc12e3c4..a1fb7af80f7 100644 --- a/service/glacier/api_op_InitiateJob.go +++ b/service/glacier/api_op_InitiateJob.go @@ -77,6 +77,9 @@ func addOperationInitiateJobMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationInitiateJobMiddlewares(stack *middleware.Stack, options Options if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_InitiateMultipartUpload.go b/service/glacier/api_op_InitiateMultipartUpload.go index 8e98e758fdb..0a796b652ee 100644 --- a/service/glacier/api_op_InitiateMultipartUpload.go +++ b/service/glacier/api_op_InitiateMultipartUpload.go @@ -107,6 +107,9 @@ func addOperationInitiateMultipartUploadMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationInitiateMultipartUploadMiddlewares(stack *middleware.Stack, opt if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_InitiateVaultLock.go b/service/glacier/api_op_InitiateVaultLock.go index e4700d8b9a8..7dae751fe9a 100644 --- a/service/glacier/api_op_InitiateVaultLock.go +++ b/service/glacier/api_op_InitiateVaultLock.go @@ -97,6 +97,9 @@ func addOperationInitiateVaultLockMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationInitiateVaultLockMiddlewares(stack *middleware.Stack, options O if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_ListJobs.go b/service/glacier/api_op_ListJobs.go index 36124ca7ac4..d2cdc1a617c 100644 --- a/service/glacier/api_op_ListJobs.go +++ b/service/glacier/api_op_ListJobs.go @@ -116,6 +116,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_ListMultipartUploads.go b/service/glacier/api_op_ListMultipartUploads.go index fdb0c1c5f1f..2a5531e3a23 100644 --- a/service/glacier/api_op_ListMultipartUploads.go +++ b/service/glacier/api_op_ListMultipartUploads.go @@ -107,6 +107,9 @@ func addOperationListMultipartUploadsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationListMultipartUploadsMiddlewares(stack *middleware.Stack, option if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_ListParts.go b/service/glacier/api_op_ListParts.go index 474415ad8a1..559621f068c 100644 --- a/service/glacier/api_op_ListParts.go +++ b/service/glacier/api_op_ListParts.go @@ -128,6 +128,9 @@ func addOperationListPartsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationListPartsMiddlewares(stack *middleware.Stack, options Options) if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_ListProvisionedCapacity.go b/service/glacier/api_op_ListProvisionedCapacity.go index 792f26be948..06124cd8bdf 100644 --- a/service/glacier/api_op_ListProvisionedCapacity.go +++ b/service/glacier/api_op_ListProvisionedCapacity.go @@ -58,6 +58,9 @@ func addOperationListProvisionedCapacityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListProvisionedCapacityMiddlewares(stack *middleware.Stack, opt if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_ListTagsForVault.go b/service/glacier/api_op_ListTagsForVault.go index af12fd12d20..748d4143b1c 100644 --- a/service/glacier/api_op_ListTagsForVault.go +++ b/service/glacier/api_op_ListTagsForVault.go @@ -67,6 +67,9 @@ func addOperationListTagsForVaultMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListTagsForVaultMiddlewares(stack *middleware.Stack, options Op if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_ListVaults.go b/service/glacier/api_op_ListVaults.go index 533f02a0314..4cdc1b1bd9b 100644 --- a/service/glacier/api_op_ListVaults.go +++ b/service/glacier/api_op_ListVaults.go @@ -94,6 +94,9 @@ func addOperationListVaultsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationListVaultsMiddlewares(stack *middleware.Stack, options Options) if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_PurchaseProvisionedCapacity.go b/service/glacier/api_op_PurchaseProvisionedCapacity.go index 0a375a07639..fad389bbff7 100644 --- a/service/glacier/api_op_PurchaseProvisionedCapacity.go +++ b/service/glacier/api_op_PurchaseProvisionedCapacity.go @@ -56,6 +56,9 @@ func addOperationPurchaseProvisionedCapacityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationPurchaseProvisionedCapacityMiddlewares(stack *middleware.Stack, if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_RemoveTagsFromVault.go b/service/glacier/api_op_RemoveTagsFromVault.go index eea12e653f3..5a720e223c4 100644 --- a/service/glacier/api_op_RemoveTagsFromVault.go +++ b/service/glacier/api_op_RemoveTagsFromVault.go @@ -66,6 +66,9 @@ func addOperationRemoveTagsFromVaultMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRemoveTagsFromVaultMiddlewares(stack *middleware.Stack, options if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_SetDataRetrievalPolicy.go b/service/glacier/api_op_SetDataRetrievalPolicy.go index d33e0c026ad..9d586665046 100644 --- a/service/glacier/api_op_SetDataRetrievalPolicy.go +++ b/service/glacier/api_op_SetDataRetrievalPolicy.go @@ -65,6 +65,9 @@ func addOperationSetDataRetrievalPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationSetDataRetrievalPolicyMiddlewares(stack *middleware.Stack, opti if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_SetVaultAccessPolicy.go b/service/glacier/api_op_SetVaultAccessPolicy.go index db50a4d94fb..df9d391127c 100644 --- a/service/glacier/api_op_SetVaultAccessPolicy.go +++ b/service/glacier/api_op_SetVaultAccessPolicy.go @@ -69,6 +69,9 @@ func addOperationSetVaultAccessPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationSetVaultAccessPolicyMiddlewares(stack *middleware.Stack, option if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_SetVaultNotifications.go b/service/glacier/api_op_SetVaultNotifications.go index e5700869c25..7c5153b9d52 100644 --- a/service/glacier/api_op_SetVaultNotifications.go +++ b/service/glacier/api_op_SetVaultNotifications.go @@ -96,6 +96,9 @@ func addOperationSetVaultNotificationsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationSetVaultNotificationsMiddlewares(stack *middleware.Stack, optio if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_UploadArchive.go b/service/glacier/api_op_UploadArchive.go index c545bf498ad..446e5d2436b 100644 --- a/service/glacier/api_op_UploadArchive.go +++ b/service/glacier/api_op_UploadArchive.go @@ -115,6 +115,9 @@ func addOperationUploadArchiveMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUploadArchiveMiddlewares(stack *middleware.Stack, options Optio if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/api_op_UploadMultipartPart.go b/service/glacier/api_op_UploadMultipartPart.go index 8e08a67b14c..5faf0a63ebd 100644 --- a/service/glacier/api_op_UploadMultipartPart.go +++ b/service/glacier/api_op_UploadMultipartPart.go @@ -125,6 +125,9 @@ func addOperationUploadMultipartPartMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationUploadMultipartPartMiddlewares(stack *middleware.Stack, options if err = glaciercust.AddDefaultAccountIDMiddleware(stack, setDefaultAccountID); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glacier/go.mod b/service/glacier/go.mod index 995a770df5a..adc6f23c9ea 100644 --- a/service/glacier/go.mod +++ b/service/glacier/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/glacier go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/glacier/go.sum b/service/glacier/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/glacier/go.sum +++ b/service/glacier/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/globalaccelerator/api_client.go b/service/globalaccelerator/api_client.go index dcf8780e5dc..993ae72e203 100644 --- a/service/globalaccelerator/api_client.go +++ b/service/globalaccelerator/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/globalaccelerator/api_op_AdvertiseByoipCidr.go b/service/globalaccelerator/api_op_AdvertiseByoipCidr.go index b98460b3e9b..f89100eb6e5 100644 --- a/service/globalaccelerator/api_op_AdvertiseByoipCidr.go +++ b/service/globalaccelerator/api_op_AdvertiseByoipCidr.go @@ -63,6 +63,9 @@ func addOperationAdvertiseByoipCidrMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAdvertiseByoipCidrMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_CreateAccelerator.go b/service/globalaccelerator/api_op_CreateAccelerator.go index b5aaa1c71e9..9716516ca83 100644 --- a/service/globalaccelerator/api_op_CreateAccelerator.go +++ b/service/globalaccelerator/api_op_CreateAccelerator.go @@ -97,6 +97,9 @@ func addOperationCreateAcceleratorMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationCreateAcceleratorMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_CreateEndpointGroup.go b/service/globalaccelerator/api_op_CreateEndpointGroup.go index 97c768da725..4e0c97c14d3 100644 --- a/service/globalaccelerator/api_op_CreateEndpointGroup.go +++ b/service/globalaccelerator/api_op_CreateEndpointGroup.go @@ -111,6 +111,9 @@ func addOperationCreateEndpointGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationCreateEndpointGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_CreateListener.go b/service/globalaccelerator/api_op_CreateListener.go index 6de46b1fee8..d94814e7856 100644 --- a/service/globalaccelerator/api_op_CreateListener.go +++ b/service/globalaccelerator/api_op_CreateListener.go @@ -91,6 +91,9 @@ func addOperationCreateListenerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateListenerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DeleteAccelerator.go b/service/globalaccelerator/api_op_DeleteAccelerator.go index c06d1a0f2d1..1f43e786cc0 100644 --- a/service/globalaccelerator/api_op_DeleteAccelerator.go +++ b/service/globalaccelerator/api_op_DeleteAccelerator.go @@ -63,6 +63,9 @@ func addOperationDeleteAcceleratorMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteAcceleratorMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DeleteEndpointGroup.go b/service/globalaccelerator/api_op_DeleteEndpointGroup.go index 639250c14f1..6f18d5a5598 100644 --- a/service/globalaccelerator/api_op_DeleteEndpointGroup.go +++ b/service/globalaccelerator/api_op_DeleteEndpointGroup.go @@ -48,6 +48,9 @@ func addOperationDeleteEndpointGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteEndpointGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DeleteListener.go b/service/globalaccelerator/api_op_DeleteListener.go index 37739cf3d2e..5e314ac9315 100644 --- a/service/globalaccelerator/api_op_DeleteListener.go +++ b/service/globalaccelerator/api_op_DeleteListener.go @@ -48,6 +48,9 @@ func addOperationDeleteListenerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteListenerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DeprovisionByoipCidr.go b/service/globalaccelerator/api_op_DeprovisionByoipCidr.go index 4c91066fa5e..c787a9a787b 100644 --- a/service/globalaccelerator/api_op_DeprovisionByoipCidr.go +++ b/service/globalaccelerator/api_op_DeprovisionByoipCidr.go @@ -64,6 +64,9 @@ func addOperationDeprovisionByoipCidrMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeprovisionByoipCidrMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DescribeAccelerator.go b/service/globalaccelerator/api_op_DescribeAccelerator.go index a53d8b84f42..5feb416359c 100644 --- a/service/globalaccelerator/api_op_DescribeAccelerator.go +++ b/service/globalaccelerator/api_op_DescribeAccelerator.go @@ -54,6 +54,9 @@ func addOperationDescribeAcceleratorMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeAcceleratorMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go b/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go index af18cecd208..66bb4bfe4c6 100644 --- a/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go +++ b/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go @@ -55,6 +55,9 @@ func addOperationDescribeAcceleratorAttributesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeAcceleratorAttributesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DescribeEndpointGroup.go b/service/globalaccelerator/api_op_DescribeEndpointGroup.go index e328d1477ed..b778e067127 100644 --- a/service/globalaccelerator/api_op_DescribeEndpointGroup.go +++ b/service/globalaccelerator/api_op_DescribeEndpointGroup.go @@ -54,6 +54,9 @@ func addOperationDescribeEndpointGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeEndpointGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_DescribeListener.go b/service/globalaccelerator/api_op_DescribeListener.go index 1bea6e2c4b3..2dc40258a57 100644 --- a/service/globalaccelerator/api_op_DescribeListener.go +++ b/service/globalaccelerator/api_op_DescribeListener.go @@ -54,6 +54,9 @@ func addOperationDescribeListenerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeListenerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_ListAccelerators.go b/service/globalaccelerator/api_op_ListAccelerators.go index baeb125ff76..7f3846556d0 100644 --- a/service/globalaccelerator/api_op_ListAccelerators.go +++ b/service/globalaccelerator/api_op_ListAccelerators.go @@ -61,6 +61,9 @@ func addOperationListAcceleratorsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListAcceleratorsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_ListByoipCidrs.go b/service/globalaccelerator/api_op_ListByoipCidrs.go index af0f1c50407..ff1f11cc898 100644 --- a/service/globalaccelerator/api_op_ListByoipCidrs.go +++ b/service/globalaccelerator/api_op_ListByoipCidrs.go @@ -61,6 +61,9 @@ func addOperationListByoipCidrsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListByoipCidrsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_ListEndpointGroups.go b/service/globalaccelerator/api_op_ListEndpointGroups.go index 3ca223528b1..37d9f4a3a1a 100644 --- a/service/globalaccelerator/api_op_ListEndpointGroups.go +++ b/service/globalaccelerator/api_op_ListEndpointGroups.go @@ -66,6 +66,9 @@ func addOperationListEndpointGroupsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListEndpointGroupsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_ListListeners.go b/service/globalaccelerator/api_op_ListListeners.go index 0080cbe21b0..1a96916531c 100644 --- a/service/globalaccelerator/api_op_ListListeners.go +++ b/service/globalaccelerator/api_op_ListListeners.go @@ -67,6 +67,9 @@ func addOperationListListenersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListListenersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_ListTagsForResource.go b/service/globalaccelerator/api_op_ListTagsForResource.go index bc72c2d6dab..9280b2d0705 100644 --- a/service/globalaccelerator/api_op_ListTagsForResource.go +++ b/service/globalaccelerator/api_op_ListTagsForResource.go @@ -58,6 +58,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_ProvisionByoipCidr.go b/service/globalaccelerator/api_op_ProvisionByoipCidr.go index e962fe84adc..1f37beef295 100644 --- a/service/globalaccelerator/api_op_ProvisionByoipCidr.go +++ b/service/globalaccelerator/api_op_ProvisionByoipCidr.go @@ -69,6 +69,9 @@ func addOperationProvisionByoipCidrMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationProvisionByoipCidrMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_TagResource.go b/service/globalaccelerator/api_op_TagResource.go index 51dac2714a6..a8973374e53 100644 --- a/service/globalaccelerator/api_op_TagResource.go +++ b/service/globalaccelerator/api_op_TagResource.go @@ -60,6 +60,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_UntagResource.go b/service/globalaccelerator/api_op_UntagResource.go index 6d66af27680..114ed3fa3a3 100644 --- a/service/globalaccelerator/api_op_UntagResource.go +++ b/service/globalaccelerator/api_op_UntagResource.go @@ -60,6 +60,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_UpdateAccelerator.go b/service/globalaccelerator/api_op_UpdateAccelerator.go index 864117edf4c..c137797b20b 100644 --- a/service/globalaccelerator/api_op_UpdateAccelerator.go +++ b/service/globalaccelerator/api_op_UpdateAccelerator.go @@ -69,6 +69,9 @@ func addOperationUpdateAcceleratorMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateAcceleratorMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go b/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go index e404644f3b9..4ccfe0b76e0 100644 --- a/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go +++ b/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go @@ -73,6 +73,9 @@ func addOperationUpdateAcceleratorAttributesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateAcceleratorAttributesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_UpdateEndpointGroup.go b/service/globalaccelerator/api_op_UpdateEndpointGroup.go index f06fb0a6e39..1bdde728e99 100644 --- a/service/globalaccelerator/api_op_UpdateEndpointGroup.go +++ b/service/globalaccelerator/api_op_UpdateEndpointGroup.go @@ -98,6 +98,9 @@ func addOperationUpdateEndpointGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationUpdateEndpointGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_UpdateListener.go b/service/globalaccelerator/api_op_UpdateListener.go index f5bf3af9432..62d364315d8 100644 --- a/service/globalaccelerator/api_op_UpdateListener.go +++ b/service/globalaccelerator/api_op_UpdateListener.go @@ -78,6 +78,9 @@ func addOperationUpdateListenerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateListenerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/api_op_WithdrawByoipCidr.go b/service/globalaccelerator/api_op_WithdrawByoipCidr.go index b73fd3f0d65..5514b7493b8 100644 --- a/service/globalaccelerator/api_op_WithdrawByoipCidr.go +++ b/service/globalaccelerator/api_op_WithdrawByoipCidr.go @@ -61,6 +61,9 @@ func addOperationWithdrawByoipCidrMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationWithdrawByoipCidrMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/globalaccelerator/go.mod b/service/globalaccelerator/go.mod index 26e9edf30ee..8e821c1d96f 100644 --- a/service/globalaccelerator/go.mod +++ b/service/globalaccelerator/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/globalaccelerator go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/globalaccelerator/go.sum b/service/globalaccelerator/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/globalaccelerator/go.sum +++ b/service/globalaccelerator/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/glue/api_client.go b/service/glue/api_client.go index 20f47c819b2..d651799ca59 100644 --- a/service/glue/api_client.go +++ b/service/glue/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/glue/api_op_BatchCreatePartition.go b/service/glue/api_op_BatchCreatePartition.go index 4411c21d4f9..ece93c002fc 100644 --- a/service/glue/api_op_BatchCreatePartition.go +++ b/service/glue/api_op_BatchCreatePartition.go @@ -67,6 +67,9 @@ func addOperationBatchCreatePartitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationBatchCreatePartitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchDeleteConnection.go b/service/glue/api_op_BatchDeleteConnection.go index 62c282c8028..2700b631a40 100644 --- a/service/glue/api_op_BatchDeleteConnection.go +++ b/service/glue/api_op_BatchDeleteConnection.go @@ -61,6 +61,9 @@ func addOperationBatchDeleteConnectionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationBatchDeleteConnectionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchDeletePartition.go b/service/glue/api_op_BatchDeletePartition.go index 43f788ece72..4e57a5b350a 100644 --- a/service/glue/api_op_BatchDeletePartition.go +++ b/service/glue/api_op_BatchDeletePartition.go @@ -67,6 +67,9 @@ func addOperationBatchDeletePartitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationBatchDeletePartitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchDeleteTable.go b/service/glue/api_op_BatchDeleteTable.go index 842ab4c0daa..7a42f0c31d3 100644 --- a/service/glue/api_op_BatchDeleteTable.go +++ b/service/glue/api_op_BatchDeleteTable.go @@ -69,6 +69,9 @@ func addOperationBatchDeleteTableMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationBatchDeleteTableMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchDeleteTableVersion.go b/service/glue/api_op_BatchDeleteTableVersion.go index caf57eb59de..6248b03e3e7 100644 --- a/service/glue/api_op_BatchDeleteTableVersion.go +++ b/service/glue/api_op_BatchDeleteTableVersion.go @@ -70,6 +70,9 @@ func addOperationBatchDeleteTableVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationBatchDeleteTableVersionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchGetCrawlers.go b/service/glue/api_op_BatchGetCrawlers.go index c27692d5910..851f9a1343f 100644 --- a/service/glue/api_op_BatchGetCrawlers.go +++ b/service/glue/api_op_BatchGetCrawlers.go @@ -60,6 +60,9 @@ func addOperationBatchGetCrawlersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchGetCrawlersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchGetDevEndpoints.go b/service/glue/api_op_BatchGetDevEndpoints.go index 6c873950604..698f92e9532 100644 --- a/service/glue/api_op_BatchGetDevEndpoints.go +++ b/service/glue/api_op_BatchGetDevEndpoints.go @@ -60,6 +60,9 @@ func addOperationBatchGetDevEndpointsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchGetDevEndpointsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchGetJobs.go b/service/glue/api_op_BatchGetJobs.go index 4a1a6734c3a..493a85ea3c5 100644 --- a/service/glue/api_op_BatchGetJobs.go +++ b/service/glue/api_op_BatchGetJobs.go @@ -60,6 +60,9 @@ func addOperationBatchGetJobsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchGetJobsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchGetPartition.go b/service/glue/api_op_BatchGetPartition.go index 067a9b41c93..202c9011506 100644 --- a/service/glue/api_op_BatchGetPartition.go +++ b/service/glue/api_op_BatchGetPartition.go @@ -71,6 +71,9 @@ func addOperationBatchGetPartitionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchGetPartitionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchGetTriggers.go b/service/glue/api_op_BatchGetTriggers.go index 0126ec1f314..c7263fd94bd 100644 --- a/service/glue/api_op_BatchGetTriggers.go +++ b/service/glue/api_op_BatchGetTriggers.go @@ -60,6 +60,9 @@ func addOperationBatchGetTriggersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchGetTriggersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchGetWorkflows.go b/service/glue/api_op_BatchGetWorkflows.go index c59545edea6..1f54de0bd81 100644 --- a/service/glue/api_op_BatchGetWorkflows.go +++ b/service/glue/api_op_BatchGetWorkflows.go @@ -64,6 +64,9 @@ func addOperationBatchGetWorkflowsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchGetWorkflowsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchStopJobRun.go b/service/glue/api_op_BatchStopJobRun.go index fa6d592bf20..793c86c4af6 100644 --- a/service/glue/api_op_BatchStopJobRun.go +++ b/service/glue/api_op_BatchStopJobRun.go @@ -62,6 +62,9 @@ func addOperationBatchStopJobRunMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationBatchStopJobRunMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_BatchUpdatePartition.go b/service/glue/api_op_BatchUpdatePartition.go index 2bd7e2d038d..2207152fdb1 100644 --- a/service/glue/api_op_BatchUpdatePartition.go +++ b/service/glue/api_op_BatchUpdatePartition.go @@ -68,6 +68,9 @@ func addOperationBatchUpdatePartitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationBatchUpdatePartitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CancelMLTaskRun.go b/service/glue/api_op_CancelMLTaskRun.go index 3b55a16e030..81eaf8e5fe3 100644 --- a/service/glue/api_op_CancelMLTaskRun.go +++ b/service/glue/api_op_CancelMLTaskRun.go @@ -68,6 +68,9 @@ func addOperationCancelMLTaskRunMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCancelMLTaskRunMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateClassifier.go b/service/glue/api_op_CreateClassifier.go index 2227fc951a9..9049a8afb29 100644 --- a/service/glue/api_op_CreateClassifier.go +++ b/service/glue/api_op_CreateClassifier.go @@ -58,6 +58,9 @@ func addOperationCreateClassifierMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateClassifierMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateConnection.go b/service/glue/api_op_CreateConnection.go index 98a0a549e5d..3ff26636217 100644 --- a/service/glue/api_op_CreateConnection.go +++ b/service/glue/api_op_CreateConnection.go @@ -53,6 +53,9 @@ func addOperationCreateConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCreateConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateCrawler.go b/service/glue/api_op_CreateCrawler.go index 03ee2b90406..005b85bc254 100644 --- a/service/glue/api_op_CreateCrawler.go +++ b/service/glue/api_op_CreateCrawler.go @@ -105,6 +105,9 @@ func addOperationCreateCrawlerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateCrawlerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateDatabase.go b/service/glue/api_op_CreateDatabase.go index afc212b7dcf..a2dea76864e 100644 --- a/service/glue/api_op_CreateDatabase.go +++ b/service/glue/api_op_CreateDatabase.go @@ -53,6 +53,9 @@ func addOperationCreateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCreateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateDevEndpoint.go b/service/glue/api_op_CreateDevEndpoint.go index c056f7e60b6..9019fbdef67 100644 --- a/service/glue/api_op_CreateDevEndpoint.go +++ b/service/glue/api_op_CreateDevEndpoint.go @@ -220,6 +220,9 @@ func addOperationCreateDevEndpointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -262,6 +265,9 @@ func addOperationCreateDevEndpointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateJob.go b/service/glue/api_op_CreateJob.go index ae4c2572f73..b096470bf76 100644 --- a/service/glue/api_op_CreateJob.go +++ b/service/glue/api_op_CreateJob.go @@ -166,6 +166,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -208,6 +211,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateMLTransform.go b/service/glue/api_op_CreateMLTransform.go index 5fe52f14cd0..8e5cbc060a3 100644 --- a/service/glue/api_op_CreateMLTransform.go +++ b/service/glue/api_op_CreateMLTransform.go @@ -183,6 +183,9 @@ func addOperationCreateMLTransformMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -225,6 +228,9 @@ func addOperationCreateMLTransformMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreatePartition.go b/service/glue/api_op_CreatePartition.go index 49619b810ff..619f2316872 100644 --- a/service/glue/api_op_CreatePartition.go +++ b/service/glue/api_op_CreatePartition.go @@ -62,6 +62,9 @@ func addOperationCreatePartitionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreatePartitionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateScript.go b/service/glue/api_op_CreateScript.go index a1b5aa7f064..325a456aff2 100644 --- a/service/glue/api_op_CreateScript.go +++ b/service/glue/api_op_CreateScript.go @@ -60,6 +60,9 @@ func addOperationCreateScriptMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateScriptMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateSecurityConfiguration.go b/service/glue/api_op_CreateSecurityConfiguration.go index 1d09df656f6..8156303a225 100644 --- a/service/glue/api_op_CreateSecurityConfiguration.go +++ b/service/glue/api_op_CreateSecurityConfiguration.go @@ -67,6 +67,9 @@ func addOperationCreateSecurityConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateSecurityConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateTable.go b/service/glue/api_op_CreateTable.go index 417e5f43539..eb6e9b473fd 100644 --- a/service/glue/api_op_CreateTable.go +++ b/service/glue/api_op_CreateTable.go @@ -62,6 +62,9 @@ func addOperationCreateTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateTableMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateTrigger.go b/service/glue/api_op_CreateTrigger.go index 63de2ea0a52..c4dd68e7863 100644 --- a/service/glue/api_op_CreateTrigger.go +++ b/service/glue/api_op_CreateTrigger.go @@ -90,6 +90,9 @@ func addOperationCreateTriggerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateTriggerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateUserDefinedFunction.go b/service/glue/api_op_CreateUserDefinedFunction.go index b1942cd263c..64a96c813ab 100644 --- a/service/glue/api_op_CreateUserDefinedFunction.go +++ b/service/glue/api_op_CreateUserDefinedFunction.go @@ -58,6 +58,9 @@ func addOperationCreateUserDefinedFunctionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateUserDefinedFunctionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_CreateWorkflow.go b/service/glue/api_op_CreateWorkflow.go index 0dffa9454f0..7f2cb8dad1d 100644 --- a/service/glue/api_op_CreateWorkflow.go +++ b/service/glue/api_op_CreateWorkflow.go @@ -68,6 +68,9 @@ func addOperationCreateWorkflowMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateWorkflowMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteClassifier.go b/service/glue/api_op_DeleteClassifier.go index 06dafaa5f78..2978bc95ad2 100644 --- a/service/glue/api_op_DeleteClassifier.go +++ b/service/glue/api_op_DeleteClassifier.go @@ -48,6 +48,9 @@ func addOperationDeleteClassifierMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteClassifierMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteColumnStatisticsForPartition.go b/service/glue/api_op_DeleteColumnStatisticsForPartition.go index bcafab05bb2..ba48ace553d 100644 --- a/service/glue/api_op_DeleteColumnStatisticsForPartition.go +++ b/service/glue/api_op_DeleteColumnStatisticsForPartition.go @@ -68,6 +68,9 @@ func addOperationDeleteColumnStatisticsForPartitionMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteColumnStatisticsForPartitionMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteColumnStatisticsForTable.go b/service/glue/api_op_DeleteColumnStatisticsForTable.go index 2482f11694d..711e8f2758d 100644 --- a/service/glue/api_op_DeleteColumnStatisticsForTable.go +++ b/service/glue/api_op_DeleteColumnStatisticsForTable.go @@ -63,6 +63,9 @@ func addOperationDeleteColumnStatisticsForTableMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteColumnStatisticsForTableMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteConnection.go b/service/glue/api_op_DeleteConnection.go index 93b718b99d1..6929fa47ba1 100644 --- a/service/glue/api_op_DeleteConnection.go +++ b/service/glue/api_op_DeleteConnection.go @@ -52,6 +52,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteCrawler.go b/service/glue/api_op_DeleteCrawler.go index 4c934b9bcdf..b0fb510276a 100644 --- a/service/glue/api_op_DeleteCrawler.go +++ b/service/glue/api_op_DeleteCrawler.go @@ -49,6 +49,9 @@ func addOperationDeleteCrawlerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteCrawlerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteDatabase.go b/service/glue/api_op_DeleteDatabase.go index 3da5a4c4b52..67b7522272c 100644 --- a/service/glue/api_op_DeleteDatabase.go +++ b/service/glue/api_op_DeleteDatabase.go @@ -61,6 +61,9 @@ func addOperationDeleteDatabaseMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteDatabaseMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteDevEndpoint.go b/service/glue/api_op_DeleteDevEndpoint.go index 61b29fd2b19..4dc5d5d37df 100644 --- a/service/glue/api_op_DeleteDevEndpoint.go +++ b/service/glue/api_op_DeleteDevEndpoint.go @@ -48,6 +48,9 @@ func addOperationDeleteDevEndpointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDevEndpointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteJob.go b/service/glue/api_op_DeleteJob.go index 7eea58bfe13..b182489eda7 100644 --- a/service/glue/api_op_DeleteJob.go +++ b/service/glue/api_op_DeleteJob.go @@ -53,6 +53,9 @@ func addOperationDeleteJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteMLTransform.go b/service/glue/api_op_DeleteMLTransform.go index d261147ce92..e7d63ac9da2 100644 --- a/service/glue/api_op_DeleteMLTransform.go +++ b/service/glue/api_op_DeleteMLTransform.go @@ -57,6 +57,9 @@ func addOperationDeleteMLTransformMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteMLTransformMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeletePartition.go b/service/glue/api_op_DeletePartition.go index 4918acea0eb..cbec01c94b6 100644 --- a/service/glue/api_op_DeletePartition.go +++ b/service/glue/api_op_DeletePartition.go @@ -62,6 +62,9 @@ func addOperationDeletePartitionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeletePartitionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteResourcePolicy.go b/service/glue/api_op_DeleteResourcePolicy.go index 0212af1ff04..ae367674c74 100644 --- a/service/glue/api_op_DeleteResourcePolicy.go +++ b/service/glue/api_op_DeleteResourcePolicy.go @@ -49,6 +49,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteSecurityConfiguration.go b/service/glue/api_op_DeleteSecurityConfiguration.go index 60fd5f53aef..8e2813108fe 100644 --- a/service/glue/api_op_DeleteSecurityConfiguration.go +++ b/service/glue/api_op_DeleteSecurityConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeleteSecurityConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteSecurityConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteTable.go b/service/glue/api_op_DeleteTable.go index 8135f881404..20c7bc51419 100644 --- a/service/glue/api_op_DeleteTable.go +++ b/service/glue/api_op_DeleteTable.go @@ -65,6 +65,9 @@ func addOperationDeleteTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteTableMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteTableVersion.go b/service/glue/api_op_DeleteTableVersion.go index 2ea93cb0b40..5b53e714331 100644 --- a/service/glue/api_op_DeleteTableVersion.go +++ b/service/glue/api_op_DeleteTableVersion.go @@ -64,6 +64,9 @@ func addOperationDeleteTableVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteTableVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteTrigger.go b/service/glue/api_op_DeleteTrigger.go index f6fa777fa8c..156fd6d5aa1 100644 --- a/service/glue/api_op_DeleteTrigger.go +++ b/service/glue/api_op_DeleteTrigger.go @@ -53,6 +53,9 @@ func addOperationDeleteTriggerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteTriggerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteUserDefinedFunction.go b/service/glue/api_op_DeleteUserDefinedFunction.go index a07212b67b1..2368521bf4b 100644 --- a/service/glue/api_op_DeleteUserDefinedFunction.go +++ b/service/glue/api_op_DeleteUserDefinedFunction.go @@ -57,6 +57,9 @@ func addOperationDeleteUserDefinedFunctionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteUserDefinedFunctionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_DeleteWorkflow.go b/service/glue/api_op_DeleteWorkflow.go index 3637c863f27..41d99f44219 100644 --- a/service/glue/api_op_DeleteWorkflow.go +++ b/service/glue/api_op_DeleteWorkflow.go @@ -52,6 +52,9 @@ func addOperationDeleteWorkflowMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteWorkflowMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetCatalogImportStatus.go b/service/glue/api_op_GetCatalogImportStatus.go index 75282e038ad..5f6fce93fb7 100644 --- a/service/glue/api_op_GetCatalogImportStatus.go +++ b/service/glue/api_op_GetCatalogImportStatus.go @@ -51,6 +51,9 @@ func addOperationGetCatalogImportStatusMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetCatalogImportStatusMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetClassifier.go b/service/glue/api_op_GetClassifier.go index 8b04226a460..12667c212c6 100644 --- a/service/glue/api_op_GetClassifier.go +++ b/service/glue/api_op_GetClassifier.go @@ -53,6 +53,9 @@ func addOperationGetClassifierMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetClassifierMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetClassifiers.go b/service/glue/api_op_GetClassifiers.go index b9efb0c7569..5be3b17009c 100644 --- a/service/glue/api_op_GetClassifiers.go +++ b/service/glue/api_op_GetClassifiers.go @@ -57,6 +57,9 @@ func addOperationGetClassifiersMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetClassifiersMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetColumnStatisticsForPartition.go b/service/glue/api_op_GetColumnStatisticsForPartition.go index 1b0e09b1800..0290ad3a4b8 100644 --- a/service/glue/api_op_GetColumnStatisticsForPartition.go +++ b/service/glue/api_op_GetColumnStatisticsForPartition.go @@ -76,6 +76,9 @@ func addOperationGetColumnStatisticsForPartitionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetColumnStatisticsForPartitionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetColumnStatisticsForTable.go b/service/glue/api_op_GetColumnStatisticsForTable.go index af8d6b28b83..4baf75ddc24 100644 --- a/service/glue/api_op_GetColumnStatisticsForTable.go +++ b/service/glue/api_op_GetColumnStatisticsForTable.go @@ -71,6 +71,9 @@ func addOperationGetColumnStatisticsForTableMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetColumnStatisticsForTableMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetConnection.go b/service/glue/api_op_GetConnection.go index 771688ec5df..8a368516549 100644 --- a/service/glue/api_op_GetConnection.go +++ b/service/glue/api_op_GetConnection.go @@ -64,6 +64,9 @@ func addOperationGetConnectionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetConnectionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetConnections.go b/service/glue/api_op_GetConnections.go index 8adc3f1e4b1..35e168d808e 100644 --- a/service/glue/api_op_GetConnections.go +++ b/service/glue/api_op_GetConnections.go @@ -72,6 +72,9 @@ func addOperationGetConnectionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetConnectionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetCrawler.go b/service/glue/api_op_GetCrawler.go index 428a7951d49..0089057e496 100644 --- a/service/glue/api_op_GetCrawler.go +++ b/service/glue/api_op_GetCrawler.go @@ -53,6 +53,9 @@ func addOperationGetCrawlerMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetCrawlerMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetCrawlerMetrics.go b/service/glue/api_op_GetCrawlerMetrics.go index 54be586f838..4bb5c4f4dad 100644 --- a/service/glue/api_op_GetCrawlerMetrics.go +++ b/service/glue/api_op_GetCrawlerMetrics.go @@ -61,6 +61,9 @@ func addOperationGetCrawlerMetricsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetCrawlerMetricsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetCrawlers.go b/service/glue/api_op_GetCrawlers.go index 6d5983a3845..7ce6ff51ea6 100644 --- a/service/glue/api_op_GetCrawlers.go +++ b/service/glue/api_op_GetCrawlers.go @@ -58,6 +58,9 @@ func addOperationGetCrawlersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetCrawlersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetDataCatalogEncryptionSettings.go b/service/glue/api_op_GetDataCatalogEncryptionSettings.go index 95b7000601a..a5b6ef3dadb 100644 --- a/service/glue/api_op_GetDataCatalogEncryptionSettings.go +++ b/service/glue/api_op_GetDataCatalogEncryptionSettings.go @@ -52,6 +52,9 @@ func addOperationGetDataCatalogEncryptionSettingsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationGetDataCatalogEncryptionSettingsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetDatabase.go b/service/glue/api_op_GetDatabase.go index 76b576acbad..f899a3200b8 100644 --- a/service/glue/api_op_GetDatabase.go +++ b/service/glue/api_op_GetDatabase.go @@ -58,6 +58,9 @@ func addOperationGetDatabaseMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDatabaseMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetDatabases.go b/service/glue/api_op_GetDatabases.go index 87937b6ac0a..04b9e836890 100644 --- a/service/glue/api_op_GetDatabases.go +++ b/service/glue/api_op_GetDatabases.go @@ -75,6 +75,9 @@ func addOperationGetDatabasesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetDatabasesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetDataflowGraph.go b/service/glue/api_op_GetDataflowGraph.go index 542774e4ea8..1c2882db2d7 100644 --- a/service/glue/api_op_GetDataflowGraph.go +++ b/service/glue/api_op_GetDataflowGraph.go @@ -54,6 +54,9 @@ func addOperationGetDataflowGraphMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetDataflowGraphMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetDevEndpoint.go b/service/glue/api_op_GetDevEndpoint.go index 1ed431866d5..8983221049e 100644 --- a/service/glue/api_op_GetDevEndpoint.go +++ b/service/glue/api_op_GetDevEndpoint.go @@ -57,6 +57,9 @@ func addOperationGetDevEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetDevEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetDevEndpoints.go b/service/glue/api_op_GetDevEndpoints.go index 2177e45384f..250870a4660 100644 --- a/service/glue/api_op_GetDevEndpoints.go +++ b/service/glue/api_op_GetDevEndpoints.go @@ -61,6 +61,9 @@ func addOperationGetDevEndpointsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDevEndpointsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetJob.go b/service/glue/api_op_GetJob.go index aa31bd664b7..75c888bbd9a 100644 --- a/service/glue/api_op_GetJob.go +++ b/service/glue/api_op_GetJob.go @@ -53,6 +53,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetJobBookmark.go b/service/glue/api_op_GetJobBookmark.go index 25b43950bb4..f37168f870c 100644 --- a/service/glue/api_op_GetJobBookmark.go +++ b/service/glue/api_op_GetJobBookmark.go @@ -56,6 +56,9 @@ func addOperationGetJobBookmarkMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetJobBookmarkMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetJobRun.go b/service/glue/api_op_GetJobRun.go index d17934521c4..870c62fe45e 100644 --- a/service/glue/api_op_GetJobRun.go +++ b/service/glue/api_op_GetJobRun.go @@ -61,6 +61,9 @@ func addOperationGetJobRunMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetJobRunMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetJobRuns.go b/service/glue/api_op_GetJobRuns.go index ac5b6332e04..52f1efc2fe7 100644 --- a/service/glue/api_op_GetJobRuns.go +++ b/service/glue/api_op_GetJobRuns.go @@ -62,6 +62,9 @@ func addOperationGetJobRunsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetJobRunsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetJobs.go b/service/glue/api_op_GetJobs.go index 12ec5077197..bce53e951b2 100644 --- a/service/glue/api_op_GetJobs.go +++ b/service/glue/api_op_GetJobs.go @@ -57,6 +57,9 @@ func addOperationGetJobsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetJobsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetMLTaskRun.go b/service/glue/api_op_GetMLTaskRun.go index 21305fa7765..0302cfe89be 100644 --- a/service/glue/api_op_GetMLTaskRun.go +++ b/service/glue/api_op_GetMLTaskRun.go @@ -90,6 +90,9 @@ func addOperationGetMLTaskRunMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetMLTaskRunMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetMLTaskRuns.go b/service/glue/api_op_GetMLTaskRuns.go index 5424e115966..f7de2a0c965 100644 --- a/service/glue/api_op_GetMLTaskRuns.go +++ b/service/glue/api_op_GetMLTaskRuns.go @@ -73,6 +73,9 @@ func addOperationGetMLTaskRunsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetMLTaskRunsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetMLTransform.go b/service/glue/api_op_GetMLTransform.go index 7402b8626f0..229ca5ca79b 100644 --- a/service/glue/api_op_GetMLTransform.go +++ b/service/glue/api_op_GetMLTransform.go @@ -145,6 +145,9 @@ func addOperationGetMLTransformMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationGetMLTransformMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetMLTransforms.go b/service/glue/api_op_GetMLTransforms.go index 7cc5e53726b..1a669d8b4be 100644 --- a/service/glue/api_op_GetMLTransforms.go +++ b/service/glue/api_op_GetMLTransforms.go @@ -69,6 +69,9 @@ func addOperationGetMLTransformsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetMLTransformsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetMapping.go b/service/glue/api_op_GetMapping.go index 348982aba39..2d3fddf5312 100644 --- a/service/glue/api_op_GetMapping.go +++ b/service/glue/api_op_GetMapping.go @@ -61,6 +61,9 @@ func addOperationGetMappingMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetMappingMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetPartition.go b/service/glue/api_op_GetPartition.go index ef7688af565..aab5ec180bd 100644 --- a/service/glue/api_op_GetPartition.go +++ b/service/glue/api_op_GetPartition.go @@ -67,6 +67,9 @@ func addOperationGetPartitionMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetPartitionMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetPartitionIndexes.go b/service/glue/api_op_GetPartitionIndexes.go index 5b983d71d54..67378518b2e 100644 --- a/service/glue/api_op_GetPartitionIndexes.go +++ b/service/glue/api_op_GetPartitionIndexes.go @@ -69,6 +69,9 @@ func addOperationGetPartitionIndexesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetPartitionIndexesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetPartitions.go b/service/glue/api_op_GetPartitions.go index 175d714e22e..9fb132e915f 100644 --- a/service/glue/api_op_GetPartitions.go +++ b/service/glue/api_op_GetPartitions.go @@ -122,6 +122,9 @@ func addOperationGetPartitionsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationGetPartitionsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetPlan.go b/service/glue/api_op_GetPlan.go index 6b2106e5617..12b4bd3f080 100644 --- a/service/glue/api_op_GetPlan.go +++ b/service/glue/api_op_GetPlan.go @@ -79,6 +79,9 @@ func addOperationGetPlanMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetPlanMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetResourcePolicies.go b/service/glue/api_op_GetResourcePolicies.go index c4c830a47c1..007a25b9140 100644 --- a/service/glue/api_op_GetResourcePolicies.go +++ b/service/glue/api_op_GetResourcePolicies.go @@ -63,6 +63,9 @@ func addOperationGetResourcePoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetResourcePoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetResourcePolicy.go b/service/glue/api_op_GetResourcePolicy.go index 6bb1c756921..fddfbfa17e1 100644 --- a/service/glue/api_op_GetResourcePolicy.go +++ b/service/glue/api_op_GetResourcePolicy.go @@ -63,6 +63,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetSecurityConfiguration.go b/service/glue/api_op_GetSecurityConfiguration.go index ea1860788b4..c70bae5a3bb 100644 --- a/service/glue/api_op_GetSecurityConfiguration.go +++ b/service/glue/api_op_GetSecurityConfiguration.go @@ -53,6 +53,9 @@ func addOperationGetSecurityConfigurationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetSecurityConfigurationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetSecurityConfigurations.go b/service/glue/api_op_GetSecurityConfigurations.go index 123457aa068..f938e83b402 100644 --- a/service/glue/api_op_GetSecurityConfigurations.go +++ b/service/glue/api_op_GetSecurityConfigurations.go @@ -57,6 +57,9 @@ func addOperationGetSecurityConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetSecurityConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTable.go b/service/glue/api_op_GetTable.go index fc96230b7ad..2f69bf07fc1 100644 --- a/service/glue/api_op_GetTable.go +++ b/service/glue/api_op_GetTable.go @@ -64,6 +64,9 @@ func addOperationGetTableMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetTableMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTableVersion.go b/service/glue/api_op_GetTableVersion.go index e034c3efb4c..95fb03e75f6 100644 --- a/service/glue/api_op_GetTableVersion.go +++ b/service/glue/api_op_GetTableVersion.go @@ -67,6 +67,9 @@ func addOperationGetTableVersionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetTableVersionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTableVersions.go b/service/glue/api_op_GetTableVersions.go index 71c7584a758..72dd2ec09ac 100644 --- a/service/glue/api_op_GetTableVersions.go +++ b/service/glue/api_op_GetTableVersions.go @@ -74,6 +74,9 @@ func addOperationGetTableVersionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetTableVersionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTables.go b/service/glue/api_op_GetTables.go index 9b36b610433..59dd533bb20 100644 --- a/service/glue/api_op_GetTables.go +++ b/service/glue/api_op_GetTables.go @@ -71,6 +71,9 @@ func addOperationGetTablesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetTablesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTags.go b/service/glue/api_op_GetTags.go index 5370a49f326..9b19b5fb0c6 100644 --- a/service/glue/api_op_GetTags.go +++ b/service/glue/api_op_GetTags.go @@ -52,6 +52,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTrigger.go b/service/glue/api_op_GetTrigger.go index 05b03d2dfee..4c3ab14e630 100644 --- a/service/glue/api_op_GetTrigger.go +++ b/service/glue/api_op_GetTrigger.go @@ -53,6 +53,9 @@ func addOperationGetTriggerMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetTriggerMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetTriggers.go b/service/glue/api_op_GetTriggers.go index b0257123eb0..6cb42f89c4d 100644 --- a/service/glue/api_op_GetTriggers.go +++ b/service/glue/api_op_GetTriggers.go @@ -61,6 +61,9 @@ func addOperationGetTriggersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetTriggersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetUserDefinedFunction.go b/service/glue/api_op_GetUserDefinedFunction.go index 916e73cb46d..f1509b68ed9 100644 --- a/service/glue/api_op_GetUserDefinedFunction.go +++ b/service/glue/api_op_GetUserDefinedFunction.go @@ -62,6 +62,9 @@ func addOperationGetUserDefinedFunctionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetUserDefinedFunctionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetUserDefinedFunctions.go b/service/glue/api_op_GetUserDefinedFunctions.go index fa28b189ac3..5c5b3589b25 100644 --- a/service/glue/api_op_GetUserDefinedFunctions.go +++ b/service/glue/api_op_GetUserDefinedFunctions.go @@ -72,6 +72,9 @@ func addOperationGetUserDefinedFunctionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetUserDefinedFunctionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetWorkflow.go b/service/glue/api_op_GetWorkflow.go index e6129026d29..09615ac6c50 100644 --- a/service/glue/api_op_GetWorkflow.go +++ b/service/glue/api_op_GetWorkflow.go @@ -57,6 +57,9 @@ func addOperationGetWorkflowMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetWorkflowMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetWorkflowRun.go b/service/glue/api_op_GetWorkflowRun.go index 6b3d31036be..d2b11c1ef6f 100644 --- a/service/glue/api_op_GetWorkflowRun.go +++ b/service/glue/api_op_GetWorkflowRun.go @@ -61,6 +61,9 @@ func addOperationGetWorkflowRunMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetWorkflowRunMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetWorkflowRunProperties.go b/service/glue/api_op_GetWorkflowRunProperties.go index 28818ec7e33..f64f40da9f6 100644 --- a/service/glue/api_op_GetWorkflowRunProperties.go +++ b/service/glue/api_op_GetWorkflowRunProperties.go @@ -57,6 +57,9 @@ func addOperationGetWorkflowRunPropertiesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetWorkflowRunPropertiesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_GetWorkflowRuns.go b/service/glue/api_op_GetWorkflowRuns.go index 2635464f457..eb9effede32 100644 --- a/service/glue/api_op_GetWorkflowRuns.go +++ b/service/glue/api_op_GetWorkflowRuns.go @@ -65,6 +65,9 @@ func addOperationGetWorkflowRunsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetWorkflowRunsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ImportCatalogToGlue.go b/service/glue/api_op_ImportCatalogToGlue.go index 1228e84e7eb..7a97e3f49f7 100644 --- a/service/glue/api_op_ImportCatalogToGlue.go +++ b/service/glue/api_op_ImportCatalogToGlue.go @@ -46,6 +46,9 @@ func addOperationImportCatalogToGlueMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationImportCatalogToGlueMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ListCrawlers.go b/service/glue/api_op_ListCrawlers.go index f21f4fa3bf3..f356d70936c 100644 --- a/service/glue/api_op_ListCrawlers.go +++ b/service/glue/api_op_ListCrawlers.go @@ -66,6 +66,9 @@ func addOperationListCrawlersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListCrawlersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ListDevEndpoints.go b/service/glue/api_op_ListDevEndpoints.go index 2ec8010758c..46950a9ca32 100644 --- a/service/glue/api_op_ListDevEndpoints.go +++ b/service/glue/api_op_ListDevEndpoints.go @@ -66,6 +66,9 @@ func addOperationListDevEndpointsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListDevEndpointsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ListJobs.go b/service/glue/api_op_ListJobs.go index 6bf0120783a..f7f27936764 100644 --- a/service/glue/api_op_ListJobs.go +++ b/service/glue/api_op_ListJobs.go @@ -65,6 +65,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ListMLTransforms.go b/service/glue/api_op_ListMLTransforms.go index 767d0f1674b..918df95fecd 100644 --- a/service/glue/api_op_ListMLTransforms.go +++ b/service/glue/api_op_ListMLTransforms.go @@ -74,6 +74,9 @@ func addOperationListMLTransformsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListMLTransformsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ListTriggers.go b/service/glue/api_op_ListTriggers.go index 02ddce845f0..d06a3664867 100644 --- a/service/glue/api_op_ListTriggers.go +++ b/service/glue/api_op_ListTriggers.go @@ -70,6 +70,9 @@ func addOperationListTriggersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListTriggersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ListWorkflows.go b/service/glue/api_op_ListWorkflows.go index 50f1ed0fb2e..752dab033b2 100644 --- a/service/glue/api_op_ListWorkflows.go +++ b/service/glue/api_op_ListWorkflows.go @@ -56,6 +56,9 @@ func addOperationListWorkflowsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListWorkflowsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_PutDataCatalogEncryptionSettings.go b/service/glue/api_op_PutDataCatalogEncryptionSettings.go index e5ba04d1fe9..3e2aa0b5093 100644 --- a/service/glue/api_op_PutDataCatalogEncryptionSettings.go +++ b/service/glue/api_op_PutDataCatalogEncryptionSettings.go @@ -55,6 +55,9 @@ func addOperationPutDataCatalogEncryptionSettingsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationPutDataCatalogEncryptionSettingsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_PutResourcePolicy.go b/service/glue/api_op_PutResourcePolicy.go index 766a6008fcc..a8327a655fc 100644 --- a/service/glue/api_op_PutResourcePolicy.go +++ b/service/glue/api_op_PutResourcePolicy.go @@ -77,6 +77,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_PutWorkflowRunProperties.go b/service/glue/api_op_PutWorkflowRunProperties.go index a5da461b4d1..cb52424d65d 100644 --- a/service/glue/api_op_PutWorkflowRunProperties.go +++ b/service/glue/api_op_PutWorkflowRunProperties.go @@ -60,6 +60,9 @@ func addOperationPutWorkflowRunPropertiesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutWorkflowRunPropertiesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ResetJobBookmark.go b/service/glue/api_op_ResetJobBookmark.go index f764e1f9e87..0444ce046ae 100644 --- a/service/glue/api_op_ResetJobBookmark.go +++ b/service/glue/api_op_ResetJobBookmark.go @@ -56,6 +56,9 @@ func addOperationResetJobBookmarkMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationResetJobBookmarkMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_ResumeWorkflowRun.go b/service/glue/api_op_ResumeWorkflowRun.go index 30dca2f558c..15bbc813e9e 100644 --- a/service/glue/api_op_ResumeWorkflowRun.go +++ b/service/glue/api_op_ResumeWorkflowRun.go @@ -69,6 +69,9 @@ func addOperationResumeWorkflowRunMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationResumeWorkflowRunMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_SearchTables.go b/service/glue/api_op_SearchTables.go index b073d1385f7..eb295f91368 100644 --- a/service/glue/api_op_SearchTables.go +++ b/service/glue/api_op_SearchTables.go @@ -98,6 +98,9 @@ func addOperationSearchTablesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationSearchTablesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartCrawler.go b/service/glue/api_op_StartCrawler.go index 34b22dbab0a..fd385974729 100644 --- a/service/glue/api_op_StartCrawler.go +++ b/service/glue/api_op_StartCrawler.go @@ -50,6 +50,9 @@ func addOperationStartCrawlerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationStartCrawlerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartCrawlerSchedule.go b/service/glue/api_op_StartCrawlerSchedule.go index 4a5b4084391..fb73883a166 100644 --- a/service/glue/api_op_StartCrawlerSchedule.go +++ b/service/glue/api_op_StartCrawlerSchedule.go @@ -49,6 +49,9 @@ func addOperationStartCrawlerScheduleMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationStartCrawlerScheduleMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartExportLabelsTaskRun.go b/service/glue/api_op_StartExportLabelsTaskRun.go index 7fb0f50a956..7a49f367757 100644 --- a/service/glue/api_op_StartExportLabelsTaskRun.go +++ b/service/glue/api_op_StartExportLabelsTaskRun.go @@ -65,6 +65,9 @@ func addOperationStartExportLabelsTaskRunMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationStartExportLabelsTaskRunMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartImportLabelsTaskRun.go b/service/glue/api_op_StartImportLabelsTaskRun.go index c788561c55f..43f584aaf5e 100644 --- a/service/glue/api_op_StartImportLabelsTaskRun.go +++ b/service/glue/api_op_StartImportLabelsTaskRun.go @@ -82,6 +82,9 @@ func addOperationStartImportLabelsTaskRunMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationStartImportLabelsTaskRunMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartJobRun.go b/service/glue/api_op_StartJobRun.go index 2e55fa50ec0..70f179fe897 100644 --- a/service/glue/api_op_StartJobRun.go +++ b/service/glue/api_op_StartJobRun.go @@ -125,6 +125,9 @@ func addOperationStartJobRunMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationStartJobRunMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartMLEvaluationTaskRun.go b/service/glue/api_op_StartMLEvaluationTaskRun.go index ebfd16f8240..c75761272b6 100644 --- a/service/glue/api_op_StartMLEvaluationTaskRun.go +++ b/service/glue/api_op_StartMLEvaluationTaskRun.go @@ -56,6 +56,9 @@ func addOperationStartMLEvaluationTaskRunMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartMLEvaluationTaskRunMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go b/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go index cfc7ddcdda5..f4d4a55eb22 100644 --- a/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go +++ b/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go @@ -67,6 +67,9 @@ func addOperationStartMLLabelingSetGenerationTaskRunMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationStartMLLabelingSetGenerationTaskRunMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartTrigger.go b/service/glue/api_op_StartTrigger.go index 794006a3644..72157a4a91d 100644 --- a/service/glue/api_op_StartTrigger.go +++ b/service/glue/api_op_StartTrigger.go @@ -54,6 +54,9 @@ func addOperationStartTriggerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStartTriggerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StartWorkflowRun.go b/service/glue/api_op_StartWorkflowRun.go index 00e29f4ed97..f349746a3ab 100644 --- a/service/glue/api_op_StartWorkflowRun.go +++ b/service/glue/api_op_StartWorkflowRun.go @@ -52,6 +52,9 @@ func addOperationStartWorkflowRunMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStartWorkflowRunMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StopCrawler.go b/service/glue/api_op_StopCrawler.go index 64d5c3f0112..37da220a7c8 100644 --- a/service/glue/api_op_StopCrawler.go +++ b/service/glue/api_op_StopCrawler.go @@ -48,6 +48,9 @@ func addOperationStopCrawlerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopCrawlerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StopCrawlerSchedule.go b/service/glue/api_op_StopCrawlerSchedule.go index 742ab4a78e0..52098e82ceb 100644 --- a/service/glue/api_op_StopCrawlerSchedule.go +++ b/service/glue/api_op_StopCrawlerSchedule.go @@ -49,6 +49,9 @@ func addOperationStopCrawlerScheduleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationStopCrawlerScheduleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StopTrigger.go b/service/glue/api_op_StopTrigger.go index 4ad72bd5a6b..f43cf59ef10 100644 --- a/service/glue/api_op_StopTrigger.go +++ b/service/glue/api_op_StopTrigger.go @@ -52,6 +52,9 @@ func addOperationStopTriggerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStopTriggerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_StopWorkflowRun.go b/service/glue/api_op_StopWorkflowRun.go index e128bedb744..085beaec9dc 100644 --- a/service/glue/api_op_StopWorkflowRun.go +++ b/service/glue/api_op_StopWorkflowRun.go @@ -53,6 +53,9 @@ func addOperationStopWorkflowRunMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopWorkflowRunMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_TagResource.go b/service/glue/api_op_TagResource.go index 38fd8078cf1..3b7a712582d 100644 --- a/service/glue/api_op_TagResource.go +++ b/service/glue/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UntagResource.go b/service/glue/api_op_UntagResource.go index 2df9eb2da65..b89b3a341fb 100644 --- a/service/glue/api_op_UntagResource.go +++ b/service/glue/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateClassifier.go b/service/glue/api_op_UpdateClassifier.go index e67007f6a4a..2fa9279bf57 100644 --- a/service/glue/api_op_UpdateClassifier.go +++ b/service/glue/api_op_UpdateClassifier.go @@ -57,6 +57,9 @@ func addOperationUpdateClassifierMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateClassifierMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateColumnStatisticsForPartition.go b/service/glue/api_op_UpdateColumnStatisticsForPartition.go index c425f514fd6..56fd9ce3079 100644 --- a/service/glue/api_op_UpdateColumnStatisticsForPartition.go +++ b/service/glue/api_op_UpdateColumnStatisticsForPartition.go @@ -73,6 +73,9 @@ func addOperationUpdateColumnStatisticsForPartitionMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateColumnStatisticsForPartitionMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateColumnStatisticsForTable.go b/service/glue/api_op_UpdateColumnStatisticsForTable.go index 66b555a4979..4a23152c688 100644 --- a/service/glue/api_op_UpdateColumnStatisticsForTable.go +++ b/service/glue/api_op_UpdateColumnStatisticsForTable.go @@ -68,6 +68,9 @@ func addOperationUpdateColumnStatisticsForTableMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateColumnStatisticsForTableMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateConnection.go b/service/glue/api_op_UpdateConnection.go index e5cb75a6172..8beb951b74e 100644 --- a/service/glue/api_op_UpdateConnection.go +++ b/service/glue/api_op_UpdateConnection.go @@ -58,6 +58,9 @@ func addOperationUpdateConnectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateConnectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateCrawler.go b/service/glue/api_op_UpdateCrawler.go index 95e98948613..7e6640e0d32 100644 --- a/service/glue/api_op_UpdateCrawler.go +++ b/service/glue/api_op_UpdateCrawler.go @@ -94,6 +94,9 @@ func addOperationUpdateCrawlerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationUpdateCrawlerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateCrawlerSchedule.go b/service/glue/api_op_UpdateCrawlerSchedule.go index f8cf5252d4c..ded5daf6a5c 100644 --- a/service/glue/api_op_UpdateCrawlerSchedule.go +++ b/service/glue/api_op_UpdateCrawlerSchedule.go @@ -55,6 +55,9 @@ func addOperationUpdateCrawlerScheduleMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateCrawlerScheduleMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateDatabase.go b/service/glue/api_op_UpdateDatabase.go index 73cfb160e2f..97494281361 100644 --- a/service/glue/api_op_UpdateDatabase.go +++ b/service/glue/api_op_UpdateDatabase.go @@ -60,6 +60,9 @@ func addOperationUpdateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateDevEndpoint.go b/service/glue/api_op_UpdateDevEndpoint.go index da28419c499..7012197ad6f 100644 --- a/service/glue/api_op_UpdateDevEndpoint.go +++ b/service/glue/api_op_UpdateDevEndpoint.go @@ -85,6 +85,9 @@ func addOperationUpdateDevEndpointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationUpdateDevEndpointMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateJob.go b/service/glue/api_op_UpdateJob.go index 4446f14ae43..a5992daeb68 100644 --- a/service/glue/api_op_UpdateJob.go +++ b/service/glue/api_op_UpdateJob.go @@ -58,6 +58,9 @@ func addOperationUpdateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateMLTransform.go b/service/glue/api_op_UpdateMLTransform.go index e13d6c7329f..26bb2ca4520 100644 --- a/service/glue/api_op_UpdateMLTransform.go +++ b/service/glue/api_op_UpdateMLTransform.go @@ -115,6 +115,9 @@ func addOperationUpdateMLTransformMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateMLTransformMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdatePartition.go b/service/glue/api_op_UpdatePartition.go index a0ca2db26d7..5b9eb656f5b 100644 --- a/service/glue/api_op_UpdatePartition.go +++ b/service/glue/api_op_UpdatePartition.go @@ -70,6 +70,9 @@ func addOperationUpdatePartitionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdatePartitionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateTable.go b/service/glue/api_op_UpdateTable.go index 00a3c4e1b34..f3c543e4c21 100644 --- a/service/glue/api_op_UpdateTable.go +++ b/service/glue/api_op_UpdateTable.go @@ -64,6 +64,9 @@ func addOperationUpdateTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateTableMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateTrigger.go b/service/glue/api_op_UpdateTrigger.go index 367f1693667..b2b81486b14 100644 --- a/service/glue/api_op_UpdateTrigger.go +++ b/service/glue/api_op_UpdateTrigger.go @@ -58,6 +58,9 @@ func addOperationUpdateTriggerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateTriggerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateUserDefinedFunction.go b/service/glue/api_op_UpdateUserDefinedFunction.go index 42b50e9ffc2..f27f2862b53 100644 --- a/service/glue/api_op_UpdateUserDefinedFunction.go +++ b/service/glue/api_op_UpdateUserDefinedFunction.go @@ -63,6 +63,9 @@ func addOperationUpdateUserDefinedFunctionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateUserDefinedFunctionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/api_op_UpdateWorkflow.go b/service/glue/api_op_UpdateWorkflow.go index 4761d9487cb..4e04ff631e6 100644 --- a/service/glue/api_op_UpdateWorkflow.go +++ b/service/glue/api_op_UpdateWorkflow.go @@ -64,6 +64,9 @@ func addOperationUpdateWorkflowMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateWorkflowMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/glue/go.mod b/service/glue/go.mod index 5ed8c2dbdd4..d407692de26 100644 --- a/service/glue/go.mod +++ b/service/glue/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/glue go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/glue/go.sum b/service/glue/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/glue/go.sum +++ b/service/glue/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/greengrass/api_client.go b/service/greengrass/api_client.go index 91f4f32e4da..d9da999a724 100644 --- a/service/greengrass/api_client.go +++ b/service/greengrass/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/greengrass/api_op_AssociateRoleToGroup.go b/service/greengrass/api_op_AssociateRoleToGroup.go index ee7c27251f0..9c7da4d8566 100644 --- a/service/greengrass/api_op_AssociateRoleToGroup.go +++ b/service/greengrass/api_op_AssociateRoleToGroup.go @@ -61,6 +61,9 @@ func addOperationAssociateRoleToGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAssociateRoleToGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_AssociateServiceRoleToAccount.go b/service/greengrass/api_op_AssociateServiceRoleToAccount.go index c6da851ccfb..8efbe004122 100644 --- a/service/greengrass/api_op_AssociateServiceRoleToAccount.go +++ b/service/greengrass/api_op_AssociateServiceRoleToAccount.go @@ -55,6 +55,9 @@ func addOperationAssociateServiceRoleToAccountMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAssociateServiceRoleToAccountMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateConnectorDefinition.go b/service/greengrass/api_op_CreateConnectorDefinition.go index 4d19cd6231c..29e09100e99 100644 --- a/service/greengrass/api_op_CreateConnectorDefinition.go +++ b/service/greengrass/api_op_CreateConnectorDefinition.go @@ -80,6 +80,9 @@ func addOperationCreateConnectorDefinitionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateConnectorDefinitionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateConnectorDefinitionVersion.go b/service/greengrass/api_op_CreateConnectorDefinitionVersion.go index e063415b957..fcc66ef2f39 100644 --- a/service/greengrass/api_op_CreateConnectorDefinitionVersion.go +++ b/service/greengrass/api_op_CreateConnectorDefinitionVersion.go @@ -69,6 +69,9 @@ func addOperationCreateConnectorDefinitionVersionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateConnectorDefinitionVersionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateCoreDefinition.go b/service/greengrass/api_op_CreateCoreDefinition.go index c154ea4e541..60923158017 100644 --- a/service/greengrass/api_op_CreateCoreDefinition.go +++ b/service/greengrass/api_op_CreateCoreDefinition.go @@ -81,6 +81,9 @@ func addOperationCreateCoreDefinitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateCoreDefinitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateCoreDefinitionVersion.go b/service/greengrass/api_op_CreateCoreDefinitionVersion.go index c375700fa1f..fd5a6b5e827 100644 --- a/service/greengrass/api_op_CreateCoreDefinitionVersion.go +++ b/service/greengrass/api_op_CreateCoreDefinitionVersion.go @@ -69,6 +69,9 @@ func addOperationCreateCoreDefinitionVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateCoreDefinitionVersionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateDeployment.go b/service/greengrass/api_op_CreateDeployment.go index 883190e5c63..b08b1b58622 100644 --- a/service/greengrass/api_op_CreateDeployment.go +++ b/service/greengrass/api_op_CreateDeployment.go @@ -72,6 +72,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateDeviceDefinition.go b/service/greengrass/api_op_CreateDeviceDefinition.go index 65d7167f8ad..8da8d8a7ef2 100644 --- a/service/greengrass/api_op_CreateDeviceDefinition.go +++ b/service/greengrass/api_op_CreateDeviceDefinition.go @@ -79,6 +79,9 @@ func addOperationCreateDeviceDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateDeviceDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateDeviceDefinitionVersion.go b/service/greengrass/api_op_CreateDeviceDefinitionVersion.go index 81a087905a4..167cb924ef5 100644 --- a/service/greengrass/api_op_CreateDeviceDefinitionVersion.go +++ b/service/greengrass/api_op_CreateDeviceDefinitionVersion.go @@ -68,6 +68,9 @@ func addOperationCreateDeviceDefinitionVersionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateDeviceDefinitionVersionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateFunctionDefinition.go b/service/greengrass/api_op_CreateFunctionDefinition.go index 45723118ccd..1bf0afa6d27 100644 --- a/service/greengrass/api_op_CreateFunctionDefinition.go +++ b/service/greengrass/api_op_CreateFunctionDefinition.go @@ -81,6 +81,9 @@ func addOperationCreateFunctionDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateFunctionDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateFunctionDefinitionVersion.go b/service/greengrass/api_op_CreateFunctionDefinitionVersion.go index 248f1305e23..772178537dc 100644 --- a/service/greengrass/api_op_CreateFunctionDefinitionVersion.go +++ b/service/greengrass/api_op_CreateFunctionDefinitionVersion.go @@ -73,6 +73,9 @@ func addOperationCreateFunctionDefinitionVersionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateFunctionDefinitionVersionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateGroup.go b/service/greengrass/api_op_CreateGroup.go index 450d4481c60..265d56758eb 100644 --- a/service/greengrass/api_op_CreateGroup.go +++ b/service/greengrass/api_op_CreateGroup.go @@ -81,6 +81,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateGroupCertificateAuthority.go b/service/greengrass/api_op_CreateGroupCertificateAuthority.go index dd76d0034ba..fdb556c4950 100644 --- a/service/greengrass/api_op_CreateGroupCertificateAuthority.go +++ b/service/greengrass/api_op_CreateGroupCertificateAuthority.go @@ -56,6 +56,9 @@ func addOperationCreateGroupCertificateAuthorityMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateGroupCertificateAuthorityMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateGroupVersion.go b/service/greengrass/api_op_CreateGroupVersion.go index 4b6040811ba..be0d4780160 100644 --- a/service/greengrass/api_op_CreateGroupVersion.go +++ b/service/greengrass/api_op_CreateGroupVersion.go @@ -85,6 +85,9 @@ func addOperationCreateGroupVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateGroupVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateLoggerDefinition.go b/service/greengrass/api_op_CreateLoggerDefinition.go index e33aa179491..2ee240407bb 100644 --- a/service/greengrass/api_op_CreateLoggerDefinition.go +++ b/service/greengrass/api_op_CreateLoggerDefinition.go @@ -79,6 +79,9 @@ func addOperationCreateLoggerDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateLoggerDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateLoggerDefinitionVersion.go b/service/greengrass/api_op_CreateLoggerDefinitionVersion.go index 1767a455942..cebe10b9172 100644 --- a/service/greengrass/api_op_CreateLoggerDefinitionVersion.go +++ b/service/greengrass/api_op_CreateLoggerDefinitionVersion.go @@ -68,6 +68,9 @@ func addOperationCreateLoggerDefinitionVersionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateLoggerDefinitionVersionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateResourceDefinition.go b/service/greengrass/api_op_CreateResourceDefinition.go index aa039d2664a..944c67db755 100644 --- a/service/greengrass/api_op_CreateResourceDefinition.go +++ b/service/greengrass/api_op_CreateResourceDefinition.go @@ -80,6 +80,9 @@ func addOperationCreateResourceDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateResourceDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateResourceDefinitionVersion.go b/service/greengrass/api_op_CreateResourceDefinitionVersion.go index 506d1e8b514..413476147c4 100644 --- a/service/greengrass/api_op_CreateResourceDefinitionVersion.go +++ b/service/greengrass/api_op_CreateResourceDefinitionVersion.go @@ -68,6 +68,9 @@ func addOperationCreateResourceDefinitionVersionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateResourceDefinitionVersionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateSoftwareUpdateJob.go b/service/greengrass/api_op_CreateSoftwareUpdateJob.go index 737d458efee..e9ffa953e64 100644 --- a/service/greengrass/api_op_CreateSoftwareUpdateJob.go +++ b/service/greengrass/api_op_CreateSoftwareUpdateJob.go @@ -91,6 +91,9 @@ func addOperationCreateSoftwareUpdateJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateSoftwareUpdateJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateSubscriptionDefinition.go b/service/greengrass/api_op_CreateSubscriptionDefinition.go index 140d103d1d2..2c8a03038db 100644 --- a/service/greengrass/api_op_CreateSubscriptionDefinition.go +++ b/service/greengrass/api_op_CreateSubscriptionDefinition.go @@ -80,6 +80,9 @@ func addOperationCreateSubscriptionDefinitionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateSubscriptionDefinitionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go b/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go index 818e7c20f02..78ea0b9866a 100644 --- a/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go +++ b/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go @@ -68,6 +68,9 @@ func addOperationCreateSubscriptionDefinitionVersionMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateSubscriptionDefinitionVersionMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteConnectorDefinition.go b/service/greengrass/api_op_DeleteConnectorDefinition.go index 8f9943eeeb8..1cff61ea88f 100644 --- a/service/greengrass/api_op_DeleteConnectorDefinition.go +++ b/service/greengrass/api_op_DeleteConnectorDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteConnectorDefinitionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteConnectorDefinitionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteCoreDefinition.go b/service/greengrass/api_op_DeleteCoreDefinition.go index 069cf601c2c..01a674d21e1 100644 --- a/service/greengrass/api_op_DeleteCoreDefinition.go +++ b/service/greengrass/api_op_DeleteCoreDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteCoreDefinitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteCoreDefinitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteDeviceDefinition.go b/service/greengrass/api_op_DeleteDeviceDefinition.go index 15c67583642..73a256bc71f 100644 --- a/service/greengrass/api_op_DeleteDeviceDefinition.go +++ b/service/greengrass/api_op_DeleteDeviceDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteDeviceDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDeviceDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteFunctionDefinition.go b/service/greengrass/api_op_DeleteFunctionDefinition.go index 8e5e06c7ca5..a19a9233028 100644 --- a/service/greengrass/api_op_DeleteFunctionDefinition.go +++ b/service/greengrass/api_op_DeleteFunctionDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteFunctionDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteFunctionDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteGroup.go b/service/greengrass/api_op_DeleteGroup.go index fd028d5f2e0..949c5be4c5a 100644 --- a/service/greengrass/api_op_DeleteGroup.go +++ b/service/greengrass/api_op_DeleteGroup.go @@ -48,6 +48,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteLoggerDefinition.go b/service/greengrass/api_op_DeleteLoggerDefinition.go index 039bbe156fc..8c6299c3499 100644 --- a/service/greengrass/api_op_DeleteLoggerDefinition.go +++ b/service/greengrass/api_op_DeleteLoggerDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteLoggerDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteLoggerDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteResourceDefinition.go b/service/greengrass/api_op_DeleteResourceDefinition.go index dccae102061..4d8717c6762 100644 --- a/service/greengrass/api_op_DeleteResourceDefinition.go +++ b/service/greengrass/api_op_DeleteResourceDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteResourceDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteResourceDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DeleteSubscriptionDefinition.go b/service/greengrass/api_op_DeleteSubscriptionDefinition.go index ea8466e3a31..4ca563c490c 100644 --- a/service/greengrass/api_op_DeleteSubscriptionDefinition.go +++ b/service/greengrass/api_op_DeleteSubscriptionDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteSubscriptionDefinitionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteSubscriptionDefinitionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DisassociateRoleFromGroup.go b/service/greengrass/api_op_DisassociateRoleFromGroup.go index 8cfa810a3b8..68153403145 100644 --- a/service/greengrass/api_op_DisassociateRoleFromGroup.go +++ b/service/greengrass/api_op_DisassociateRoleFromGroup.go @@ -53,6 +53,9 @@ func addOperationDisassociateRoleFromGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDisassociateRoleFromGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go b/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go index 2658e211cef..073c15b48b3 100644 --- a/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go +++ b/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go @@ -48,6 +48,9 @@ func addOperationDisassociateServiceRoleFromAccountMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDisassociateServiceRoleFromAccountMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetAssociatedRole.go b/service/greengrass/api_op_GetAssociatedRole.go index 8b5d7db9b34..e571aaae562 100644 --- a/service/greengrass/api_op_GetAssociatedRole.go +++ b/service/greengrass/api_op_GetAssociatedRole.go @@ -55,6 +55,9 @@ func addOperationGetAssociatedRoleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetAssociatedRoleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetBulkDeploymentStatus.go b/service/greengrass/api_op_GetBulkDeploymentStatus.go index 5bdcad83cbe..6d8e867b7f3 100644 --- a/service/greengrass/api_op_GetBulkDeploymentStatus.go +++ b/service/greengrass/api_op_GetBulkDeploymentStatus.go @@ -68,6 +68,9 @@ func addOperationGetBulkDeploymentStatusMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetBulkDeploymentStatusMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetConnectivityInfo.go b/service/greengrass/api_op_GetConnectivityInfo.go index f163b8f6e25..ff48866c638 100644 --- a/service/greengrass/api_op_GetConnectivityInfo.go +++ b/service/greengrass/api_op_GetConnectivityInfo.go @@ -56,6 +56,9 @@ func addOperationGetConnectivityInfoMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetConnectivityInfoMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetConnectorDefinition.go b/service/greengrass/api_op_GetConnectorDefinition.go index 3f27bfaa74f..712912a58c3 100644 --- a/service/greengrass/api_op_GetConnectorDefinition.go +++ b/service/greengrass/api_op_GetConnectorDefinition.go @@ -73,6 +73,9 @@ func addOperationGetConnectorDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetConnectorDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetConnectorDefinitionVersion.go b/service/greengrass/api_op_GetConnectorDefinitionVersion.go index e950a2af90a..949c6deec47 100644 --- a/service/greengrass/api_op_GetConnectorDefinitionVersion.go +++ b/service/greengrass/api_op_GetConnectorDefinitionVersion.go @@ -87,6 +87,9 @@ func addOperationGetConnectorDefinitionVersionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationGetConnectorDefinitionVersionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetCoreDefinition.go b/service/greengrass/api_op_GetCoreDefinition.go index 4e6101eab7e..2afaf86bc2f 100644 --- a/service/greengrass/api_op_GetCoreDefinition.go +++ b/service/greengrass/api_op_GetCoreDefinition.go @@ -73,6 +73,9 @@ func addOperationGetCoreDefinitionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetCoreDefinitionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetCoreDefinitionVersion.go b/service/greengrass/api_op_GetCoreDefinitionVersion.go index 49205f7af84..2b9eaa7b4b0 100644 --- a/service/greengrass/api_op_GetCoreDefinitionVersion.go +++ b/service/greengrass/api_op_GetCoreDefinitionVersion.go @@ -80,6 +80,9 @@ func addOperationGetCoreDefinitionVersionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetCoreDefinitionVersionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetDeploymentStatus.go b/service/greengrass/api_op_GetDeploymentStatus.go index 88938121102..75bf98237e9 100644 --- a/service/greengrass/api_op_GetDeploymentStatus.go +++ b/service/greengrass/api_op_GetDeploymentStatus.go @@ -72,6 +72,9 @@ func addOperationGetDeploymentStatusMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetDeploymentStatusMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetDeviceDefinition.go b/service/greengrass/api_op_GetDeviceDefinition.go index 850b5a306d3..dc0c3223509 100644 --- a/service/greengrass/api_op_GetDeviceDefinition.go +++ b/service/greengrass/api_op_GetDeviceDefinition.go @@ -73,6 +73,9 @@ func addOperationGetDeviceDefinitionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetDeviceDefinitionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetDeviceDefinitionVersion.go b/service/greengrass/api_op_GetDeviceDefinitionVersion.go index 8e3010c458f..fe2172e9d2d 100644 --- a/service/greengrass/api_op_GetDeviceDefinitionVersion.go +++ b/service/greengrass/api_op_GetDeviceDefinitionVersion.go @@ -84,6 +84,9 @@ func addOperationGetDeviceDefinitionVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetDeviceDefinitionVersionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetFunctionDefinition.go b/service/greengrass/api_op_GetFunctionDefinition.go index f6730f07bd2..5ca4257a69e 100644 --- a/service/greengrass/api_op_GetFunctionDefinition.go +++ b/service/greengrass/api_op_GetFunctionDefinition.go @@ -74,6 +74,9 @@ func addOperationGetFunctionDefinitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetFunctionDefinitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetFunctionDefinitionVersion.go b/service/greengrass/api_op_GetFunctionDefinitionVersion.go index 03fc5b4dda7..4ffa9f2bb8d 100644 --- a/service/greengrass/api_op_GetFunctionDefinitionVersion.go +++ b/service/greengrass/api_op_GetFunctionDefinitionVersion.go @@ -85,6 +85,9 @@ func addOperationGetFunctionDefinitionVersionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationGetFunctionDefinitionVersionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetGroup.go b/service/greengrass/api_op_GetGroup.go index f090d0f971e..60f278eeea2 100644 --- a/service/greengrass/api_op_GetGroup.go +++ b/service/greengrass/api_op_GetGroup.go @@ -73,6 +73,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetGroupCertificateAuthority.go b/service/greengrass/api_op_GetGroupCertificateAuthority.go index e48fb06c2d7..2d7ae5fa49a 100644 --- a/service/greengrass/api_op_GetGroupCertificateAuthority.go +++ b/service/greengrass/api_op_GetGroupCertificateAuthority.go @@ -63,6 +63,9 @@ func addOperationGetGroupCertificateAuthorityMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetGroupCertificateAuthorityMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetGroupCertificateConfiguration.go b/service/greengrass/api_op_GetGroupCertificateConfiguration.go index 14275c70b97..39118cd57a6 100644 --- a/service/greengrass/api_op_GetGroupCertificateConfiguration.go +++ b/service/greengrass/api_op_GetGroupCertificateConfiguration.go @@ -59,6 +59,9 @@ func addOperationGetGroupCertificateConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetGroupCertificateConfigurationMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetGroupVersion.go b/service/greengrass/api_op_GetGroupVersion.go index 5fd436f084f..6667ca8543d 100644 --- a/service/greengrass/api_op_GetGroupVersion.go +++ b/service/greengrass/api_op_GetGroupVersion.go @@ -74,6 +74,9 @@ func addOperationGetGroupVersionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetGroupVersionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetLoggerDefinition.go b/service/greengrass/api_op_GetLoggerDefinition.go index 52d183213d1..293f17b6775 100644 --- a/service/greengrass/api_op_GetLoggerDefinition.go +++ b/service/greengrass/api_op_GetLoggerDefinition.go @@ -73,6 +73,9 @@ func addOperationGetLoggerDefinitionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetLoggerDefinitionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetLoggerDefinitionVersion.go b/service/greengrass/api_op_GetLoggerDefinitionVersion.go index f9991d5ca50..d0ff2c3c4b5 100644 --- a/service/greengrass/api_op_GetLoggerDefinitionVersion.go +++ b/service/greengrass/api_op_GetLoggerDefinitionVersion.go @@ -80,6 +80,9 @@ func addOperationGetLoggerDefinitionVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetLoggerDefinitionVersionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetResourceDefinition.go b/service/greengrass/api_op_GetResourceDefinition.go index b11c3076748..e3ea968b022 100644 --- a/service/greengrass/api_op_GetResourceDefinition.go +++ b/service/greengrass/api_op_GetResourceDefinition.go @@ -74,6 +74,9 @@ func addOperationGetResourceDefinitionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetResourceDefinitionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetResourceDefinitionVersion.go b/service/greengrass/api_op_GetResourceDefinitionVersion.go index 58169e4b94b..b95593321e7 100644 --- a/service/greengrass/api_op_GetResourceDefinitionVersion.go +++ b/service/greengrass/api_op_GetResourceDefinitionVersion.go @@ -77,6 +77,9 @@ func addOperationGetResourceDefinitionVersionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetResourceDefinitionVersionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetServiceRoleForAccount.go b/service/greengrass/api_op_GetServiceRoleForAccount.go index dfd00360e53..7162659417e 100644 --- a/service/greengrass/api_op_GetServiceRoleForAccount.go +++ b/service/greengrass/api_op_GetServiceRoleForAccount.go @@ -50,6 +50,9 @@ func addOperationGetServiceRoleForAccountMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationGetServiceRoleForAccountMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetSubscriptionDefinition.go b/service/greengrass/api_op_GetSubscriptionDefinition.go index 948996a03b3..cdb4c19921c 100644 --- a/service/greengrass/api_op_GetSubscriptionDefinition.go +++ b/service/greengrass/api_op_GetSubscriptionDefinition.go @@ -73,6 +73,9 @@ func addOperationGetSubscriptionDefinitionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetSubscriptionDefinitionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go b/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go index 5d1abd17a89..fff575d5bc8 100644 --- a/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go +++ b/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go @@ -84,6 +84,9 @@ func addOperationGetSubscriptionDefinitionVersionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetSubscriptionDefinitionVersionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_GetThingRuntimeConfiguration.go b/service/greengrass/api_op_GetThingRuntimeConfiguration.go index f9855c68319..5cf4c632794 100644 --- a/service/greengrass/api_op_GetThingRuntimeConfiguration.go +++ b/service/greengrass/api_op_GetThingRuntimeConfiguration.go @@ -53,6 +53,9 @@ func addOperationGetThingRuntimeConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetThingRuntimeConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go b/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go index ed546ef4a5d..540e64eca66 100644 --- a/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go +++ b/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go @@ -65,6 +65,9 @@ func addOperationListBulkDeploymentDetailedReportsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListBulkDeploymentDetailedReportsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListBulkDeployments.go b/service/greengrass/api_op_ListBulkDeployments.go index 6768217bded..ccbc344844f 100644 --- a/service/greengrass/api_op_ListBulkDeployments.go +++ b/service/greengrass/api_op_ListBulkDeployments.go @@ -59,6 +59,9 @@ func addOperationListBulkDeploymentsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListBulkDeploymentsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListConnectorDefinitionVersions.go b/service/greengrass/api_op_ListConnectorDefinitionVersions.go index 04158050bb2..a9827057cf3 100644 --- a/service/greengrass/api_op_ListConnectorDefinitionVersions.go +++ b/service/greengrass/api_op_ListConnectorDefinitionVersions.go @@ -67,6 +67,9 @@ func addOperationListConnectorDefinitionVersionsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListConnectorDefinitionVersionsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListConnectorDefinitions.go b/service/greengrass/api_op_ListConnectorDefinitions.go index 8ee82b19df4..84b1756189e 100644 --- a/service/greengrass/api_op_ListConnectorDefinitions.go +++ b/service/greengrass/api_op_ListConnectorDefinitions.go @@ -59,6 +59,9 @@ func addOperationListConnectorDefinitionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListConnectorDefinitionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListCoreDefinitionVersions.go b/service/greengrass/api_op_ListCoreDefinitionVersions.go index 10f966e284f..e02da21c28e 100644 --- a/service/greengrass/api_op_ListCoreDefinitionVersions.go +++ b/service/greengrass/api_op_ListCoreDefinitionVersions.go @@ -64,6 +64,9 @@ func addOperationListCoreDefinitionVersionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListCoreDefinitionVersionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListCoreDefinitions.go b/service/greengrass/api_op_ListCoreDefinitions.go index a425d873544..5d86e672978 100644 --- a/service/greengrass/api_op_ListCoreDefinitions.go +++ b/service/greengrass/api_op_ListCoreDefinitions.go @@ -59,6 +59,9 @@ func addOperationListCoreDefinitionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListCoreDefinitionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListDeployments.go b/service/greengrass/api_op_ListDeployments.go index 9e63cb1b8d2..9b929ff19dc 100644 --- a/service/greengrass/api_op_ListDeployments.go +++ b/service/greengrass/api_op_ListDeployments.go @@ -64,6 +64,9 @@ func addOperationListDeploymentsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDeploymentsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListDeviceDefinitionVersions.go b/service/greengrass/api_op_ListDeviceDefinitionVersions.go index 03728ef1ef4..32eae79e598 100644 --- a/service/greengrass/api_op_ListDeviceDefinitionVersions.go +++ b/service/greengrass/api_op_ListDeviceDefinitionVersions.go @@ -64,6 +64,9 @@ func addOperationListDeviceDefinitionVersionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDeviceDefinitionVersionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListDeviceDefinitions.go b/service/greengrass/api_op_ListDeviceDefinitions.go index 401a0306582..0e575f4bcdd 100644 --- a/service/greengrass/api_op_ListDeviceDefinitions.go +++ b/service/greengrass/api_op_ListDeviceDefinitions.go @@ -59,6 +59,9 @@ func addOperationListDeviceDefinitionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDeviceDefinitionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListFunctionDefinitionVersions.go b/service/greengrass/api_op_ListFunctionDefinitionVersions.go index 6edaebbe00e..d9e31aceabd 100644 --- a/service/greengrass/api_op_ListFunctionDefinitionVersions.go +++ b/service/greengrass/api_op_ListFunctionDefinitionVersions.go @@ -64,6 +64,9 @@ func addOperationListFunctionDefinitionVersionsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListFunctionDefinitionVersionsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListFunctionDefinitions.go b/service/greengrass/api_op_ListFunctionDefinitions.go index a22ecc0a52b..16c289bb4ac 100644 --- a/service/greengrass/api_op_ListFunctionDefinitions.go +++ b/service/greengrass/api_op_ListFunctionDefinitions.go @@ -59,6 +59,9 @@ func addOperationListFunctionDefinitionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListFunctionDefinitionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListGroupCertificateAuthorities.go b/service/greengrass/api_op_ListGroupCertificateAuthorities.go index 91e6d8773d7..2405389da35 100644 --- a/service/greengrass/api_op_ListGroupCertificateAuthorities.go +++ b/service/greengrass/api_op_ListGroupCertificateAuthorities.go @@ -53,6 +53,9 @@ func addOperationListGroupCertificateAuthoritiesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListGroupCertificateAuthoritiesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListGroupVersions.go b/service/greengrass/api_op_ListGroupVersions.go index 71143dbfc40..9e1de1a3508 100644 --- a/service/greengrass/api_op_ListGroupVersions.go +++ b/service/greengrass/api_op_ListGroupVersions.go @@ -64,6 +64,9 @@ func addOperationListGroupVersionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListGroupVersionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListGroups.go b/service/greengrass/api_op_ListGroups.go index bb432f140dd..ed2bafa70c5 100644 --- a/service/greengrass/api_op_ListGroups.go +++ b/service/greengrass/api_op_ListGroups.go @@ -59,6 +59,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListLoggerDefinitionVersions.go b/service/greengrass/api_op_ListLoggerDefinitionVersions.go index 489e2bbd58f..b46e821f5af 100644 --- a/service/greengrass/api_op_ListLoggerDefinitionVersions.go +++ b/service/greengrass/api_op_ListLoggerDefinitionVersions.go @@ -64,6 +64,9 @@ func addOperationListLoggerDefinitionVersionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListLoggerDefinitionVersionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListLoggerDefinitions.go b/service/greengrass/api_op_ListLoggerDefinitions.go index 852cb0e554c..324b4abe5aa 100644 --- a/service/greengrass/api_op_ListLoggerDefinitions.go +++ b/service/greengrass/api_op_ListLoggerDefinitions.go @@ -59,6 +59,9 @@ func addOperationListLoggerDefinitionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListLoggerDefinitionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListResourceDefinitionVersions.go b/service/greengrass/api_op_ListResourceDefinitionVersions.go index 87adb91ce85..a381d916f41 100644 --- a/service/greengrass/api_op_ListResourceDefinitionVersions.go +++ b/service/greengrass/api_op_ListResourceDefinitionVersions.go @@ -64,6 +64,9 @@ func addOperationListResourceDefinitionVersionsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListResourceDefinitionVersionsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListResourceDefinitions.go b/service/greengrass/api_op_ListResourceDefinitions.go index 1371e4f4c42..7ff17409170 100644 --- a/service/greengrass/api_op_ListResourceDefinitions.go +++ b/service/greengrass/api_op_ListResourceDefinitions.go @@ -59,6 +59,9 @@ func addOperationListResourceDefinitionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListResourceDefinitionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go b/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go index 8ccefac5830..e80eacc19a1 100644 --- a/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go +++ b/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go @@ -64,6 +64,9 @@ func addOperationListSubscriptionDefinitionVersionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListSubscriptionDefinitionVersionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListSubscriptionDefinitions.go b/service/greengrass/api_op_ListSubscriptionDefinitions.go index a318440095b..9c7e3a998f0 100644 --- a/service/greengrass/api_op_ListSubscriptionDefinitions.go +++ b/service/greengrass/api_op_ListSubscriptionDefinitions.go @@ -59,6 +59,9 @@ func addOperationListSubscriptionDefinitionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListSubscriptionDefinitionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ListTagsForResource.go b/service/greengrass/api_op_ListTagsForResource.go index 3378d0fb1d6..91db2d232ca 100644 --- a/service/greengrass/api_op_ListTagsForResource.go +++ b/service/greengrass/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_ResetDeployments.go b/service/greengrass/api_op_ResetDeployments.go index fafc1c3b41c..104bc96e047 100644 --- a/service/greengrass/api_op_ResetDeployments.go +++ b/service/greengrass/api_op_ResetDeployments.go @@ -62,6 +62,9 @@ func addOperationResetDeploymentsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationResetDeploymentsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_StartBulkDeployment.go b/service/greengrass/api_op_StartBulkDeployment.go index 1a9bada1ae1..47f79022ac3 100644 --- a/service/greengrass/api_op_StartBulkDeployment.go +++ b/service/greengrass/api_op_StartBulkDeployment.go @@ -79,6 +79,9 @@ func addOperationStartBulkDeploymentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationStartBulkDeploymentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_StopBulkDeployment.go b/service/greengrass/api_op_StopBulkDeployment.go index 0c3f076e999..3415b70cb03 100644 --- a/service/greengrass/api_op_StopBulkDeployment.go +++ b/service/greengrass/api_op_StopBulkDeployment.go @@ -51,6 +51,9 @@ func addOperationStopBulkDeploymentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationStopBulkDeploymentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_TagResource.go b/service/greengrass/api_op_TagResource.go index 1ac7ebb2f2d..d6cf0e9eab1 100644 --- a/service/greengrass/api_op_TagResource.go +++ b/service/greengrass/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UntagResource.go b/service/greengrass/api_op_UntagResource.go index 8af5e5bc581..fee9f33704a 100644 --- a/service/greengrass/api_op_UntagResource.go +++ b/service/greengrass/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateConnectivityInfo.go b/service/greengrass/api_op_UpdateConnectivityInfo.go index cf56a8754fe..634e2810bc5 100644 --- a/service/greengrass/api_op_UpdateConnectivityInfo.go +++ b/service/greengrass/api_op_UpdateConnectivityInfo.go @@ -62,6 +62,9 @@ func addOperationUpdateConnectivityInfoMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateConnectivityInfoMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateConnectorDefinition.go b/service/greengrass/api_op_UpdateConnectorDefinition.go index a0c738f23b0..eecfe758bb7 100644 --- a/service/greengrass/api_op_UpdateConnectorDefinition.go +++ b/service/greengrass/api_op_UpdateConnectorDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateConnectorDefinitionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateConnectorDefinitionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateCoreDefinition.go b/service/greengrass/api_op_UpdateCoreDefinition.go index 4f0ebdc6270..afb4311dc1d 100644 --- a/service/greengrass/api_op_UpdateCoreDefinition.go +++ b/service/greengrass/api_op_UpdateCoreDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateCoreDefinitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateCoreDefinitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateDeviceDefinition.go b/service/greengrass/api_op_UpdateDeviceDefinition.go index 57eab4e7bd6..5202eed8b54 100644 --- a/service/greengrass/api_op_UpdateDeviceDefinition.go +++ b/service/greengrass/api_op_UpdateDeviceDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateDeviceDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateDeviceDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateFunctionDefinition.go b/service/greengrass/api_op_UpdateFunctionDefinition.go index e75873db300..f2b10958416 100644 --- a/service/greengrass/api_op_UpdateFunctionDefinition.go +++ b/service/greengrass/api_op_UpdateFunctionDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateFunctionDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateFunctionDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateGroup.go b/service/greengrass/api_op_UpdateGroup.go index cd6c7382897..ed0c7f54f10 100644 --- a/service/greengrass/api_op_UpdateGroup.go +++ b/service/greengrass/api_op_UpdateGroup.go @@ -51,6 +51,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go b/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go index 56a054f5d4f..c0a83e3ae73 100644 --- a/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go +++ b/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go @@ -62,6 +62,9 @@ func addOperationUpdateGroupCertificateConfigurationMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateGroupCertificateConfigurationMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateLoggerDefinition.go b/service/greengrass/api_op_UpdateLoggerDefinition.go index 4c1a4251087..8958ee9e68d 100644 --- a/service/greengrass/api_op_UpdateLoggerDefinition.go +++ b/service/greengrass/api_op_UpdateLoggerDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateLoggerDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateLoggerDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateResourceDefinition.go b/service/greengrass/api_op_UpdateResourceDefinition.go index 05004f33cfe..fe1cb01dcd3 100644 --- a/service/greengrass/api_op_UpdateResourceDefinition.go +++ b/service/greengrass/api_op_UpdateResourceDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateResourceDefinitionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateResourceDefinitionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateSubscriptionDefinition.go b/service/greengrass/api_op_UpdateSubscriptionDefinition.go index abf6d79b3d3..e0c9321357a 100644 --- a/service/greengrass/api_op_UpdateSubscriptionDefinition.go +++ b/service/greengrass/api_op_UpdateSubscriptionDefinition.go @@ -51,6 +51,9 @@ func addOperationUpdateSubscriptionDefinitionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateSubscriptionDefinitionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/api_op_UpdateThingRuntimeConfiguration.go b/service/greengrass/api_op_UpdateThingRuntimeConfiguration.go index 4fd95e26aca..ad660159728 100644 --- a/service/greengrass/api_op_UpdateThingRuntimeConfiguration.go +++ b/service/greengrass/api_op_UpdateThingRuntimeConfiguration.go @@ -52,6 +52,9 @@ func addOperationUpdateThingRuntimeConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUpdateThingRuntimeConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/greengrass/go.mod b/service/greengrass/go.mod index 1c3c350f4a8..168db2acea6 100644 --- a/service/greengrass/go.mod +++ b/service/greengrass/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/greengrass go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/greengrass/go.sum b/service/greengrass/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/greengrass/go.sum +++ b/service/greengrass/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/groundstation/api_client.go b/service/groundstation/api_client.go index 29f2023fde1..1d4ec74c267 100644 --- a/service/groundstation/api_client.go +++ b/service/groundstation/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/groundstation/api_op_CancelContact.go b/service/groundstation/api_op_CancelContact.go index 1d803e05863..a9d6f0c2deb 100644 --- a/service/groundstation/api_op_CancelContact.go +++ b/service/groundstation/api_op_CancelContact.go @@ -54,6 +54,9 @@ func addOperationCancelContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,5 +96,8 @@ func addOperationCancelContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_CreateConfig.go b/service/groundstation/api_op_CreateConfig.go index 6388480dc19..5f6a6f103e4 100644 --- a/service/groundstation/api_op_CreateConfig.go +++ b/service/groundstation/api_op_CreateConfig.go @@ -70,6 +70,9 @@ func addOperationCreateConfigMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,5 +112,8 @@ func addOperationCreateConfigMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_CreateDataflowEndpointGroup.go b/service/groundstation/api_op_CreateDataflowEndpointGroup.go index 30bf62dcab0..aa81e5bf7ae 100644 --- a/service/groundstation/api_op_CreateDataflowEndpointGroup.go +++ b/service/groundstation/api_op_CreateDataflowEndpointGroup.go @@ -62,6 +62,9 @@ func addOperationCreateDataflowEndpointGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,5 +104,8 @@ func addOperationCreateDataflowEndpointGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_CreateMissionProfile.go b/service/groundstation/api_op_CreateMissionProfile.go index 89f975fd8cf..bee8260a0e5 100644 --- a/service/groundstation/api_op_CreateMissionProfile.go +++ b/service/groundstation/api_op_CreateMissionProfile.go @@ -84,6 +84,9 @@ func addOperationCreateMissionProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,5 +126,8 @@ func addOperationCreateMissionProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_DeleteConfig.go b/service/groundstation/api_op_DeleteConfig.go index 27ab3a72119..f53a210a1f2 100644 --- a/service/groundstation/api_op_DeleteConfig.go +++ b/service/groundstation/api_op_DeleteConfig.go @@ -66,6 +66,9 @@ func addOperationDeleteConfigMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,5 +108,8 @@ func addOperationDeleteConfigMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_DeleteDataflowEndpointGroup.go b/service/groundstation/api_op_DeleteDataflowEndpointGroup.go index 49997322c23..b80392fc99f 100644 --- a/service/groundstation/api_op_DeleteDataflowEndpointGroup.go +++ b/service/groundstation/api_op_DeleteDataflowEndpointGroup.go @@ -54,6 +54,9 @@ func addOperationDeleteDataflowEndpointGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,5 +96,8 @@ func addOperationDeleteDataflowEndpointGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_DeleteMissionProfile.go b/service/groundstation/api_op_DeleteMissionProfile.go index 479fc6fd225..a78b6df20b3 100644 --- a/service/groundstation/api_op_DeleteMissionProfile.go +++ b/service/groundstation/api_op_DeleteMissionProfile.go @@ -54,6 +54,9 @@ func addOperationDeleteMissionProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,5 +96,8 @@ func addOperationDeleteMissionProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_DescribeContact.go b/service/groundstation/api_op_DescribeContact.go index 041ac66872d..bcef298fe28 100644 --- a/service/groundstation/api_op_DescribeContact.go +++ b/service/groundstation/api_op_DescribeContact.go @@ -94,6 +94,9 @@ func addOperationDescribeContactMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,5 +136,8 @@ func addOperationDescribeContactMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_GetConfig.go b/service/groundstation/api_op_GetConfig.go index 83a8bf2a586..036ef3fc40e 100644 --- a/service/groundstation/api_op_GetConfig.go +++ b/service/groundstation/api_op_GetConfig.go @@ -83,6 +83,9 @@ func addOperationGetConfigMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,5 +125,8 @@ func addOperationGetConfigMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_GetDataflowEndpointGroup.go b/service/groundstation/api_op_GetDataflowEndpointGroup.go index b15a6e65cb8..d7b6a9a6fce 100644 --- a/service/groundstation/api_op_GetDataflowEndpointGroup.go +++ b/service/groundstation/api_op_GetDataflowEndpointGroup.go @@ -64,6 +64,9 @@ func addOperationGetDataflowEndpointGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,5 +106,8 @@ func addOperationGetDataflowEndpointGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_GetMinuteUsage.go b/service/groundstation/api_op_GetMinuteUsage.go index 527dff62b77..bc3a6cb83e0 100644 --- a/service/groundstation/api_op_GetMinuteUsage.go +++ b/service/groundstation/api_op_GetMinuteUsage.go @@ -75,6 +75,9 @@ func addOperationGetMinuteUsageMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetMinuteUsageMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_GetMissionProfile.go b/service/groundstation/api_op_GetMissionProfile.go index f6365312091..832205d176b 100644 --- a/service/groundstation/api_op_GetMissionProfile.go +++ b/service/groundstation/api_op_GetMissionProfile.go @@ -86,6 +86,9 @@ func addOperationGetMissionProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,5 +128,8 @@ func addOperationGetMissionProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_GetSatellite.go b/service/groundstation/api_op_GetSatellite.go index 7d434e7fe96..64f41254b43 100644 --- a/service/groundstation/api_op_GetSatellite.go +++ b/service/groundstation/api_op_GetSatellite.go @@ -63,6 +63,9 @@ func addOperationGetSatelliteMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,5 +105,8 @@ func addOperationGetSatelliteMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListConfigs.go b/service/groundstation/api_op_ListConfigs.go index b6b7e2eefe3..605c8c7c806 100644 --- a/service/groundstation/api_op_ListConfigs.go +++ b/service/groundstation/api_op_ListConfigs.go @@ -61,6 +61,9 @@ func addOperationListConfigsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,5 +100,8 @@ func addOperationListConfigsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListContacts.go b/service/groundstation/api_op_ListContacts.go index f6cf8a0b3d9..bfadd554f8f 100644 --- a/service/groundstation/api_op_ListContacts.go +++ b/service/groundstation/api_op_ListContacts.go @@ -87,6 +87,9 @@ func addOperationListContactsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,5 +129,8 @@ func addOperationListContactsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListDataflowEndpointGroups.go b/service/groundstation/api_op_ListDataflowEndpointGroups.go index f97bbbfc0a4..e8ec828bde6 100644 --- a/service/groundstation/api_op_ListDataflowEndpointGroups.go +++ b/service/groundstation/api_op_ListDataflowEndpointGroups.go @@ -61,6 +61,9 @@ func addOperationListDataflowEndpointGroupsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,5 +100,8 @@ func addOperationListDataflowEndpointGroupsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListGroundStations.go b/service/groundstation/api_op_ListGroundStations.go index d89db86363d..09fe122bdab 100644 --- a/service/groundstation/api_op_ListGroundStations.go +++ b/service/groundstation/api_op_ListGroundStations.go @@ -64,6 +64,9 @@ func addOperationListGroundStationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,5 +103,8 @@ func addOperationListGroundStationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListMissionProfiles.go b/service/groundstation/api_op_ListMissionProfiles.go index 2e7071ddc84..9aa7f00c75f 100644 --- a/service/groundstation/api_op_ListMissionProfiles.go +++ b/service/groundstation/api_op_ListMissionProfiles.go @@ -61,6 +61,9 @@ func addOperationListMissionProfilesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,5 +100,8 @@ func addOperationListMissionProfilesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListSatellites.go b/service/groundstation/api_op_ListSatellites.go index 7bc64bd56b6..7e4b656665f 100644 --- a/service/groundstation/api_op_ListSatellites.go +++ b/service/groundstation/api_op_ListSatellites.go @@ -61,6 +61,9 @@ func addOperationListSatellitesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,5 +100,8 @@ func addOperationListSatellitesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ListTagsForResource.go b/service/groundstation/api_op_ListTagsForResource.go index d8c0503f6bb..0d6f663c93d 100644 --- a/service/groundstation/api_op_ListTagsForResource.go +++ b/service/groundstation/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_ReserveContact.go b/service/groundstation/api_op_ReserveContact.go index 9c775f6c24d..2536c7cebc7 100644 --- a/service/groundstation/api_op_ReserveContact.go +++ b/service/groundstation/api_op_ReserveContact.go @@ -78,6 +78,9 @@ func addOperationReserveContactMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,5 +120,8 @@ func addOperationReserveContactMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_TagResource.go b/service/groundstation/api_op_TagResource.go index 61aa6765ef5..59fb6c16036 100644 --- a/service/groundstation/api_op_TagResource.go +++ b/service/groundstation/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_UntagResource.go b/service/groundstation/api_op_UntagResource.go index f529da9eb92..8d3fcc11a8c 100644 --- a/service/groundstation/api_op_UntagResource.go +++ b/service/groundstation/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_UpdateConfig.go b/service/groundstation/api_op_UpdateConfig.go index 20660291f41..581d0340c5b 100644 --- a/service/groundstation/api_op_UpdateConfig.go +++ b/service/groundstation/api_op_UpdateConfig.go @@ -78,6 +78,9 @@ func addOperationUpdateConfigMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,5 +120,8 @@ func addOperationUpdateConfigMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/api_op_UpdateMissionProfile.go b/service/groundstation/api_op_UpdateMissionProfile.go index c3e9221ed29..ea9bc2e0556 100644 --- a/service/groundstation/api_op_UpdateMissionProfile.go +++ b/service/groundstation/api_op_UpdateMissionProfile.go @@ -78,6 +78,9 @@ func addOperationUpdateMissionProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,5 +120,8 @@ func addOperationUpdateMissionProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/groundstation/go.mod b/service/groundstation/go.mod index bb0eeb07fe1..6e718f38d24 100644 --- a/service/groundstation/go.mod +++ b/service/groundstation/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/groundstation go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/groundstation/go.sum b/service/groundstation/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/groundstation/go.sum +++ b/service/groundstation/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/guardduty/api_client.go b/service/guardduty/api_client.go index 8d9069c9ad1..ac64b99c8bb 100644 --- a/service/guardduty/api_client.go +++ b/service/guardduty/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/guardduty/api_op_AcceptInvitation.go b/service/guardduty/api_op_AcceptInvitation.go index 32c9c7892da..6fce2d165c2 100644 --- a/service/guardduty/api_op_AcceptInvitation.go +++ b/service/guardduty/api_op_AcceptInvitation.go @@ -59,6 +59,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ArchiveFindings.go b/service/guardduty/api_op_ArchiveFindings.go index 302d06abfb4..902a74df48a 100644 --- a/service/guardduty/api_op_ArchiveFindings.go +++ b/service/guardduty/api_op_ArchiveFindings.go @@ -56,6 +56,9 @@ func addOperationArchiveFindingsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationArchiveFindingsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreateDetector.go b/service/guardduty/api_op_CreateDetector.go index 6e4362ea2c0..2aa2981c1e2 100644 --- a/service/guardduty/api_op_CreateDetector.go +++ b/service/guardduty/api_op_CreateDetector.go @@ -70,6 +70,9 @@ func addOperationCreateDetectorMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateDetectorMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreateFilter.go b/service/guardduty/api_op_CreateFilter.go index 852877c7dd2..88c918574ed 100644 --- a/service/guardduty/api_op_CreateFilter.go +++ b/service/guardduty/api_op_CreateFilter.go @@ -227,6 +227,9 @@ func addOperationCreateFilterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -272,6 +275,9 @@ func addOperationCreateFilterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreateIPSet.go b/service/guardduty/api_op_CreateIPSet.go index 0e770843a56..e6106b60d67 100644 --- a/service/guardduty/api_op_CreateIPSet.go +++ b/service/guardduty/api_op_CreateIPSet.go @@ -90,6 +90,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreateMembers.go b/service/guardduty/api_op_CreateMembers.go index f4300c0c040..f4f77814887 100644 --- a/service/guardduty/api_op_CreateMembers.go +++ b/service/guardduty/api_op_CreateMembers.go @@ -71,6 +71,9 @@ func addOperationCreateMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreatePublishingDestination.go b/service/guardduty/api_op_CreatePublishingDestination.go index 6f1a3170ad6..6e8a26a535a 100644 --- a/service/guardduty/api_op_CreatePublishingDestination.go +++ b/service/guardduty/api_op_CreatePublishingDestination.go @@ -72,6 +72,9 @@ func addOperationCreatePublishingDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreatePublishingDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreateSampleFindings.go b/service/guardduty/api_op_CreateSampleFindings.go index 80dd3ee946d..097044a2848 100644 --- a/service/guardduty/api_op_CreateSampleFindings.go +++ b/service/guardduty/api_op_CreateSampleFindings.go @@ -53,6 +53,9 @@ func addOperationCreateSampleFindingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCreateSampleFindingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_CreateThreatIntelSet.go b/service/guardduty/api_op_CreateThreatIntelSet.go index 10ce6d94755..c644642d2e5 100644 --- a/service/guardduty/api_op_CreateThreatIntelSet.go +++ b/service/guardduty/api_op_CreateThreatIntelSet.go @@ -88,6 +88,9 @@ func addOperationCreateThreatIntelSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateThreatIntelSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeclineInvitations.go b/service/guardduty/api_op_DeclineInvitations.go index 1550c3e3470..b99df3d905c 100644 --- a/service/guardduty/api_op_DeclineInvitations.go +++ b/service/guardduty/api_op_DeclineInvitations.go @@ -58,6 +58,9 @@ func addOperationDeclineInvitationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeclineInvitationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeleteDetector.go b/service/guardduty/api_op_DeleteDetector.go index 011731fbb32..da9bcfad7ba 100644 --- a/service/guardduty/api_op_DeleteDetector.go +++ b/service/guardduty/api_op_DeleteDetector.go @@ -48,6 +48,9 @@ func addOperationDeleteDetectorMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDetectorMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeleteFilter.go b/service/guardduty/api_op_DeleteFilter.go index 8365a1d8c12..400bd8d1f9d 100644 --- a/service/guardduty/api_op_DeleteFilter.go +++ b/service/guardduty/api_op_DeleteFilter.go @@ -53,6 +53,9 @@ func addOperationDeleteFilterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteFilterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeleteIPSet.go b/service/guardduty/api_op_DeleteIPSet.go index bd25978d51c..dea6c95354c 100644 --- a/service/guardduty/api_op_DeleteIPSet.go +++ b/service/guardduty/api_op_DeleteIPSet.go @@ -54,6 +54,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeleteInvitations.go b/service/guardduty/api_op_DeleteInvitations.go index f0e7c84283c..1d821c90b88 100644 --- a/service/guardduty/api_op_DeleteInvitations.go +++ b/service/guardduty/api_op_DeleteInvitations.go @@ -58,6 +58,9 @@ func addOperationDeleteInvitationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteInvitationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeleteMembers.go b/service/guardduty/api_op_DeleteMembers.go index 2660406c331..6ce8684defd 100644 --- a/service/guardduty/api_op_DeleteMembers.go +++ b/service/guardduty/api_op_DeleteMembers.go @@ -62,6 +62,9 @@ func addOperationDeleteMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeletePublishingDestination.go b/service/guardduty/api_op_DeletePublishingDestination.go index e85ea92bf43..5c8a86673a9 100644 --- a/service/guardduty/api_op_DeletePublishingDestination.go +++ b/service/guardduty/api_op_DeletePublishingDestination.go @@ -54,6 +54,9 @@ func addOperationDeletePublishingDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeletePublishingDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DeleteThreatIntelSet.go b/service/guardduty/api_op_DeleteThreatIntelSet.go index cb73ce44ff2..3ea66a024b2 100644 --- a/service/guardduty/api_op_DeleteThreatIntelSet.go +++ b/service/guardduty/api_op_DeleteThreatIntelSet.go @@ -53,6 +53,9 @@ func addOperationDeleteThreatIntelSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteThreatIntelSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DescribeOrganizationConfiguration.go b/service/guardduty/api_op_DescribeOrganizationConfiguration.go index 2127e23b8fb..1e126170415 100644 --- a/service/guardduty/api_op_DescribeOrganizationConfiguration.go +++ b/service/guardduty/api_op_DescribeOrganizationConfiguration.go @@ -68,6 +68,9 @@ func addOperationDescribeOrganizationConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeOrganizationConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DescribePublishingDestination.go b/service/guardduty/api_op_DescribePublishingDestination.go index 487d97fb116..63568b4a093 100644 --- a/service/guardduty/api_op_DescribePublishingDestination.go +++ b/service/guardduty/api_op_DescribePublishingDestination.go @@ -85,6 +85,9 @@ func addOperationDescribePublishingDestinationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribePublishingDestinationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DisableOrganizationAdminAccount.go b/service/guardduty/api_op_DisableOrganizationAdminAccount.go index 4472e0d24e4..1031ca3c155 100644 --- a/service/guardduty/api_op_DisableOrganizationAdminAccount.go +++ b/service/guardduty/api_op_DisableOrganizationAdminAccount.go @@ -50,6 +50,9 @@ func addOperationDisableOrganizationAdminAccountMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDisableOrganizationAdminAccountMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DisassociateFromMasterAccount.go b/service/guardduty/api_op_DisassociateFromMasterAccount.go index ab6709588fe..a9da5f3a96b 100644 --- a/service/guardduty/api_op_DisassociateFromMasterAccount.go +++ b/service/guardduty/api_op_DisassociateFromMasterAccount.go @@ -48,6 +48,9 @@ func addOperationDisassociateFromMasterAccountMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDisassociateFromMasterAccountMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_DisassociateMembers.go b/service/guardduty/api_op_DisassociateMembers.go index 7f267e6ddb4..9fe1cb14906 100644 --- a/service/guardduty/api_op_DisassociateMembers.go +++ b/service/guardduty/api_op_DisassociateMembers.go @@ -64,6 +64,9 @@ func addOperationDisassociateMembersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDisassociateMembersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_EnableOrganizationAdminAccount.go b/service/guardduty/api_op_EnableOrganizationAdminAccount.go index 216b2598461..36052cf489b 100644 --- a/service/guardduty/api_op_EnableOrganizationAdminAccount.go +++ b/service/guardduty/api_op_EnableOrganizationAdminAccount.go @@ -50,6 +50,9 @@ func addOperationEnableOrganizationAdminAccountMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationEnableOrganizationAdminAccountMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetDetector.go b/service/guardduty/api_op_GetDetector.go index b8ba0755440..a0a28b0b057 100644 --- a/service/guardduty/api_op_GetDetector.go +++ b/service/guardduty/api_op_GetDetector.go @@ -75,6 +75,9 @@ func addOperationGetDetectorMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetDetectorMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetFilter.go b/service/guardduty/api_op_GetFilter.go index b69ffdb14d6..ac6c88702a3 100644 --- a/service/guardduty/api_op_GetFilter.go +++ b/service/guardduty/api_op_GetFilter.go @@ -81,6 +81,9 @@ func addOperationGetFilterMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetFilterMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetFindings.go b/service/guardduty/api_op_GetFindings.go index 6e0f6802c05..f7ac2237f01 100644 --- a/service/guardduty/api_op_GetFindings.go +++ b/service/guardduty/api_op_GetFindings.go @@ -64,6 +64,9 @@ func addOperationGetFindingsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetFindingsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetFindingsStatistics.go b/service/guardduty/api_op_GetFindingsStatistics.go index 945020c0aca..d59cb6d9c20 100644 --- a/service/guardduty/api_op_GetFindingsStatistics.go +++ b/service/guardduty/api_op_GetFindingsStatistics.go @@ -64,6 +64,9 @@ func addOperationGetFindingsStatisticsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetFindingsStatisticsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetIPSet.go b/service/guardduty/api_op_GetIPSet.go index 17edbf36437..2e67aec0112 100644 --- a/service/guardduty/api_op_GetIPSet.go +++ b/service/guardduty/api_op_GetIPSet.go @@ -79,6 +79,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetInvitationsCount.go b/service/guardduty/api_op_GetInvitationsCount.go index 2b7cddf631b..20955e9ad9c 100644 --- a/service/guardduty/api_op_GetInvitationsCount.go +++ b/service/guardduty/api_op_GetInvitationsCount.go @@ -48,6 +48,9 @@ func addOperationGetInvitationsCountMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationGetInvitationsCountMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetMasterAccount.go b/service/guardduty/api_op_GetMasterAccount.go index 8bba9ad79f3..fa860ada2fc 100644 --- a/service/guardduty/api_op_GetMasterAccount.go +++ b/service/guardduty/api_op_GetMasterAccount.go @@ -56,6 +56,9 @@ func addOperationGetMasterAccountMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetMasterAccountMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetMemberDetectors.go b/service/guardduty/api_op_GetMemberDetectors.go index a81afc04335..9d343053974 100644 --- a/service/guardduty/api_op_GetMemberDetectors.go +++ b/service/guardduty/api_op_GetMemberDetectors.go @@ -66,6 +66,9 @@ func addOperationGetMemberDetectorsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetMemberDetectorsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetMembers.go b/service/guardduty/api_op_GetMembers.go index febeaea5689..e9bc6a66539 100644 --- a/service/guardduty/api_op_GetMembers.go +++ b/service/guardduty/api_op_GetMembers.go @@ -69,6 +69,9 @@ func addOperationGetMembersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetMembersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetThreatIntelSet.go b/service/guardduty/api_op_GetThreatIntelSet.go index 02abff3f402..4038d8bee8f 100644 --- a/service/guardduty/api_op_GetThreatIntelSet.go +++ b/service/guardduty/api_op_GetThreatIntelSet.go @@ -80,6 +80,9 @@ func addOperationGetThreatIntelSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetThreatIntelSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_GetUsageStatistics.go b/service/guardduty/api_op_GetUsageStatistics.go index f4c02fd6497..a690f69a1cf 100644 --- a/service/guardduty/api_op_GetUsageStatistics.go +++ b/service/guardduty/api_op_GetUsageStatistics.go @@ -88,6 +88,9 @@ func addOperationGetUsageStatisticsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetUsageStatisticsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_InviteMembers.go b/service/guardduty/api_op_InviteMembers.go index dd3c4e67492..440407e7adf 100644 --- a/service/guardduty/api_op_InviteMembers.go +++ b/service/guardduty/api_op_InviteMembers.go @@ -74,6 +74,9 @@ func addOperationInviteMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationInviteMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListDetectors.go b/service/guardduty/api_op_ListDetectors.go index 9135683ed7d..960d5df43bb 100644 --- a/service/guardduty/api_op_ListDetectors.go +++ b/service/guardduty/api_op_ListDetectors.go @@ -63,6 +63,9 @@ func addOperationListDetectorsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListDetectorsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListFilters.go b/service/guardduty/api_op_ListFilters.go index a535bfeb6df..c29b908277a 100644 --- a/service/guardduty/api_op_ListFilters.go +++ b/service/guardduty/api_op_ListFilters.go @@ -68,6 +68,9 @@ func addOperationListFiltersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListFiltersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListFindings.go b/service/guardduty/api_op_ListFindings.go index 50e5329be15..9a402690357 100644 --- a/service/guardduty/api_op_ListFindings.go +++ b/service/guardduty/api_op_ListFindings.go @@ -214,6 +214,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -256,6 +259,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListIPSets.go b/service/guardduty/api_op_ListIPSets.go index 29b34cfb0a1..cab5fa2a2f5 100644 --- a/service/guardduty/api_op_ListIPSets.go +++ b/service/guardduty/api_op_ListIPSets.go @@ -70,6 +70,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListInvitations.go b/service/guardduty/api_op_ListInvitations.go index bd41bac9283..feb194dfb61 100644 --- a/service/guardduty/api_op_ListInvitations.go +++ b/service/guardduty/api_op_ListInvitations.go @@ -63,6 +63,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListMembers.go b/service/guardduty/api_op_ListMembers.go index f50da066e2c..2a21443bbba 100644 --- a/service/guardduty/api_op_ListMembers.go +++ b/service/guardduty/api_op_ListMembers.go @@ -72,6 +72,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListOrganizationAdminAccounts.go b/service/guardduty/api_op_ListOrganizationAdminAccounts.go index 11473e61244..02714402c46 100644 --- a/service/guardduty/api_op_ListOrganizationAdminAccounts.go +++ b/service/guardduty/api_op_ListOrganizationAdminAccounts.go @@ -62,6 +62,9 @@ func addOperationListOrganizationAdminAccountsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListOrganizationAdminAccountsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListPublishingDestinations.go b/service/guardduty/api_op_ListPublishingDestinations.go index 918f1bb2b60..66eb5d7220f 100644 --- a/service/guardduty/api_op_ListPublishingDestinations.go +++ b/service/guardduty/api_op_ListPublishingDestinations.go @@ -72,6 +72,9 @@ func addOperationListPublishingDestinationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListPublishingDestinationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListTagsForResource.go b/service/guardduty/api_op_ListTagsForResource.go index 46229957480..7ca4764949c 100644 --- a/service/guardduty/api_op_ListTagsForResource.go +++ b/service/guardduty/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_ListThreatIntelSets.go b/service/guardduty/api_op_ListThreatIntelSets.go index 0b5e763ec99..10a92eb74e8 100644 --- a/service/guardduty/api_op_ListThreatIntelSets.go +++ b/service/guardduty/api_op_ListThreatIntelSets.go @@ -70,6 +70,9 @@ func addOperationListThreatIntelSetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListThreatIntelSetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_StartMonitoringMembers.go b/service/guardduty/api_op_StartMonitoringMembers.go index 7c53e0e2dee..2dec8fb313a 100644 --- a/service/guardduty/api_op_StartMonitoringMembers.go +++ b/service/guardduty/api_op_StartMonitoringMembers.go @@ -64,6 +64,9 @@ func addOperationStartMonitoringMembersMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationStartMonitoringMembersMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_StopMonitoringMembers.go b/service/guardduty/api_op_StopMonitoringMembers.go index fdd4081e97d..42fc4810c9e 100644 --- a/service/guardduty/api_op_StopMonitoringMembers.go +++ b/service/guardduty/api_op_StopMonitoringMembers.go @@ -63,6 +63,9 @@ func addOperationStopMonitoringMembersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopMonitoringMembersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_TagResource.go b/service/guardduty/api_op_TagResource.go index 8a9c2604bac..34d8d72a782 100644 --- a/service/guardduty/api_op_TagResource.go +++ b/service/guardduty/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UnarchiveFindings.go b/service/guardduty/api_op_UnarchiveFindings.go index 555557dba54..45100e23255 100644 --- a/service/guardduty/api_op_UnarchiveFindings.go +++ b/service/guardduty/api_op_UnarchiveFindings.go @@ -53,6 +53,9 @@ func addOperationUnarchiveFindingsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUnarchiveFindingsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UntagResource.go b/service/guardduty/api_op_UntagResource.go index e3610106d86..64140a6f198 100644 --- a/service/guardduty/api_op_UntagResource.go +++ b/service/guardduty/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateDetector.go b/service/guardduty/api_op_UpdateDetector.go index d01fb48c341..518364722a9 100644 --- a/service/guardduty/api_op_UpdateDetector.go +++ b/service/guardduty/api_op_UpdateDetector.go @@ -59,6 +59,9 @@ func addOperationUpdateDetectorMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateDetectorMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateFilter.go b/service/guardduty/api_op_UpdateFilter.go index efbe3af2ef1..506dc994d7a 100644 --- a/service/guardduty/api_op_UpdateFilter.go +++ b/service/guardduty/api_op_UpdateFilter.go @@ -75,6 +75,9 @@ func addOperationUpdateFilterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateFilterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateFindingsFeedback.go b/service/guardduty/api_op_UpdateFindingsFeedback.go index cd6f35db8e4..25309bab486 100644 --- a/service/guardduty/api_op_UpdateFindingsFeedback.go +++ b/service/guardduty/api_op_UpdateFindingsFeedback.go @@ -62,6 +62,9 @@ func addOperationUpdateFindingsFeedbackMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateFindingsFeedbackMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateIPSet.go b/service/guardduty/api_op_UpdateIPSet.go index 0b527526ab5..18c4019f558 100644 --- a/service/guardduty/api_op_UpdateIPSet.go +++ b/service/guardduty/api_op_UpdateIPSet.go @@ -64,6 +64,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateMemberDetectors.go b/service/guardduty/api_op_UpdateMemberDetectors.go index 7f752dab824..76cba0797fb 100644 --- a/service/guardduty/api_op_UpdateMemberDetectors.go +++ b/service/guardduty/api_op_UpdateMemberDetectors.go @@ -64,6 +64,9 @@ func addOperationUpdateMemberDetectorsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateMemberDetectorsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateOrganizationConfiguration.go b/service/guardduty/api_op_UpdateOrganizationConfiguration.go index 78f58141566..3cdb988988b 100644 --- a/service/guardduty/api_op_UpdateOrganizationConfiguration.go +++ b/service/guardduty/api_op_UpdateOrganizationConfiguration.go @@ -57,6 +57,9 @@ func addOperationUpdateOrganizationConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateOrganizationConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdatePublishingDestination.go b/service/guardduty/api_op_UpdatePublishingDestination.go index 5e04c03be91..654e03169c6 100644 --- a/service/guardduty/api_op_UpdatePublishingDestination.go +++ b/service/guardduty/api_op_UpdatePublishingDestination.go @@ -59,6 +59,9 @@ func addOperationUpdatePublishingDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdatePublishingDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/api_op_UpdateThreatIntelSet.go b/service/guardduty/api_op_UpdateThreatIntelSet.go index d2c74c573c6..f9becca0d94 100644 --- a/service/guardduty/api_op_UpdateThreatIntelSet.go +++ b/service/guardduty/api_op_UpdateThreatIntelSet.go @@ -65,6 +65,9 @@ func addOperationUpdateThreatIntelSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateThreatIntelSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/guardduty/go.mod b/service/guardduty/go.mod index 9b0603e132e..fd2523e0d19 100644 --- a/service/guardduty/go.mod +++ b/service/guardduty/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/guardduty go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/guardduty/go.sum b/service/guardduty/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/guardduty/go.sum +++ b/service/guardduty/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/health/api_client.go b/service/health/api_client.go index 149d4521195..9513a66e248 100644 --- a/service/health/api_client.go +++ b/service/health/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/health/api_op_DescribeAffectedAccountsForOrganization.go b/service/health/api_op_DescribeAffectedAccountsForOrganization.go index cd97e39c45d..c3636e7b5c2 100644 --- a/service/health/api_op_DescribeAffectedAccountsForOrganization.go +++ b/service/health/api_op_DescribeAffectedAccountsForOrganization.go @@ -100,6 +100,9 @@ func addOperationDescribeAffectedAccountsForOrganizationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationDescribeAffectedAccountsForOrganizationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeAffectedEntities.go b/service/health/api_op_DescribeAffectedEntities.go index 8a34b2bdd99..78ff01340d6 100644 --- a/service/health/api_op_DescribeAffectedEntities.go +++ b/service/health/api_op_DescribeAffectedEntities.go @@ -83,6 +83,9 @@ func addOperationDescribeAffectedEntitiesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeAffectedEntitiesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeAffectedEntitiesForOrganization.go b/service/health/api_op_DescribeAffectedEntitiesForOrganization.go index cab04f734a3..10783824220 100644 --- a/service/health/api_op_DescribeAffectedEntitiesForOrganization.go +++ b/service/health/api_op_DescribeAffectedEntitiesForOrganization.go @@ -92,6 +92,9 @@ func addOperationDescribeAffectedEntitiesForOrganizationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeAffectedEntitiesForOrganizationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEntityAggregates.go b/service/health/api_op_DescribeEntityAggregates.go index ebe08b1acca..27931aee6d2 100644 --- a/service/health/api_op_DescribeEntityAggregates.go +++ b/service/health/api_op_DescribeEntityAggregates.go @@ -55,6 +55,9 @@ func addOperationDescribeEntityAggregatesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribeEntityAggregatesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEventAggregates.go b/service/health/api_op_DescribeEventAggregates.go index ba441b2d50a..3a98a1b0121 100644 --- a/service/health/api_op_DescribeEventAggregates.go +++ b/service/health/api_op_DescribeEventAggregates.go @@ -77,6 +77,9 @@ func addOperationDescribeEventAggregatesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeEventAggregatesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEventDetails.go b/service/health/api_op_DescribeEventDetails.go index aae7414ad9d..5e4f798ee95 100644 --- a/service/health/api_op_DescribeEventDetails.go +++ b/service/health/api_op_DescribeEventDetails.go @@ -71,6 +71,9 @@ func addOperationDescribeEventDetailsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeEventDetailsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEventDetailsForOrganization.go b/service/health/api_op_DescribeEventDetailsForOrganization.go index 79a594d58c9..0a9ea4b278d 100644 --- a/service/health/api_op_DescribeEventDetailsForOrganization.go +++ b/service/health/api_op_DescribeEventDetailsForOrganization.go @@ -89,6 +89,9 @@ func addOperationDescribeEventDetailsForOrganizationMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeEventDetailsForOrganizationMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEventTypes.go b/service/health/api_op_DescribeEventTypes.go index 450d7d5efc0..705c5addbd0 100644 --- a/service/health/api_op_DescribeEventTypes.go +++ b/service/health/api_op_DescribeEventTypes.go @@ -79,6 +79,9 @@ func addOperationDescribeEventTypesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeEventTypesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEvents.go b/service/health/api_op_DescribeEvents.go index 06fe4853529..b7d2d889fc4 100644 --- a/service/health/api_op_DescribeEvents.go +++ b/service/health/api_op_DescribeEvents.go @@ -95,6 +95,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeEventsForOrganization.go b/service/health/api_op_DescribeEventsForOrganization.go index 63bf0081e87..c85748d7579 100644 --- a/service/health/api_op_DescribeEventsForOrganization.go +++ b/service/health/api_op_DescribeEventsForOrganization.go @@ -102,6 +102,9 @@ func addOperationDescribeEventsForOrganizationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDescribeEventsForOrganizationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DescribeHealthServiceStatusForOrganization.go b/service/health/api_op_DescribeHealthServiceStatusForOrganization.go index 6872a8ba544..c010ae55faf 100644 --- a/service/health/api_op_DescribeHealthServiceStatusForOrganization.go +++ b/service/health/api_op_DescribeHealthServiceStatusForOrganization.go @@ -51,6 +51,9 @@ func addOperationDescribeHealthServiceStatusForOrganizationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDescribeHealthServiceStatusForOrganizationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_DisableHealthServiceAccessForOrganization.go b/service/health/api_op_DisableHealthServiceAccessForOrganization.go index 87a07e680a1..530dd38eac8 100644 --- a/service/health/api_op_DisableHealthServiceAccessForOrganization.go +++ b/service/health/api_op_DisableHealthServiceAccessForOrganization.go @@ -59,6 +59,9 @@ func addOperationDisableHealthServiceAccessForOrganizationMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDisableHealthServiceAccessForOrganizationMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/api_op_EnableHealthServiceAccessForOrganization.go b/service/health/api_op_EnableHealthServiceAccessForOrganization.go index 75c77fd36e8..f1ed8525f79 100644 --- a/service/health/api_op_EnableHealthServiceAccessForOrganization.go +++ b/service/health/api_op_EnableHealthServiceAccessForOrganization.go @@ -49,6 +49,9 @@ func addOperationEnableHealthServiceAccessForOrganizationMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationEnableHealthServiceAccessForOrganizationMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/health/go.mod b/service/health/go.mod index e4cd14f3cfe..5bf5e07427f 100644 --- a/service/health/go.mod +++ b/service/health/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/health go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/health/go.sum b/service/health/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/health/go.sum +++ b/service/health/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/honeycode/api_client.go b/service/honeycode/api_client.go index e9c021480b5..a7b765f83bc 100644 --- a/service/honeycode/api_client.go +++ b/service/honeycode/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/honeycode/api_op_GetScreenData.go b/service/honeycode/api_op_GetScreenData.go index c8075ef4a4e..b2022e955fb 100644 --- a/service/honeycode/api_op_GetScreenData.go +++ b/service/honeycode/api_op_GetScreenData.go @@ -97,6 +97,9 @@ func addOperationGetScreenDataMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetScreenDataMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/honeycode/api_op_InvokeScreenAutomation.go b/service/honeycode/api_op_InvokeScreenAutomation.go index 4479f8ef40f..77176f4646d 100644 --- a/service/honeycode/api_op_InvokeScreenAutomation.go +++ b/service/honeycode/api_op_InvokeScreenAutomation.go @@ -94,6 +94,9 @@ func addOperationInvokeScreenAutomationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationInvokeScreenAutomationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/honeycode/go.mod b/service/honeycode/go.mod index 241fce1f030..8d9478bf927 100644 --- a/service/honeycode/go.mod +++ b/service/honeycode/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/honeycode go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/honeycode/go.sum b/service/honeycode/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/honeycode/go.sum +++ b/service/honeycode/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iam/api_client.go b/service/iam/api_client.go index af640d9f031..be1facf1145 100644 --- a/service/iam/api_client.go +++ b/service/iam/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go b/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go index fdd6f5c6f12..f2507d1f558 100644 --- a/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go +++ b/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go @@ -59,6 +59,9 @@ func addOperationAddClientIDToOpenIDConnectProviderMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddClientIDToOpenIDConnectProviderMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_AddRoleToInstanceProfile.go b/service/iam/api_op_AddRoleToInstanceProfile.go index e2e31b1a28c..e74281220c5 100644 --- a/service/iam/api_op_AddRoleToInstanceProfile.go +++ b/service/iam/api_op_AddRoleToInstanceProfile.go @@ -76,6 +76,9 @@ func addOperationAddRoleToInstanceProfileMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationAddRoleToInstanceProfileMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_AddUserToGroup.go b/service/iam/api_op_AddUserToGroup.go index f78aed15d7f..cb88a4b55c5 100644 --- a/service/iam/api_op_AddUserToGroup.go +++ b/service/iam/api_op_AddUserToGroup.go @@ -59,6 +59,9 @@ func addOperationAddUserToGroupMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddUserToGroupMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_AttachGroupPolicy.go b/service/iam/api_op_AttachGroupPolicy.go index bbe95065137..c77712dd283 100644 --- a/service/iam/api_op_AttachGroupPolicy.go +++ b/service/iam/api_op_AttachGroupPolicy.go @@ -65,6 +65,9 @@ func addOperationAttachGroupPolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAttachGroupPolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_AttachRolePolicy.go b/service/iam/api_op_AttachRolePolicy.go index c475984550b..04f301d4025 100644 --- a/service/iam/api_op_AttachRolePolicy.go +++ b/service/iam/api_op_AttachRolePolicy.go @@ -69,6 +69,9 @@ func addOperationAttachRolePolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAttachRolePolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_AttachUserPolicy.go b/service/iam/api_op_AttachUserPolicy.go index 4b194ea5888..96c6e09c649 100644 --- a/service/iam/api_op_AttachUserPolicy.go +++ b/service/iam/api_op_AttachUserPolicy.go @@ -65,6 +65,9 @@ func addOperationAttachUserPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAttachUserPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ChangePassword.go b/service/iam/api_op_ChangePassword.go index 03378ad8bd2..9053d82aaf1 100644 --- a/service/iam/api_op_ChangePassword.go +++ b/service/iam/api_op_ChangePassword.go @@ -66,6 +66,9 @@ func addOperationChangePasswordMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationChangePasswordMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateAccessKey.go b/service/iam/api_op_CreateAccessKey.go index 7fe4ffd8276..b47a7f3475f 100644 --- a/service/iam/api_op_CreateAccessKey.go +++ b/service/iam/api_op_CreateAccessKey.go @@ -70,6 +70,9 @@ func addOperationCreateAccessKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateAccessKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateAccountAlias.go b/service/iam/api_op_CreateAccountAlias.go index 09efb7c0bb8..b2f513fddd0 100644 --- a/service/iam/api_op_CreateAccountAlias.go +++ b/service/iam/api_op_CreateAccountAlias.go @@ -54,6 +54,9 @@ func addOperationCreateAccountAliasMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationCreateAccountAliasMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateGroup.go b/service/iam/api_op_CreateGroup.go index 911b5699998..fb31b2b0cce 100644 --- a/service/iam/api_op_CreateGroup.go +++ b/service/iam/api_op_CreateGroup.go @@ -73,6 +73,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateInstanceProfile.go b/service/iam/api_op_CreateInstanceProfile.go index 8b36e9d3982..492c9a73825 100644 --- a/service/iam/api_op_CreateInstanceProfile.go +++ b/service/iam/api_op_CreateInstanceProfile.go @@ -77,6 +77,9 @@ func addOperationCreateInstanceProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateInstanceProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateLoginProfile.go b/service/iam/api_op_CreateLoginProfile.go index 96e3a755b70..21fed7c045d 100644 --- a/service/iam/api_op_CreateLoginProfile.go +++ b/service/iam/api_op_CreateLoginProfile.go @@ -80,6 +80,9 @@ func addOperationCreateLoginProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateLoginProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateOpenIDConnectProvider.go b/service/iam/api_op_CreateOpenIDConnectProvider.go index 2468421b0c1..431128cc7d4 100644 --- a/service/iam/api_op_CreateOpenIDConnectProvider.go +++ b/service/iam/api_op_CreateOpenIDConnectProvider.go @@ -111,6 +111,9 @@ func addOperationCreateOpenIDConnectProviderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationCreateOpenIDConnectProviderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreatePolicy.go b/service/iam/api_op_CreatePolicy.go index 8e82028a1ed..66cbdc3e09b 100644 --- a/service/iam/api_op_CreatePolicy.go +++ b/service/iam/api_op_CreatePolicy.go @@ -102,6 +102,9 @@ func addOperationCreatePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreatePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreatePolicyVersion.go b/service/iam/api_op_CreatePolicyVersion.go index b664710ed57..842f39cd3ed 100644 --- a/service/iam/api_op_CreatePolicyVersion.go +++ b/service/iam/api_op_CreatePolicyVersion.go @@ -97,6 +97,9 @@ func addOperationCreatePolicyVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreatePolicyVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateRole.go b/service/iam/api_op_CreateRole.go index cbcd2c43daa..6acc53901f9 100644 --- a/service/iam/api_op_CreateRole.go +++ b/service/iam/api_op_CreateRole.go @@ -128,6 +128,9 @@ func addOperationCreateRoleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationCreateRoleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateSAMLProvider.go b/service/iam/api_op_CreateSAMLProvider.go index 41a130223ae..5c7d87eee14 100644 --- a/service/iam/api_op_CreateSAMLProvider.go +++ b/service/iam/api_op_CreateSAMLProvider.go @@ -86,6 +86,9 @@ func addOperationCreateSAMLProviderMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateSAMLProviderMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateServiceLinkedRole.go b/service/iam/api_op_CreateServiceLinkedRole.go index c011dadcc08..b2b056c78df 100644 --- a/service/iam/api_op_CreateServiceLinkedRole.go +++ b/service/iam/api_op_CreateServiceLinkedRole.go @@ -82,6 +82,9 @@ func addOperationCreateServiceLinkedRoleMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateServiceLinkedRoleMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateServiceSpecificCredential.go b/service/iam/api_op_CreateServiceSpecificCredential.go index f85b359e629..fc75667c1bb 100644 --- a/service/iam/api_op_CreateServiceSpecificCredential.go +++ b/service/iam/api_op_CreateServiceSpecificCredential.go @@ -78,6 +78,9 @@ func addOperationCreateServiceSpecificCredentialMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateServiceSpecificCredentialMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateUser.go b/service/iam/api_op_CreateUser.go index 7aecf5e9e75..eacce8039b6 100644 --- a/service/iam/api_op_CreateUser.go +++ b/service/iam/api_op_CreateUser.go @@ -83,6 +83,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_CreateVirtualMFADevice.go b/service/iam/api_op_CreateVirtualMFADevice.go index 57c4b793f30..985fde0802b 100644 --- a/service/iam/api_op_CreateVirtualMFADevice.go +++ b/service/iam/api_op_CreateVirtualMFADevice.go @@ -84,6 +84,9 @@ func addOperationCreateVirtualMFADeviceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateVirtualMFADeviceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeactivateMFADevice.go b/service/iam/api_op_DeactivateMFADevice.go index b2b03bb1812..cd92f376d41 100644 --- a/service/iam/api_op_DeactivateMFADevice.go +++ b/service/iam/api_op_DeactivateMFADevice.go @@ -65,6 +65,9 @@ func addOperationDeactivateMFADeviceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeactivateMFADeviceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteAccessKey.go b/service/iam/api_op_DeleteAccessKey.go index 554df94b46c..e46b87b7390 100644 --- a/service/iam/api_op_DeleteAccessKey.go +++ b/service/iam/api_op_DeleteAccessKey.go @@ -61,6 +61,9 @@ func addOperationDeleteAccessKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteAccessKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteAccountAlias.go b/service/iam/api_op_DeleteAccountAlias.go index 00809f07da9..7cf096c1724 100644 --- a/service/iam/api_op_DeleteAccountAlias.go +++ b/service/iam/api_op_DeleteAccountAlias.go @@ -54,6 +54,9 @@ func addOperationDeleteAccountAliasMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteAccountAliasMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteAccountPasswordPolicy.go b/service/iam/api_op_DeleteAccountPasswordPolicy.go index f9836c39c33..1d35b2b9e23 100644 --- a/service/iam/api_op_DeleteAccountPasswordPolicy.go +++ b/service/iam/api_op_DeleteAccountPasswordPolicy.go @@ -43,6 +43,9 @@ func addOperationDeleteAccountPasswordPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationDeleteAccountPasswordPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteGroup.go b/service/iam/api_op_DeleteGroup.go index 0c39c66c8c4..5b422926120 100644 --- a/service/iam/api_op_DeleteGroup.go +++ b/service/iam/api_op_DeleteGroup.go @@ -52,6 +52,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteGroupPolicy.go b/service/iam/api_op_DeleteGroupPolicy.go index 476c07f95b5..3449804dde5 100644 --- a/service/iam/api_op_DeleteGroupPolicy.go +++ b/service/iam/api_op_DeleteGroupPolicy.go @@ -65,6 +65,9 @@ func addOperationDeleteGroupPolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteGroupPolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteInstanceProfile.go b/service/iam/api_op_DeleteInstanceProfile.go index a506469587d..3e84daf5d1c 100644 --- a/service/iam/api_op_DeleteInstanceProfile.go +++ b/service/iam/api_op_DeleteInstanceProfile.go @@ -57,6 +57,9 @@ func addOperationDeleteInstanceProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteInstanceProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteLoginProfile.go b/service/iam/api_op_DeleteLoginProfile.go index e61a84f7219..7b2e4a1a78d 100644 --- a/service/iam/api_op_DeleteLoginProfile.go +++ b/service/iam/api_op_DeleteLoginProfile.go @@ -56,6 +56,9 @@ func addOperationDeleteLoginProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteLoginProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteOpenIDConnectProvider.go b/service/iam/api_op_DeleteOpenIDConnectProvider.go index 4d7cd0a08d5..9705c7bf4e3 100644 --- a/service/iam/api_op_DeleteOpenIDConnectProvider.go +++ b/service/iam/api_op_DeleteOpenIDConnectProvider.go @@ -55,6 +55,9 @@ func addOperationDeleteOpenIDConnectProviderMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteOpenIDConnectProviderMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeletePolicy.go b/service/iam/api_op_DeletePolicy.go index c0b5f24ade4..030a0c586f0 100644 --- a/service/iam/api_op_DeletePolicy.go +++ b/service/iam/api_op_DeletePolicy.go @@ -75,6 +75,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeletePolicyVersion.go b/service/iam/api_op_DeletePolicyVersion.go index 2b321e9fe16..37d76dc21b9 100644 --- a/service/iam/api_op_DeletePolicyVersion.go +++ b/service/iam/api_op_DeletePolicyVersion.go @@ -69,6 +69,9 @@ func addOperationDeletePolicyVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeletePolicyVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteRole.go b/service/iam/api_op_DeleteRole.go index 8585f11e684..09f0743e269 100644 --- a/service/iam/api_op_DeleteRole.go +++ b/service/iam/api_op_DeleteRole.go @@ -56,6 +56,9 @@ func addOperationDeleteRoleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteRoleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteRolePermissionsBoundary.go b/service/iam/api_op_DeleteRolePermissionsBoundary.go index f5039b0e673..c2ce5eee897 100644 --- a/service/iam/api_op_DeleteRolePermissionsBoundary.go +++ b/service/iam/api_op_DeleteRolePermissionsBoundary.go @@ -52,6 +52,9 @@ func addOperationDeleteRolePermissionsBoundaryMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteRolePermissionsBoundaryMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteRolePolicy.go b/service/iam/api_op_DeleteRolePolicy.go index a91b2414713..b8b9194953c 100644 --- a/service/iam/api_op_DeleteRolePolicy.go +++ b/service/iam/api_op_DeleteRolePolicy.go @@ -65,6 +65,9 @@ func addOperationDeleteRolePolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteRolePolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteSAMLProvider.go b/service/iam/api_op_DeleteSAMLProvider.go index 824ac40b400..fe03fd87efb 100644 --- a/service/iam/api_op_DeleteSAMLProvider.go +++ b/service/iam/api_op_DeleteSAMLProvider.go @@ -53,6 +53,9 @@ func addOperationDeleteSAMLProviderMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteSAMLProviderMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteSSHPublicKey.go b/service/iam/api_op_DeleteSSHPublicKey.go index 1e08b90065f..52f47a26bd9 100644 --- a/service/iam/api_op_DeleteSSHPublicKey.go +++ b/service/iam/api_op_DeleteSSHPublicKey.go @@ -63,6 +63,9 @@ func addOperationDeleteSSHPublicKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteSSHPublicKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteServerCertificate.go b/service/iam/api_op_DeleteServerCertificate.go index c4c4f40f9b2..a57a5b6b66b 100644 --- a/service/iam/api_op_DeleteServerCertificate.go +++ b/service/iam/api_op_DeleteServerCertificate.go @@ -64,6 +64,9 @@ func addOperationDeleteServerCertificateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteServerCertificateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteServiceLinkedRole.go b/service/iam/api_op_DeleteServiceLinkedRole.go index dfa0b779355..02a708b0a8c 100644 --- a/service/iam/api_op_DeleteServiceLinkedRole.go +++ b/service/iam/api_op_DeleteServiceLinkedRole.go @@ -72,6 +72,9 @@ func addOperationDeleteServiceLinkedRoleMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDeleteServiceLinkedRoleMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteServiceSpecificCredential.go b/service/iam/api_op_DeleteServiceSpecificCredential.go index f5c5d5f0398..a5b50dc0a82 100644 --- a/service/iam/api_op_DeleteServiceSpecificCredential.go +++ b/service/iam/api_op_DeleteServiceSpecificCredential.go @@ -59,6 +59,9 @@ func addOperationDeleteServiceSpecificCredentialMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteServiceSpecificCredentialMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteSigningCertificate.go b/service/iam/api_op_DeleteSigningCertificate.go index e7f6033c93a..00a813cf0d8 100644 --- a/service/iam/api_op_DeleteSigningCertificate.go +++ b/service/iam/api_op_DeleteSigningCertificate.go @@ -61,6 +61,9 @@ func addOperationDeleteSigningCertificateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteSigningCertificateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteUser.go b/service/iam/api_op_DeleteUser.go index ff59320698b..50c439aa6e4 100644 --- a/service/iam/api_op_DeleteUser.go +++ b/service/iam/api_op_DeleteUser.go @@ -79,6 +79,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteUserPermissionsBoundary.go b/service/iam/api_op_DeleteUserPermissionsBoundary.go index b2b162252bf..c31c396d455 100644 --- a/service/iam/api_op_DeleteUserPermissionsBoundary.go +++ b/service/iam/api_op_DeleteUserPermissionsBoundary.go @@ -51,6 +51,9 @@ func addOperationDeleteUserPermissionsBoundaryMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteUserPermissionsBoundaryMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteUserPolicy.go b/service/iam/api_op_DeleteUserPolicy.go index 48dcc3ef900..86df9e1c9d7 100644 --- a/service/iam/api_op_DeleteUserPolicy.go +++ b/service/iam/api_op_DeleteUserPolicy.go @@ -65,6 +65,9 @@ func addOperationDeleteUserPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteUserPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DeleteVirtualMFADevice.go b/service/iam/api_op_DeleteVirtualMFADevice.go index 345a15da974..8200bfb880b 100644 --- a/service/iam/api_op_DeleteVirtualMFADevice.go +++ b/service/iam/api_op_DeleteVirtualMFADevice.go @@ -54,6 +54,9 @@ func addOperationDeleteVirtualMFADeviceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteVirtualMFADeviceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DetachGroupPolicy.go b/service/iam/api_op_DetachGroupPolicy.go index d71b6108cb9..43b95129ca4 100644 --- a/service/iam/api_op_DetachGroupPolicy.go +++ b/service/iam/api_op_DetachGroupPolicy.go @@ -66,6 +66,9 @@ func addOperationDetachGroupPolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetachGroupPolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DetachRolePolicy.go b/service/iam/api_op_DetachRolePolicy.go index a107806b928..5793b814515 100644 --- a/service/iam/api_op_DetachRolePolicy.go +++ b/service/iam/api_op_DetachRolePolicy.go @@ -66,6 +66,9 @@ func addOperationDetachRolePolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetachRolePolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_DetachUserPolicy.go b/service/iam/api_op_DetachUserPolicy.go index 08fc6b01462..b3b8b6372d6 100644 --- a/service/iam/api_op_DetachUserPolicy.go +++ b/service/iam/api_op_DetachUserPolicy.go @@ -66,6 +66,9 @@ func addOperationDetachUserPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetachUserPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_EnableMFADevice.go b/service/iam/api_op_EnableMFADevice.go index 170d12cf72c..754ed6f35d2 100644 --- a/service/iam/api_op_EnableMFADevice.go +++ b/service/iam/api_op_EnableMFADevice.go @@ -86,6 +86,9 @@ func addOperationEnableMFADeviceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationEnableMFADeviceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GenerateCredentialReport.go b/service/iam/api_op_GenerateCredentialReport.go index 3b3da68ddf9..b499cab6625 100644 --- a/service/iam/api_op_GenerateCredentialReport.go +++ b/service/iam/api_op_GenerateCredentialReport.go @@ -55,6 +55,9 @@ func addOperationGenerateCredentialReportMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGenerateCredentialReportMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GenerateOrganizationsAccessReport.go b/service/iam/api_op_GenerateOrganizationsAccessReport.go index a08bd3f6ad0..82dfcca0b2d 100644 --- a/service/iam/api_op_GenerateOrganizationsAccessReport.go +++ b/service/iam/api_op_GenerateOrganizationsAccessReport.go @@ -170,6 +170,9 @@ func addOperationGenerateOrganizationsAccessReportMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -212,6 +215,9 @@ func addOperationGenerateOrganizationsAccessReportMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GenerateServiceLastAccessedDetails.go b/service/iam/api_op_GenerateServiceLastAccessedDetails.go index ed378b850e9..c94efaf9239 100644 --- a/service/iam/api_op_GenerateServiceLastAccessedDetails.go +++ b/service/iam/api_op_GenerateServiceLastAccessedDetails.go @@ -112,6 +112,9 @@ func addOperationGenerateServiceLastAccessedDetailsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationGenerateServiceLastAccessedDetailsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetAccessKeyLastUsed.go b/service/iam/api_op_GetAccessKeyLastUsed.go index 1466d1488a7..c89bd379a5e 100644 --- a/service/iam/api_op_GetAccessKeyLastUsed.go +++ b/service/iam/api_op_GetAccessKeyLastUsed.go @@ -63,6 +63,9 @@ func addOperationGetAccessKeyLastUsedMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetAccessKeyLastUsedMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetAccountAuthorizationDetails.go b/service/iam/api_op_GetAccountAuthorizationDetails.go index 9d6947b54ea..c4062b62973 100644 --- a/service/iam/api_op_GetAccountAuthorizationDetails.go +++ b/service/iam/api_op_GetAccountAuthorizationDetails.go @@ -101,6 +101,9 @@ func addOperationGetAccountAuthorizationDetailsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationGetAccountAuthorizationDetailsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetAccountPasswordPolicy.go b/service/iam/api_op_GetAccountPasswordPolicy.go index 5aa5bed100f..d5530d795ba 100644 --- a/service/iam/api_op_GetAccountPasswordPolicy.go +++ b/service/iam/api_op_GetAccountPasswordPolicy.go @@ -53,6 +53,9 @@ func addOperationGetAccountPasswordPolicyMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetAccountPasswordPolicyMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetAccountSummary.go b/service/iam/api_op_GetAccountSummary.go index 8acb38e36ba..ff673da5e16 100644 --- a/service/iam/api_op_GetAccountSummary.go +++ b/service/iam/api_op_GetAccountSummary.go @@ -53,6 +53,9 @@ func addOperationGetAccountSummaryMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetAccountSummaryMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetContextKeysForCustomPolicy.go b/service/iam/api_op_GetContextKeysForCustomPolicy.go index ad4ac764f8a..24658197e10 100644 --- a/service/iam/api_op_GetContextKeysForCustomPolicy.go +++ b/service/iam/api_op_GetContextKeysForCustomPolicy.go @@ -77,6 +77,9 @@ func addOperationGetContextKeysForCustomPolicyMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetContextKeysForCustomPolicyMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetContextKeysForPrincipalPolicy.go b/service/iam/api_op_GetContextKeysForPrincipalPolicy.go index 688c234d8b7..9ce1c649584 100644 --- a/service/iam/api_op_GetContextKeysForPrincipalPolicy.go +++ b/service/iam/api_op_GetContextKeysForPrincipalPolicy.go @@ -93,6 +93,9 @@ func addOperationGetContextKeysForPrincipalPolicyMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationGetContextKeysForPrincipalPolicyMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetCredentialReport.go b/service/iam/api_op_GetCredentialReport.go index 3bee036285e..5550d8d07e1 100644 --- a/service/iam/api_op_GetCredentialReport.go +++ b/service/iam/api_op_GetCredentialReport.go @@ -60,6 +60,9 @@ func addOperationGetCredentialReportMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetCredentialReportMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetGroup.go b/service/iam/api_op_GetGroup.go index 3f35357a1c3..110e2586f22 100644 --- a/service/iam/api_op_GetGroup.go +++ b/service/iam/api_op_GetGroup.go @@ -92,6 +92,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetGroupPolicy.go b/service/iam/api_op_GetGroupPolicy.go index d44c28d6b71..261a6762427 100644 --- a/service/iam/api_op_GetGroupPolicy.go +++ b/service/iam/api_op_GetGroupPolicy.go @@ -90,6 +90,9 @@ func addOperationGetGroupPolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetGroupPolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetInstanceProfile.go b/service/iam/api_op_GetInstanceProfile.go index f1c998b0d95..094a2263174 100644 --- a/service/iam/api_op_GetInstanceProfile.go +++ b/service/iam/api_op_GetInstanceProfile.go @@ -63,6 +63,9 @@ func addOperationGetInstanceProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetInstanceProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetLoginProfile.go b/service/iam/api_op_GetLoginProfile.go index b9f10628008..bf69a64158d 100644 --- a/service/iam/api_op_GetLoginProfile.go +++ b/service/iam/api_op_GetLoginProfile.go @@ -61,6 +61,9 @@ func addOperationGetLoginProfileMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetLoginProfileMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetOpenIDConnectProvider.go b/service/iam/api_op_GetOpenIDConnectProvider.go index b2c00088412..58155da21a9 100644 --- a/service/iam/api_op_GetOpenIDConnectProvider.go +++ b/service/iam/api_op_GetOpenIDConnectProvider.go @@ -75,6 +75,9 @@ func addOperationGetOpenIDConnectProviderMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetOpenIDConnectProviderMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetOrganizationsAccessReport.go b/service/iam/api_op_GetOrganizationsAccessReport.go index 6caeaf7c6a4..3b24bc12fb8 100644 --- a/service/iam/api_op_GetOrganizationsAccessReport.go +++ b/service/iam/api_op_GetOrganizationsAccessReport.go @@ -134,6 +134,9 @@ func addOperationGetOrganizationsAccessReportMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationGetOrganizationsAccessReportMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetPolicy.go b/service/iam/api_op_GetPolicy.go index 46984dec161..1f4d28fc2a8 100644 --- a/service/iam/api_op_GetPolicy.go +++ b/service/iam/api_op_GetPolicy.go @@ -69,6 +69,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetPolicyVersion.go b/service/iam/api_op_GetPolicyVersion.go index 30d151cef87..fef88bf2ab9 100644 --- a/service/iam/api_op_GetPolicyVersion.go +++ b/service/iam/api_op_GetPolicyVersion.go @@ -82,6 +82,9 @@ func addOperationGetPolicyVersionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetPolicyVersionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetRole.go b/service/iam/api_op_GetRole.go index eb3fb5384db..1fd6caabf37 100644 --- a/service/iam/api_op_GetRole.go +++ b/service/iam/api_op_GetRole.go @@ -67,6 +67,9 @@ func addOperationGetRoleMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetRoleMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetRolePolicy.go b/service/iam/api_op_GetRolePolicy.go index 771ffff751c..ed91ef5988c 100644 --- a/service/iam/api_op_GetRolePolicy.go +++ b/service/iam/api_op_GetRolePolicy.go @@ -92,6 +92,9 @@ func addOperationGetRolePolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetRolePolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetSAMLProvider.go b/service/iam/api_op_GetSAMLProvider.go index feda08a1637..496b064000d 100644 --- a/service/iam/api_op_GetSAMLProvider.go +++ b/service/iam/api_op_GetSAMLProvider.go @@ -67,6 +67,9 @@ func addOperationGetSAMLProviderMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetSAMLProviderMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetSSHPublicKey.go b/service/iam/api_op_GetSSHPublicKey.go index 1eea4a2ae75..ee0d5ee689d 100644 --- a/service/iam/api_op_GetSSHPublicKey.go +++ b/service/iam/api_op_GetSSHPublicKey.go @@ -77,6 +77,9 @@ func addOperationGetSSHPublicKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetSSHPublicKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetServerCertificate.go b/service/iam/api_op_GetServerCertificate.go index 2c07f17173b..fbe4b31763e 100644 --- a/service/iam/api_op_GetServerCertificate.go +++ b/service/iam/api_op_GetServerCertificate.go @@ -64,6 +64,9 @@ func addOperationGetServerCertificateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetServerCertificateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetServiceLastAccessedDetails.go b/service/iam/api_op_GetServiceLastAccessedDetails.go index b5ce2908c0d..83fc6d4623a 100644 --- a/service/iam/api_op_GetServiceLastAccessedDetails.go +++ b/service/iam/api_op_GetServiceLastAccessedDetails.go @@ -157,6 +157,9 @@ func addOperationGetServiceLastAccessedDetailsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -199,6 +202,9 @@ func addOperationGetServiceLastAccessedDetailsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go b/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go index 89df6ebee63..eba41b1a240 100644 --- a/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go +++ b/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go @@ -141,6 +141,9 @@ func addOperationGetServiceLastAccessedDetailsWithEntitiesMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationGetServiceLastAccessedDetailsWithEntitiesMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go b/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go index 9b4e6e80082..c9bfb2e190b 100644 --- a/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go +++ b/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go @@ -64,6 +64,9 @@ func addOperationGetServiceLinkedRoleDeletionStatusMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetServiceLinkedRoleDeletionStatusMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetUser.go b/service/iam/api_op_GetUser.go index 03eec53d4e4..763c587f752 100644 --- a/service/iam/api_op_GetUser.go +++ b/service/iam/api_op_GetUser.go @@ -77,6 +77,9 @@ func addOperationGetUserMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetUserMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_GetUserPolicy.go b/service/iam/api_op_GetUserPolicy.go index 2348ee7788b..101279a8175 100644 --- a/service/iam/api_op_GetUserPolicy.go +++ b/service/iam/api_op_GetUserPolicy.go @@ -90,6 +90,9 @@ func addOperationGetUserPolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetUserPolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListAccessKeys.go b/service/iam/api_op_ListAccessKeys.go index 69bfae8e035..7e152c74867 100644 --- a/service/iam/api_op_ListAccessKeys.go +++ b/service/iam/api_op_ListAccessKeys.go @@ -93,6 +93,9 @@ func addOperationListAccessKeysMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListAccessKeysMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListAccountAliases.go b/service/iam/api_op_ListAccountAliases.go index b1842a60391..f4f935175e8 100644 --- a/service/iam/api_op_ListAccountAliases.go +++ b/service/iam/api_op_ListAccountAliases.go @@ -82,6 +82,9 @@ func addOperationListAccountAliasesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListAccountAliasesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListAttachedGroupPolicies.go b/service/iam/api_op_ListAttachedGroupPolicies.go index 7fb35c4d078..e97b963b611 100644 --- a/service/iam/api_op_ListAttachedGroupPolicies.go +++ b/service/iam/api_op_ListAttachedGroupPolicies.go @@ -103,6 +103,9 @@ func addOperationListAttachedGroupPoliciesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationListAttachedGroupPoliciesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListAttachedRolePolicies.go b/service/iam/api_op_ListAttachedRolePolicies.go index 9fc0d4524ee..47aa92b417e 100644 --- a/service/iam/api_op_ListAttachedRolePolicies.go +++ b/service/iam/api_op_ListAttachedRolePolicies.go @@ -103,6 +103,9 @@ func addOperationListAttachedRolePoliciesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationListAttachedRolePoliciesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListAttachedUserPolicies.go b/service/iam/api_op_ListAttachedUserPolicies.go index 11566cc7923..22bbc41c9d1 100644 --- a/service/iam/api_op_ListAttachedUserPolicies.go +++ b/service/iam/api_op_ListAttachedUserPolicies.go @@ -103,6 +103,9 @@ func addOperationListAttachedUserPoliciesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationListAttachedUserPoliciesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListEntitiesForPolicy.go b/service/iam/api_op_ListEntitiesForPolicy.go index 0d1ad7b5352..db54d190a27 100644 --- a/service/iam/api_op_ListEntitiesForPolicy.go +++ b/service/iam/api_op_ListEntitiesForPolicy.go @@ -119,6 +119,9 @@ func addOperationListEntitiesForPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationListEntitiesForPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListGroupPolicies.go b/service/iam/api_op_ListGroupPolicies.go index eb31095b381..0541a3a2d18 100644 --- a/service/iam/api_op_ListGroupPolicies.go +++ b/service/iam/api_op_ListGroupPolicies.go @@ -95,6 +95,9 @@ func addOperationListGroupPoliciesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationListGroupPoliciesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListGroups.go b/service/iam/api_op_ListGroups.go index b1c1910a278..76c8540b34b 100644 --- a/service/iam/api_op_ListGroups.go +++ b/service/iam/api_op_ListGroups.go @@ -90,6 +90,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListGroupsForUser.go b/service/iam/api_op_ListGroupsForUser.go index 2ea081bed99..c79ab9c88c1 100644 --- a/service/iam/api_op_ListGroupsForUser.go +++ b/service/iam/api_op_ListGroupsForUser.go @@ -87,6 +87,9 @@ func addOperationListGroupsForUserMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListGroupsForUserMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListInstanceProfiles.go b/service/iam/api_op_ListInstanceProfiles.go index 372832f06c2..6b6aae75789 100644 --- a/service/iam/api_op_ListInstanceProfiles.go +++ b/service/iam/api_op_ListInstanceProfiles.go @@ -93,6 +93,9 @@ func addOperationListInstanceProfilesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListInstanceProfilesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListInstanceProfilesForRole.go b/service/iam/api_op_ListInstanceProfilesForRole.go index e72d4dded39..0326299586b 100644 --- a/service/iam/api_op_ListInstanceProfilesForRole.go +++ b/service/iam/api_op_ListInstanceProfilesForRole.go @@ -90,6 +90,9 @@ func addOperationListInstanceProfilesForRoleMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListInstanceProfilesForRoleMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListMFADevices.go b/service/iam/api_op_ListMFADevices.go index 78b31457079..0816077e6a4 100644 --- a/service/iam/api_op_ListMFADevices.go +++ b/service/iam/api_op_ListMFADevices.go @@ -88,6 +88,9 @@ func addOperationListMFADevicesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListMFADevicesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListOpenIDConnectProviders.go b/service/iam/api_op_ListOpenIDConnectProviders.go index 075796da043..08d998b9a06 100644 --- a/service/iam/api_op_ListOpenIDConnectProviders.go +++ b/service/iam/api_op_ListOpenIDConnectProviders.go @@ -50,6 +50,9 @@ func addOperationListOpenIDConnectProvidersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationListOpenIDConnectProvidersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListPolicies.go b/service/iam/api_op_ListPolicies.go index 270bec4a2c4..3bf726b7207 100644 --- a/service/iam/api_op_ListPolicies.go +++ b/service/iam/api_op_ListPolicies.go @@ -113,6 +113,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListPoliciesGrantingServiceAccess.go b/service/iam/api_op_ListPoliciesGrantingServiceAccess.go index d8b7119c625..9cfa817a062 100644 --- a/service/iam/api_op_ListPoliciesGrantingServiceAccess.go +++ b/service/iam/api_op_ListPoliciesGrantingServiceAccess.go @@ -119,6 +119,9 @@ func addOperationListPoliciesGrantingServiceAccessMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationListPoliciesGrantingServiceAccessMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListPolicyVersions.go b/service/iam/api_op_ListPolicyVersions.go index 4375eabe380..f8f3da06300 100644 --- a/service/iam/api_op_ListPolicyVersions.go +++ b/service/iam/api_op_ListPolicyVersions.go @@ -92,6 +92,9 @@ func addOperationListPolicyVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListPolicyVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListRolePolicies.go b/service/iam/api_op_ListRolePolicies.go index 0dc889dd0d2..5d2eed96f94 100644 --- a/service/iam/api_op_ListRolePolicies.go +++ b/service/iam/api_op_ListRolePolicies.go @@ -92,6 +92,9 @@ func addOperationListRolePoliciesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListRolePoliciesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListRoleTags.go b/service/iam/api_op_ListRoleTags.go index f1a45f2f18c..4fcc306fa4b 100644 --- a/service/iam/api_op_ListRoleTags.go +++ b/service/iam/api_op_ListRoleTags.go @@ -90,6 +90,9 @@ func addOperationListRoleTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListRoleTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListRoles.go b/service/iam/api_op_ListRoles.go index d9e368dfe7c..b4060295f70 100644 --- a/service/iam/api_op_ListRoles.go +++ b/service/iam/api_op_ListRoles.go @@ -93,6 +93,9 @@ func addOperationListRolesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListRolesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListSAMLProviders.go b/service/iam/api_op_ListSAMLProviders.go index 57c89429582..453ce403c61 100644 --- a/service/iam/api_op_ListSAMLProviders.go +++ b/service/iam/api_op_ListSAMLProviders.go @@ -51,6 +51,9 @@ func addOperationListSAMLProvidersMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationListSAMLProvidersMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListSSHPublicKeys.go b/service/iam/api_op_ListSSHPublicKeys.go index 1e75f3b50ee..73335e4f280 100644 --- a/service/iam/api_op_ListSSHPublicKeys.go +++ b/service/iam/api_op_ListSSHPublicKeys.go @@ -93,6 +93,9 @@ func addOperationListSSHPublicKeysMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListSSHPublicKeysMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListServerCertificates.go b/service/iam/api_op_ListServerCertificates.go index 40fdc9acb14..d1fb48b2964 100644 --- a/service/iam/api_op_ListServerCertificates.go +++ b/service/iam/api_op_ListServerCertificates.go @@ -95,6 +95,9 @@ func addOperationListServerCertificatesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListServerCertificatesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListServiceSpecificCredentials.go b/service/iam/api_op_ListServiceSpecificCredentials.go index af5f2cb9666..b46c904a04f 100644 --- a/service/iam/api_op_ListServiceSpecificCredentials.go +++ b/service/iam/api_op_ListServiceSpecificCredentials.go @@ -68,6 +68,9 @@ func addOperationListServiceSpecificCredentialsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListServiceSpecificCredentialsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListSigningCertificates.go b/service/iam/api_op_ListSigningCertificates.go index 7c95c311b03..dd2cb0fa022 100644 --- a/service/iam/api_op_ListSigningCertificates.go +++ b/service/iam/api_op_ListSigningCertificates.go @@ -92,6 +92,9 @@ func addOperationListSigningCertificatesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListSigningCertificatesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListUserPolicies.go b/service/iam/api_op_ListUserPolicies.go index db1b046b16a..5b3958b5bea 100644 --- a/service/iam/api_op_ListUserPolicies.go +++ b/service/iam/api_op_ListUserPolicies.go @@ -92,6 +92,9 @@ func addOperationListUserPoliciesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListUserPoliciesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListUserTags.go b/service/iam/api_op_ListUserTags.go index fd76b4065ee..053259b647e 100644 --- a/service/iam/api_op_ListUserTags.go +++ b/service/iam/api_op_ListUserTags.go @@ -89,6 +89,9 @@ func addOperationListUserTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListUserTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListUsers.go b/service/iam/api_op_ListUsers.go index f50241ecf5b..5be1fb1100d 100644 --- a/service/iam/api_op_ListUsers.go +++ b/service/iam/api_op_ListUsers.go @@ -92,6 +92,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ListVirtualMFADevices.go b/service/iam/api_op_ListVirtualMFADevices.go index e6cc81e0c91..7c91accfbfb 100644 --- a/service/iam/api_op_ListVirtualMFADevices.go +++ b/service/iam/api_op_ListVirtualMFADevices.go @@ -87,6 +87,9 @@ func addOperationListVirtualMFADevicesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListVirtualMFADevicesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_PutGroupPolicy.go b/service/iam/api_op_PutGroupPolicy.go index 4efd9c34e83..59266a49f55 100644 --- a/service/iam/api_op_PutGroupPolicy.go +++ b/service/iam/api_op_PutGroupPolicy.go @@ -92,6 +92,9 @@ func addOperationPutGroupPolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationPutGroupPolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_PutRolePermissionsBoundary.go b/service/iam/api_op_PutRolePermissionsBoundary.go index 3463c3467c5..b2eceb48fac 100644 --- a/service/iam/api_op_PutRolePermissionsBoundary.go +++ b/service/iam/api_op_PutRolePermissionsBoundary.go @@ -64,6 +64,9 @@ func addOperationPutRolePermissionsBoundaryMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationPutRolePermissionsBoundaryMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_PutRolePolicy.go b/service/iam/api_op_PutRolePolicy.go index e3ee26e0464..6b205ab151a 100644 --- a/service/iam/api_op_PutRolePolicy.go +++ b/service/iam/api_op_PutRolePolicy.go @@ -97,6 +97,9 @@ func addOperationPutRolePolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationPutRolePolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_PutUserPermissionsBoundary.go b/service/iam/api_op_PutUserPermissionsBoundary.go index 6cd4fba8067..83353ed2fbf 100644 --- a/service/iam/api_op_PutUserPermissionsBoundary.go +++ b/service/iam/api_op_PutUserPermissionsBoundary.go @@ -63,6 +63,9 @@ func addOperationPutUserPermissionsBoundaryMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPutUserPermissionsBoundaryMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_PutUserPolicy.go b/service/iam/api_op_PutUserPolicy.go index 6908d6e759a..6de8213eed1 100644 --- a/service/iam/api_op_PutUserPolicy.go +++ b/service/iam/api_op_PutUserPolicy.go @@ -92,6 +92,9 @@ func addOperationPutUserPolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationPutUserPolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go b/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go index 4eb97fd747d..5e2e8f8f2d9 100644 --- a/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go +++ b/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go @@ -63,6 +63,9 @@ func addOperationRemoveClientIDFromOpenIDConnectProviderMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRemoveClientIDFromOpenIDConnectProviderMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_RemoveRoleFromInstanceProfile.go b/service/iam/api_op_RemoveRoleFromInstanceProfile.go index 0ae7dedab66..ce8a1d8737f 100644 --- a/service/iam/api_op_RemoveRoleFromInstanceProfile.go +++ b/service/iam/api_op_RemoveRoleFromInstanceProfile.go @@ -67,6 +67,9 @@ func addOperationRemoveRoleFromInstanceProfileMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRemoveRoleFromInstanceProfileMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_RemoveUserFromGroup.go b/service/iam/api_op_RemoveUserFromGroup.go index 60c4f565c3a..e9a410ae1a9 100644 --- a/service/iam/api_op_RemoveUserFromGroup.go +++ b/service/iam/api_op_RemoveUserFromGroup.go @@ -59,6 +59,9 @@ func addOperationRemoveUserFromGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRemoveUserFromGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ResetServiceSpecificCredential.go b/service/iam/api_op_ResetServiceSpecificCredential.go index 062d10785db..7f92f97be76 100644 --- a/service/iam/api_op_ResetServiceSpecificCredential.go +++ b/service/iam/api_op_ResetServiceSpecificCredential.go @@ -68,6 +68,9 @@ func addOperationResetServiceSpecificCredentialMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationResetServiceSpecificCredentialMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_ResyncMFADevice.go b/service/iam/api_op_ResyncMFADevice.go index 928c9a4a84d..b6300dd6cec 100644 --- a/service/iam/api_op_ResyncMFADevice.go +++ b/service/iam/api_op_ResyncMFADevice.go @@ -75,6 +75,9 @@ func addOperationResyncMFADeviceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationResyncMFADeviceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_SetDefaultPolicyVersion.go b/service/iam/api_op_SetDefaultPolicyVersion.go index 0e38b50bcce..a0752226ce3 100644 --- a/service/iam/api_op_SetDefaultPolicyVersion.go +++ b/service/iam/api_op_SetDefaultPolicyVersion.go @@ -66,6 +66,9 @@ func addOperationSetDefaultPolicyVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationSetDefaultPolicyVersionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_SetSecurityTokenServicePreferences.go b/service/iam/api_op_SetSecurityTokenServicePreferences.go index 28390566601..1d4397fb457 100644 --- a/service/iam/api_op_SetSecurityTokenServicePreferences.go +++ b/service/iam/api_op_SetSecurityTokenServicePreferences.go @@ -74,6 +74,9 @@ func addOperationSetSecurityTokenServicePreferencesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationSetSecurityTokenServicePreferencesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_SimulateCustomPolicy.go b/service/iam/api_op_SimulateCustomPolicy.go index 4cc4f9f24b0..43fcf748886 100644 --- a/service/iam/api_op_SimulateCustomPolicy.go +++ b/service/iam/api_op_SimulateCustomPolicy.go @@ -238,6 +238,9 @@ func addOperationSimulateCustomPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -280,6 +283,9 @@ func addOperationSimulateCustomPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_SimulatePrincipalPolicy.go b/service/iam/api_op_SimulatePrincipalPolicy.go index 526e752cb0d..b9ddca889c9 100644 --- a/service/iam/api_op_SimulatePrincipalPolicy.go +++ b/service/iam/api_op_SimulatePrincipalPolicy.go @@ -255,6 +255,9 @@ func addOperationSimulatePrincipalPolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -297,6 +300,9 @@ func addOperationSimulatePrincipalPolicyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_TagRole.go b/service/iam/api_op_TagRole.go index 9fd31fdc9fb..5fb807c0c10 100644 --- a/service/iam/api_op_TagRole.go +++ b/service/iam/api_op_TagRole.go @@ -92,6 +92,9 @@ func addOperationTagRoleMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationTagRoleMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_TagUser.go b/service/iam/api_op_TagUser.go index ccfe12bd9ff..00ed9c0bdbd 100644 --- a/service/iam/api_op_TagUser.go +++ b/service/iam/api_op_TagUser.go @@ -91,6 +91,9 @@ func addOperationTagUserMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationTagUserMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UntagRole.go b/service/iam/api_op_UntagRole.go index 1877b00a2b2..21ab90f9067 100644 --- a/service/iam/api_op_UntagRole.go +++ b/service/iam/api_op_UntagRole.go @@ -60,6 +60,9 @@ func addOperationUntagRoleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagRoleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UntagUser.go b/service/iam/api_op_UntagUser.go index 73c78a9d92b..38cda066a3f 100644 --- a/service/iam/api_op_UntagUser.go +++ b/service/iam/api_op_UntagUser.go @@ -60,6 +60,9 @@ func addOperationUntagUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateAccessKey.go b/service/iam/api_op_UpdateAccessKey.go index a20847654d0..37de1a973e4 100644 --- a/service/iam/api_op_UpdateAccessKey.go +++ b/service/iam/api_op_UpdateAccessKey.go @@ -73,6 +73,9 @@ func addOperationUpdateAccessKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateAccessKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateAccountPasswordPolicy.go b/service/iam/api_op_UpdateAccountPasswordPolicy.go index 16690232615..21223e8cd7a 100644 --- a/service/iam/api_op_UpdateAccountPasswordPolicy.go +++ b/service/iam/api_op_UpdateAccountPasswordPolicy.go @@ -113,6 +113,9 @@ func addOperationUpdateAccountPasswordPolicyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationUpdateAccountPasswordPolicyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateAssumeRolePolicy.go b/service/iam/api_op_UpdateAssumeRolePolicy.go index edbefd01392..80d5effe942 100644 --- a/service/iam/api_op_UpdateAssumeRolePolicy.go +++ b/service/iam/api_op_UpdateAssumeRolePolicy.go @@ -74,6 +74,9 @@ func addOperationUpdateAssumeRolePolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateAssumeRolePolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateGroup.go b/service/iam/api_op_UpdateGroup.go index 2646a3f81ae..d2676b89725 100644 --- a/service/iam/api_op_UpdateGroup.go +++ b/service/iam/api_op_UpdateGroup.go @@ -76,6 +76,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateLoginProfile.go b/service/iam/api_op_UpdateLoginProfile.go index 0d7779bbb1c..9502839b34a 100644 --- a/service/iam/api_op_UpdateLoginProfile.go +++ b/service/iam/api_op_UpdateLoginProfile.go @@ -78,6 +78,9 @@ func addOperationUpdateLoginProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateLoginProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go b/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go index 7f3d5dcaaf6..430f852c99a 100644 --- a/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go +++ b/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go @@ -69,6 +69,9 @@ func addOperationUpdateOpenIDConnectProviderThumbprintMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateOpenIDConnectProviderThumbprintMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateRole.go b/service/iam/api_op_UpdateRole.go index 93ce89e17ad..467591871cf 100644 --- a/service/iam/api_op_UpdateRole.go +++ b/service/iam/api_op_UpdateRole.go @@ -66,6 +66,9 @@ func addOperationUpdateRoleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateRoleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateRoleDescription.go b/service/iam/api_op_UpdateRoleDescription.go index 339529f9c00..d5366af3542 100644 --- a/service/iam/api_op_UpdateRoleDescription.go +++ b/service/iam/api_op_UpdateRoleDescription.go @@ -60,6 +60,9 @@ func addOperationUpdateRoleDescriptionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateRoleDescriptionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateSAMLProvider.go b/service/iam/api_op_UpdateSAMLProvider.go index 9161b529b81..499bfa62ec5 100644 --- a/service/iam/api_op_UpdateSAMLProvider.go +++ b/service/iam/api_op_UpdateSAMLProvider.go @@ -68,6 +68,9 @@ func addOperationUpdateSAMLProviderMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateSAMLProviderMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateSSHPublicKey.go b/service/iam/api_op_UpdateSSHPublicKey.go index b9f5664f1fb..73ae42a1b03 100644 --- a/service/iam/api_op_UpdateSSHPublicKey.go +++ b/service/iam/api_op_UpdateSSHPublicKey.go @@ -74,6 +74,9 @@ func addOperationUpdateSSHPublicKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateSSHPublicKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateServerCertificate.go b/service/iam/api_op_UpdateServerCertificate.go index 00068018b9b..bda4e656239 100644 --- a/service/iam/api_op_UpdateServerCertificate.go +++ b/service/iam/api_op_UpdateServerCertificate.go @@ -85,6 +85,9 @@ func addOperationUpdateServerCertificateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationUpdateServerCertificateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateServiceSpecificCredential.go b/service/iam/api_op_UpdateServiceSpecificCredential.go index 299f9bbbe02..dce99f525c4 100644 --- a/service/iam/api_op_UpdateServiceSpecificCredential.go +++ b/service/iam/api_op_UpdateServiceSpecificCredential.go @@ -67,6 +67,9 @@ func addOperationUpdateServiceSpecificCredentialMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateServiceSpecificCredentialMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateSigningCertificate.go b/service/iam/api_op_UpdateSigningCertificate.go index 18edbeb5ee6..cba18613532 100644 --- a/service/iam/api_op_UpdateSigningCertificate.go +++ b/service/iam/api_op_UpdateSigningCertificate.go @@ -70,6 +70,9 @@ func addOperationUpdateSigningCertificateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateSigningCertificateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UpdateUser.go b/service/iam/api_op_UpdateUser.go index 93b51397417..36f8ee7a2f0 100644 --- a/service/iam/api_op_UpdateUser.go +++ b/service/iam/api_op_UpdateUser.go @@ -78,6 +78,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UploadSSHPublicKey.go b/service/iam/api_op_UploadSSHPublicKey.go index 11072c1fa74..b65909caf6b 100644 --- a/service/iam/api_op_UploadSSHPublicKey.go +++ b/service/iam/api_op_UploadSSHPublicKey.go @@ -82,6 +82,9 @@ func addOperationUploadSSHPublicKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUploadSSHPublicKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UploadServerCertificate.go b/service/iam/api_op_UploadServerCertificate.go index bd91b8fe9d6..b989d7d7be7 100644 --- a/service/iam/api_op_UploadServerCertificate.go +++ b/service/iam/api_op_UploadServerCertificate.go @@ -148,6 +148,9 @@ func addOperationUploadServerCertificateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationUploadServerCertificateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/api_op_UploadSigningCertificate.go b/service/iam/api_op_UploadSigningCertificate.go index 1b8413fe9c3..390d2284310 100644 --- a/service/iam/api_op_UploadSigningCertificate.go +++ b/service/iam/api_op_UploadSigningCertificate.go @@ -89,6 +89,9 @@ func addOperationUploadSigningCertificateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationUploadSigningCertificateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iam/go.mod b/service/iam/go.mod index fcd89fbf22f..7678467429c 100644 --- a/service/iam/go.mod +++ b/service/iam/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iam go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iam/go.sum b/service/iam/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iam/go.sum +++ b/service/iam/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/identitystore/api_client.go b/service/identitystore/api_client.go index d4160831b5a..f98dfcdfa68 100644 --- a/service/identitystore/api_client.go +++ b/service/identitystore/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/identitystore/api_op_DescribeGroup.go b/service/identitystore/api_op_DescribeGroup.go index f870c255cd6..0aef1714879 100644 --- a/service/identitystore/api_op_DescribeGroup.go +++ b/service/identitystore/api_op_DescribeGroup.go @@ -72,6 +72,9 @@ func addOperationDescribeGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/identitystore/api_op_DescribeUser.go b/service/identitystore/api_op_DescribeUser.go index 3600c02c304..4ac6d9cd7f8 100644 --- a/service/identitystore/api_op_DescribeUser.go +++ b/service/identitystore/api_op_DescribeUser.go @@ -71,6 +71,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/identitystore/api_op_ListGroups.go b/service/identitystore/api_op_ListGroups.go index b0e2ddab88d..0d0370e47a0 100644 --- a/service/identitystore/api_op_ListGroups.go +++ b/service/identitystore/api_op_ListGroups.go @@ -81,6 +81,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/identitystore/api_op_ListUsers.go b/service/identitystore/api_op_ListUsers.go index 54f3de5e44d..3864679e1fd 100644 --- a/service/identitystore/api_op_ListUsers.go +++ b/service/identitystore/api_op_ListUsers.go @@ -81,6 +81,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/identitystore/go.mod b/service/identitystore/go.mod index 938e20bf928..8abc9812db4 100644 --- a/service/identitystore/go.mod +++ b/service/identitystore/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/identitystore go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/identitystore/go.sum b/service/identitystore/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/identitystore/go.sum +++ b/service/identitystore/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/imagebuilder/api_client.go b/service/imagebuilder/api_client.go index 4bb0b0e7b74..ad4d144dfe6 100644 --- a/service/imagebuilder/api_client.go +++ b/service/imagebuilder/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/imagebuilder/api_op_CancelImageCreation.go b/service/imagebuilder/api_op_CancelImageCreation.go index 6625db5b9ca..c431c6110e5 100644 --- a/service/imagebuilder/api_op_CancelImageCreation.go +++ b/service/imagebuilder/api_op_CancelImageCreation.go @@ -65,6 +65,9 @@ func addOperationCancelImageCreationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCancelImageCreationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_CreateComponent.go b/service/imagebuilder/api_op_CreateComponent.go index 79d69de3ec6..819e38adfef 100644 --- a/service/imagebuilder/api_op_CreateComponent.go +++ b/service/imagebuilder/api_op_CreateComponent.go @@ -108,6 +108,9 @@ func addOperationCreateComponentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationCreateComponentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_CreateDistributionConfiguration.go b/service/imagebuilder/api_op_CreateDistributionConfiguration.go index 01761a682f8..08413055b1b 100644 --- a/service/imagebuilder/api_op_CreateDistributionConfiguration.go +++ b/service/imagebuilder/api_op_CreateDistributionConfiguration.go @@ -78,6 +78,9 @@ func addOperationCreateDistributionConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateDistributionConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_CreateImage.go b/service/imagebuilder/api_op_CreateImage.go index f4cef37b7ff..3866e95ef32 100644 --- a/service/imagebuilder/api_op_CreateImage.go +++ b/service/imagebuilder/api_op_CreateImage.go @@ -88,6 +88,9 @@ func addOperationCreateImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_CreateImagePipeline.go b/service/imagebuilder/api_op_CreateImagePipeline.go index 779303650bb..18a2288f280 100644 --- a/service/imagebuilder/api_op_CreateImagePipeline.go +++ b/service/imagebuilder/api_op_CreateImagePipeline.go @@ -103,6 +103,9 @@ func addOperationCreateImagePipelineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationCreateImagePipelineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_CreateImageRecipe.go b/service/imagebuilder/api_op_CreateImageRecipe.go index 408c4c3e135..bfa62f16226 100644 --- a/service/imagebuilder/api_op_CreateImageRecipe.go +++ b/service/imagebuilder/api_op_CreateImageRecipe.go @@ -100,6 +100,9 @@ func addOperationCreateImageRecipeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateImageRecipeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go b/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go index 05269525af3..e7b0f21605d 100644 --- a/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go @@ -109,6 +109,9 @@ func addOperationCreateInfrastructureConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationCreateInfrastructureConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_DeleteComponent.go b/service/imagebuilder/api_op_DeleteComponent.go index 1216a333034..25a94323b63 100644 --- a/service/imagebuilder/api_op_DeleteComponent.go +++ b/service/imagebuilder/api_op_DeleteComponent.go @@ -55,6 +55,9 @@ func addOperationDeleteComponentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteComponentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_DeleteDistributionConfiguration.go b/service/imagebuilder/api_op_DeleteDistributionConfiguration.go index 3e4ae2bd3db..3f6449f684f 100644 --- a/service/imagebuilder/api_op_DeleteDistributionConfiguration.go +++ b/service/imagebuilder/api_op_DeleteDistributionConfiguration.go @@ -56,6 +56,9 @@ func addOperationDeleteDistributionConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteDistributionConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_DeleteImage.go b/service/imagebuilder/api_op_DeleteImage.go index 07f23770761..041bd3f1c29 100644 --- a/service/imagebuilder/api_op_DeleteImage.go +++ b/service/imagebuilder/api_op_DeleteImage.go @@ -55,6 +55,9 @@ func addOperationDeleteImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_DeleteImagePipeline.go b/service/imagebuilder/api_op_DeleteImagePipeline.go index 72f38f38060..f15bd15d1fa 100644 --- a/service/imagebuilder/api_op_DeleteImagePipeline.go +++ b/service/imagebuilder/api_op_DeleteImagePipeline.go @@ -55,6 +55,9 @@ func addOperationDeleteImagePipelineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteImagePipelineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_DeleteImageRecipe.go b/service/imagebuilder/api_op_DeleteImageRecipe.go index ccfa5235d8a..049aa9c0d03 100644 --- a/service/imagebuilder/api_op_DeleteImageRecipe.go +++ b/service/imagebuilder/api_op_DeleteImageRecipe.go @@ -55,6 +55,9 @@ func addOperationDeleteImageRecipeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteImageRecipeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go b/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go index c101d672638..130da4cafbf 100644 --- a/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go @@ -56,6 +56,9 @@ func addOperationDeleteInfrastructureConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteInfrastructureConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetComponent.go b/service/imagebuilder/api_op_GetComponent.go index c803c232ef7..13072217ce4 100644 --- a/service/imagebuilder/api_op_GetComponent.go +++ b/service/imagebuilder/api_op_GetComponent.go @@ -57,6 +57,9 @@ func addOperationGetComponentMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetComponentMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetComponentPolicy.go b/service/imagebuilder/api_op_GetComponentPolicy.go index 56889c625b1..c4c15840b24 100644 --- a/service/imagebuilder/api_op_GetComponentPolicy.go +++ b/service/imagebuilder/api_op_GetComponentPolicy.go @@ -56,6 +56,9 @@ func addOperationGetComponentPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetComponentPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetDistributionConfiguration.go b/service/imagebuilder/api_op_GetDistributionConfiguration.go index 7b8b6683e97..1a1ae0e3e1e 100644 --- a/service/imagebuilder/api_op_GetDistributionConfiguration.go +++ b/service/imagebuilder/api_op_GetDistributionConfiguration.go @@ -57,6 +57,9 @@ func addOperationGetDistributionConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetDistributionConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetImage.go b/service/imagebuilder/api_op_GetImage.go index 45cba8c2e0f..75973774276 100644 --- a/service/imagebuilder/api_op_GetImage.go +++ b/service/imagebuilder/api_op_GetImage.go @@ -56,6 +56,9 @@ func addOperationGetImageMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetImageMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetImagePipeline.go b/service/imagebuilder/api_op_GetImagePipeline.go index e62701a5ecb..2d807e80c56 100644 --- a/service/imagebuilder/api_op_GetImagePipeline.go +++ b/service/imagebuilder/api_op_GetImagePipeline.go @@ -56,6 +56,9 @@ func addOperationGetImagePipelineMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetImagePipelineMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetImagePolicy.go b/service/imagebuilder/api_op_GetImagePolicy.go index dd01cbcf942..330994a0a7e 100644 --- a/service/imagebuilder/api_op_GetImagePolicy.go +++ b/service/imagebuilder/api_op_GetImagePolicy.go @@ -55,6 +55,9 @@ func addOperationGetImagePolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetImagePolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetImageRecipe.go b/service/imagebuilder/api_op_GetImageRecipe.go index 4f11101677c..6bd82b43786 100644 --- a/service/imagebuilder/api_op_GetImageRecipe.go +++ b/service/imagebuilder/api_op_GetImageRecipe.go @@ -56,6 +56,9 @@ func addOperationGetImageRecipeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetImageRecipeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetImageRecipePolicy.go b/service/imagebuilder/api_op_GetImageRecipePolicy.go index 46d537a196d..a24f48ca55a 100644 --- a/service/imagebuilder/api_op_GetImageRecipePolicy.go +++ b/service/imagebuilder/api_op_GetImageRecipePolicy.go @@ -56,6 +56,9 @@ func addOperationGetImageRecipePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetImageRecipePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_GetInfrastructureConfiguration.go b/service/imagebuilder/api_op_GetInfrastructureConfiguration.go index 040df19958c..23fadd9ecc4 100644 --- a/service/imagebuilder/api_op_GetInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_GetInfrastructureConfiguration.go @@ -59,6 +59,9 @@ func addOperationGetInfrastructureConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetInfrastructureConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ImportComponent.go b/service/imagebuilder/api_op_ImportComponent.go index 454aba33247..76574677e81 100644 --- a/service/imagebuilder/api_op_ImportComponent.go +++ b/service/imagebuilder/api_op_ImportComponent.go @@ -112,6 +112,9 @@ func addOperationImportComponentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationImportComponentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListComponentBuildVersions.go b/service/imagebuilder/api_op_ListComponentBuildVersions.go index 7f7d2014510..34509dd6c7b 100644 --- a/service/imagebuilder/api_op_ListComponentBuildVersions.go +++ b/service/imagebuilder/api_op_ListComponentBuildVersions.go @@ -69,6 +69,9 @@ func addOperationListComponentBuildVersionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListComponentBuildVersionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListComponents.go b/service/imagebuilder/api_op_ListComponents.go index 769dd12d74e..8bb9403c98e 100644 --- a/service/imagebuilder/api_op_ListComponents.go +++ b/service/imagebuilder/api_op_ListComponents.go @@ -72,6 +72,9 @@ func addOperationListComponentsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListComponentsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListDistributionConfigurations.go b/service/imagebuilder/api_op_ListDistributionConfigurations.go index 9d15160e9d8..4a25581aff8 100644 --- a/service/imagebuilder/api_op_ListDistributionConfigurations.go +++ b/service/imagebuilder/api_op_ListDistributionConfigurations.go @@ -68,6 +68,9 @@ func addOperationListDistributionConfigurationsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListDistributionConfigurationsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListImageBuildVersions.go b/service/imagebuilder/api_op_ListImageBuildVersions.go index cdbc8de786c..f57485555c8 100644 --- a/service/imagebuilder/api_op_ListImageBuildVersions.go +++ b/service/imagebuilder/api_op_ListImageBuildVersions.go @@ -72,6 +72,9 @@ func addOperationListImageBuildVersionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListImageBuildVersionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListImagePipelineImages.go b/service/imagebuilder/api_op_ListImagePipelineImages.go index f206a78873e..7e2db166053 100644 --- a/service/imagebuilder/api_op_ListImagePipelineImages.go +++ b/service/imagebuilder/api_op_ListImagePipelineImages.go @@ -72,6 +72,9 @@ func addOperationListImagePipelineImagesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListImagePipelineImagesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListImagePipelines.go b/service/imagebuilder/api_op_ListImagePipelines.go index bf909b76651..7b2a2cbc1b0 100644 --- a/service/imagebuilder/api_op_ListImagePipelines.go +++ b/service/imagebuilder/api_op_ListImagePipelines.go @@ -66,6 +66,9 @@ func addOperationListImagePipelinesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListImagePipelinesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListImageRecipes.go b/service/imagebuilder/api_op_ListImageRecipes.go index 14730b01e36..8b75a783714 100644 --- a/service/imagebuilder/api_op_ListImageRecipes.go +++ b/service/imagebuilder/api_op_ListImageRecipes.go @@ -72,6 +72,9 @@ func addOperationListImageRecipesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListImageRecipesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListImages.go b/service/imagebuilder/api_op_ListImages.go index ea4e04ec5db..d5f05e7f136 100644 --- a/service/imagebuilder/api_op_ListImages.go +++ b/service/imagebuilder/api_op_ListImages.go @@ -72,6 +72,9 @@ func addOperationListImagesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListImagesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListInfrastructureConfigurations.go b/service/imagebuilder/api_op_ListInfrastructureConfigurations.go index 6f131d5f45e..318ebeb1e3a 100644 --- a/service/imagebuilder/api_op_ListInfrastructureConfigurations.go +++ b/service/imagebuilder/api_op_ListInfrastructureConfigurations.go @@ -66,6 +66,9 @@ func addOperationListInfrastructureConfigurationsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListInfrastructureConfigurationsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_ListTagsForResource.go b/service/imagebuilder/api_op_ListTagsForResource.go index ce3a61561de..2a90aa995a2 100644 --- a/service/imagebuilder/api_op_ListTagsForResource.go +++ b/service/imagebuilder/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_PutComponentPolicy.go b/service/imagebuilder/api_op_PutComponentPolicy.go index 4d46314668a..5a1f63ae997 100644 --- a/service/imagebuilder/api_op_PutComponentPolicy.go +++ b/service/imagebuilder/api_op_PutComponentPolicy.go @@ -68,6 +68,9 @@ func addOperationPutComponentPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutComponentPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_PutImagePolicy.go b/service/imagebuilder/api_op_PutImagePolicy.go index 7c3e82b7b2b..18abeddf77a 100644 --- a/service/imagebuilder/api_op_PutImagePolicy.go +++ b/service/imagebuilder/api_op_PutImagePolicy.go @@ -68,6 +68,9 @@ func addOperationPutImagePolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutImagePolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_PutImageRecipePolicy.go b/service/imagebuilder/api_op_PutImageRecipePolicy.go index 5b079e3595a..9f6a8d87df3 100644 --- a/service/imagebuilder/api_op_PutImageRecipePolicy.go +++ b/service/imagebuilder/api_op_PutImageRecipePolicy.go @@ -69,6 +69,9 @@ func addOperationPutImageRecipePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationPutImageRecipePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_StartImagePipelineExecution.go b/service/imagebuilder/api_op_StartImagePipelineExecution.go index 6dc969ff531..4b1059a6256 100644 --- a/service/imagebuilder/api_op_StartImagePipelineExecution.go +++ b/service/imagebuilder/api_op_StartImagePipelineExecution.go @@ -65,6 +65,9 @@ func addOperationStartImagePipelineExecutionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationStartImagePipelineExecutionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_TagResource.go b/service/imagebuilder/api_op_TagResource.go index d15f41f1b41..3c6bdb02cb2 100644 --- a/service/imagebuilder/api_op_TagResource.go +++ b/service/imagebuilder/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_UntagResource.go b/service/imagebuilder/api_op_UntagResource.go index 1f128ffed09..7d126c68529 100644 --- a/service/imagebuilder/api_op_UntagResource.go +++ b/service/imagebuilder/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_UpdateDistributionConfiguration.go b/service/imagebuilder/api_op_UpdateDistributionConfiguration.go index ebb8fa5bb15..ebe34cdb294 100644 --- a/service/imagebuilder/api_op_UpdateDistributionConfiguration.go +++ b/service/imagebuilder/api_op_UpdateDistributionConfiguration.go @@ -76,6 +76,9 @@ func addOperationUpdateDistributionConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateDistributionConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_UpdateImagePipeline.go b/service/imagebuilder/api_op_UpdateImagePipeline.go index 35ca9c388dd..3c5c4e80085 100644 --- a/service/imagebuilder/api_op_UpdateImagePipeline.go +++ b/service/imagebuilder/api_op_UpdateImagePipeline.go @@ -100,6 +100,9 @@ func addOperationUpdateImagePipelineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationUpdateImagePipelineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go b/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go index 6d13af63b86..1f264e38daf 100644 --- a/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go @@ -107,6 +107,9 @@ func addOperationUpdateInfrastructureConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationUpdateInfrastructureConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/imagebuilder/go.mod b/service/imagebuilder/go.mod index afac356a0c9..11edbb99e74 100644 --- a/service/imagebuilder/go.mod +++ b/service/imagebuilder/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/imagebuilder go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/imagebuilder/go.sum b/service/imagebuilder/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/imagebuilder/go.sum +++ b/service/imagebuilder/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/inspector/api_client.go b/service/inspector/api_client.go index e1b246a9689..dbc4fd27f74 100644 --- a/service/inspector/api_client.go +++ b/service/inspector/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/inspector/api_op_AddAttributesToFindings.go b/service/inspector/api_op_AddAttributesToFindings.go index 65c87fb5f97..961f7ba1f5d 100644 --- a/service/inspector/api_op_AddAttributesToFindings.go +++ b/service/inspector/api_op_AddAttributesToFindings.go @@ -62,6 +62,9 @@ func addOperationAddAttributesToFindingsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAddAttributesToFindingsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_CreateAssessmentTarget.go b/service/inspector/api_op_CreateAssessmentTarget.go index fe305c19aaa..f80298e9532 100644 --- a/service/inspector/api_op_CreateAssessmentTarget.go +++ b/service/inspector/api_op_CreateAssessmentTarget.go @@ -70,6 +70,9 @@ func addOperationCreateAssessmentTargetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateAssessmentTargetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_CreateAssessmentTemplate.go b/service/inspector/api_op_CreateAssessmentTemplate.go index adca776390b..349837f0c65 100644 --- a/service/inspector/api_op_CreateAssessmentTemplate.go +++ b/service/inspector/api_op_CreateAssessmentTemplate.go @@ -86,6 +86,9 @@ func addOperationCreateAssessmentTemplateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateAssessmentTemplateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_CreateExclusionsPreview.go b/service/inspector/api_op_CreateExclusionsPreview.go index f45174f707b..06a39731db6 100644 --- a/service/inspector/api_op_CreateExclusionsPreview.go +++ b/service/inspector/api_op_CreateExclusionsPreview.go @@ -59,6 +59,9 @@ func addOperationCreateExclusionsPreviewMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationCreateExclusionsPreviewMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_CreateResourceGroup.go b/service/inspector/api_op_CreateResourceGroup.go index 1c2327c32d5..ee40d361716 100644 --- a/service/inspector/api_op_CreateResourceGroup.go +++ b/service/inspector/api_op_CreateResourceGroup.go @@ -60,6 +60,9 @@ func addOperationCreateResourceGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateResourceGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DeleteAssessmentRun.go b/service/inspector/api_op_DeleteAssessmentRun.go index 253ee07f20e..8d5618bfd16 100644 --- a/service/inspector/api_op_DeleteAssessmentRun.go +++ b/service/inspector/api_op_DeleteAssessmentRun.go @@ -48,6 +48,9 @@ func addOperationDeleteAssessmentRunMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAssessmentRunMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DeleteAssessmentTarget.go b/service/inspector/api_op_DeleteAssessmentTarget.go index dd4f162cd50..04107cf4985 100644 --- a/service/inspector/api_op_DeleteAssessmentTarget.go +++ b/service/inspector/api_op_DeleteAssessmentTarget.go @@ -49,6 +49,9 @@ func addOperationDeleteAssessmentTargetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteAssessmentTargetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DeleteAssessmentTemplate.go b/service/inspector/api_op_DeleteAssessmentTemplate.go index 8f498e63f95..fc657f8fbe0 100644 --- a/service/inspector/api_op_DeleteAssessmentTemplate.go +++ b/service/inspector/api_op_DeleteAssessmentTemplate.go @@ -49,6 +49,9 @@ func addOperationDeleteAssessmentTemplateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteAssessmentTemplateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeAssessmentRuns.go b/service/inspector/api_op_DescribeAssessmentRuns.go index c1affe6d0d9..cdfa0427cdd 100644 --- a/service/inspector/api_op_DescribeAssessmentRuns.go +++ b/service/inspector/api_op_DescribeAssessmentRuns.go @@ -62,6 +62,9 @@ func addOperationDescribeAssessmentRunsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeAssessmentRunsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeAssessmentTargets.go b/service/inspector/api_op_DescribeAssessmentTargets.go index 358eb0808d8..1efb43d8dcf 100644 --- a/service/inspector/api_op_DescribeAssessmentTargets.go +++ b/service/inspector/api_op_DescribeAssessmentTargets.go @@ -62,6 +62,9 @@ func addOperationDescribeAssessmentTargetsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeAssessmentTargetsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeAssessmentTemplates.go b/service/inspector/api_op_DescribeAssessmentTemplates.go index 2c58db0a14e..70f34de59e3 100644 --- a/service/inspector/api_op_DescribeAssessmentTemplates.go +++ b/service/inspector/api_op_DescribeAssessmentTemplates.go @@ -58,6 +58,9 @@ func addOperationDescribeAssessmentTemplatesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeAssessmentTemplatesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeCrossAccountAccessRole.go b/service/inspector/api_op_DescribeCrossAccountAccessRole.go index aa679a2108a..6dc81dcf2e7 100644 --- a/service/inspector/api_op_DescribeCrossAccountAccessRole.go +++ b/service/inspector/api_op_DescribeCrossAccountAccessRole.go @@ -62,6 +62,9 @@ func addOperationDescribeCrossAccountAccessRoleMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeCrossAccountAccessRoleMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeExclusions.go b/service/inspector/api_op_DescribeExclusions.go index 2489952e977..2d4efb0a69a 100644 --- a/service/inspector/api_op_DescribeExclusions.go +++ b/service/inspector/api_op_DescribeExclusions.go @@ -65,6 +65,9 @@ func addOperationDescribeExclusionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeExclusionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeFindings.go b/service/inspector/api_op_DescribeFindings.go index 90ad018f81e..dd10d55fd95 100644 --- a/service/inspector/api_op_DescribeFindings.go +++ b/service/inspector/api_op_DescribeFindings.go @@ -65,6 +65,9 @@ func addOperationDescribeFindingsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeFindingsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeResourceGroups.go b/service/inspector/api_op_DescribeResourceGroups.go index 431eccf8ac0..43be3d14ea9 100644 --- a/service/inspector/api_op_DescribeResourceGroups.go +++ b/service/inspector/api_op_DescribeResourceGroups.go @@ -62,6 +62,9 @@ func addOperationDescribeResourceGroupsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeResourceGroupsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_DescribeRulesPackages.go b/service/inspector/api_op_DescribeRulesPackages.go index 05187f16a47..ada5574846d 100644 --- a/service/inspector/api_op_DescribeRulesPackages.go +++ b/service/inspector/api_op_DescribeRulesPackages.go @@ -65,6 +65,9 @@ func addOperationDescribeRulesPackagesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeRulesPackagesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_GetAssessmentReport.go b/service/inspector/api_op_GetAssessmentReport.go index 03cb7774669..034ff03b9c0 100644 --- a/service/inspector/api_op_GetAssessmentReport.go +++ b/service/inspector/api_op_GetAssessmentReport.go @@ -75,6 +75,9 @@ func addOperationGetAssessmentReportMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetAssessmentReportMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_GetExclusionsPreview.go b/service/inspector/api_op_GetExclusionsPreview.go index b28d761f704..6ccaf8a0537 100644 --- a/service/inspector/api_op_GetExclusionsPreview.go +++ b/service/inspector/api_op_GetExclusionsPreview.go @@ -86,6 +86,9 @@ func addOperationGetExclusionsPreviewMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetExclusionsPreviewMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_GetTelemetryMetadata.go b/service/inspector/api_op_GetTelemetryMetadata.go index 6bf2e4314c2..0f1b435da1b 100644 --- a/service/inspector/api_op_GetTelemetryMetadata.go +++ b/service/inspector/api_op_GetTelemetryMetadata.go @@ -56,6 +56,9 @@ func addOperationGetTelemetryMetadataMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetTelemetryMetadataMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListAssessmentRunAgents.go b/service/inspector/api_op_ListAssessmentRunAgents.go index 1c6506f968e..5f09e0c5c7f 100644 --- a/service/inspector/api_op_ListAssessmentRunAgents.go +++ b/service/inspector/api_op_ListAssessmentRunAgents.go @@ -78,6 +78,9 @@ func addOperationListAssessmentRunAgentsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListAssessmentRunAgentsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListAssessmentRuns.go b/service/inspector/api_op_ListAssessmentRuns.go index 690ef279a51..bd3cb387104 100644 --- a/service/inspector/api_op_ListAssessmentRuns.go +++ b/service/inspector/api_op_ListAssessmentRuns.go @@ -78,6 +78,9 @@ func addOperationListAssessmentRunsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListAssessmentRunsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListAssessmentTargets.go b/service/inspector/api_op_ListAssessmentTargets.go index 3a6029b6252..c77038026c9 100644 --- a/service/inspector/api_op_ListAssessmentTargets.go +++ b/service/inspector/api_op_ListAssessmentTargets.go @@ -75,6 +75,9 @@ func addOperationListAssessmentTargetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListAssessmentTargetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListAssessmentTemplates.go b/service/inspector/api_op_ListAssessmentTemplates.go index e49c70a48d0..0d8071b8426 100644 --- a/service/inspector/api_op_ListAssessmentTemplates.go +++ b/service/inspector/api_op_ListAssessmentTemplates.go @@ -77,6 +77,9 @@ func addOperationListAssessmentTemplatesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListAssessmentTemplatesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListEventSubscriptions.go b/service/inspector/api_op_ListEventSubscriptions.go index 58b28c91d38..6acc54aa431 100644 --- a/service/inspector/api_op_ListEventSubscriptions.go +++ b/service/inspector/api_op_ListEventSubscriptions.go @@ -72,6 +72,9 @@ func addOperationListEventSubscriptionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListEventSubscriptionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListExclusions.go b/service/inspector/api_op_ListExclusions.go index f093cf0eb32..e23d82c4a0f 100644 --- a/service/inspector/api_op_ListExclusions.go +++ b/service/inspector/api_op_ListExclusions.go @@ -71,6 +71,9 @@ func addOperationListExclusionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListExclusionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListFindings.go b/service/inspector/api_op_ListFindings.go index 095fab784a6..1517b4eb1cb 100644 --- a/service/inspector/api_op_ListFindings.go +++ b/service/inspector/api_op_ListFindings.go @@ -77,6 +77,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListRulesPackages.go b/service/inspector/api_op_ListRulesPackages.go index 03ac2d18c62..36d09934dd5 100644 --- a/service/inspector/api_op_ListRulesPackages.go +++ b/service/inspector/api_op_ListRulesPackages.go @@ -65,6 +65,9 @@ func addOperationListRulesPackagesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListRulesPackagesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_ListTagsForResource.go b/service/inspector/api_op_ListTagsForResource.go index 1ec77ba7bb2..2c03ccb41ae 100644 --- a/service/inspector/api_op_ListTagsForResource.go +++ b/service/inspector/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_PreviewAgents.go b/service/inspector/api_op_PreviewAgents.go index 0d13c3a6be9..9b40c1b0b90 100644 --- a/service/inspector/api_op_PreviewAgents.go +++ b/service/inspector/api_op_PreviewAgents.go @@ -72,6 +72,9 @@ func addOperationPreviewAgentsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPreviewAgentsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_RegisterCrossAccountAccessRole.go b/service/inspector/api_op_RegisterCrossAccountAccessRole.go index 979ab377c61..c3ebf776ca1 100644 --- a/service/inspector/api_op_RegisterCrossAccountAccessRole.go +++ b/service/inspector/api_op_RegisterCrossAccountAccessRole.go @@ -50,6 +50,9 @@ func addOperationRegisterCrossAccountAccessRoleMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationRegisterCrossAccountAccessRoleMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_RemoveAttributesFromFindings.go b/service/inspector/api_op_RemoveAttributesFromFindings.go index e67a9b3274c..55fcf7b5375 100644 --- a/service/inspector/api_op_RemoveAttributesFromFindings.go +++ b/service/inspector/api_op_RemoveAttributesFromFindings.go @@ -63,6 +63,9 @@ func addOperationRemoveAttributesFromFindingsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRemoveAttributesFromFindingsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_SetTagsForResource.go b/service/inspector/api_op_SetTagsForResource.go index 80264566c4d..08bf7c4c4f1 100644 --- a/service/inspector/api_op_SetTagsForResource.go +++ b/service/inspector/api_op_SetTagsForResource.go @@ -54,6 +54,9 @@ func addOperationSetTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationSetTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_StartAssessmentRun.go b/service/inspector/api_op_StartAssessmentRun.go index fa4357839d3..2085fca80e6 100644 --- a/service/inspector/api_op_StartAssessmentRun.go +++ b/service/inspector/api_op_StartAssessmentRun.go @@ -60,6 +60,9 @@ func addOperationStartAssessmentRunMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationStartAssessmentRunMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_StopAssessmentRun.go b/service/inspector/api_op_StopAssessmentRun.go index c777d776a75..0c3b78ad38c 100644 --- a/service/inspector/api_op_StopAssessmentRun.go +++ b/service/inspector/api_op_StopAssessmentRun.go @@ -56,6 +56,9 @@ func addOperationStopAssessmentRunMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopAssessmentRunMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_SubscribeToEvent.go b/service/inspector/api_op_SubscribeToEvent.go index 68b7573306d..b44b0a6eaef 100644 --- a/service/inspector/api_op_SubscribeToEvent.go +++ b/service/inspector/api_op_SubscribeToEvent.go @@ -61,6 +61,9 @@ func addOperationSubscribeToEventMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationSubscribeToEventMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_UnsubscribeFromEvent.go b/service/inspector/api_op_UnsubscribeFromEvent.go index bc757b76baf..3d91601e270 100644 --- a/service/inspector/api_op_UnsubscribeFromEvent.go +++ b/service/inspector/api_op_UnsubscribeFromEvent.go @@ -61,6 +61,9 @@ func addOperationUnsubscribeFromEventMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUnsubscribeFromEventMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/api_op_UpdateAssessmentTarget.go b/service/inspector/api_op_UpdateAssessmentTarget.go index e4d2327c91f..8ccad64eeff 100644 --- a/service/inspector/api_op_UpdateAssessmentTarget.go +++ b/service/inspector/api_op_UpdateAssessmentTarget.go @@ -59,6 +59,9 @@ func addOperationUpdateAssessmentTargetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateAssessmentTargetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/inspector/go.mod b/service/inspector/go.mod index 16afffbc87e..2a44cb92b18 100644 --- a/service/inspector/go.mod +++ b/service/inspector/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/inspector go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/inspector/go.sum b/service/inspector/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/inspector/go.sum +++ b/service/inspector/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/internal/accept-encoding/go.sum b/service/internal/accept-encoding/go.sum index 3119236f3e6..210ab773fc5 100644 --- a/service/internal/accept-encoding/go.sum +++ b/service/internal/accept-encoding/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= diff --git a/service/internal/benchmark/go.mod b/service/internal/benchmark/go.mod index 6f1260dca41..f1c4ad6bb20 100644 --- a/service/internal/benchmark/go.mod +++ b/service/internal/benchmark/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v0.29.0 github.com/aws/aws-sdk-go-v2/service/lexruntimeservice v0.29.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../../ diff --git a/service/internal/benchmark/go.sum b/service/internal/benchmark/go.sum index 66f72a91a16..94619ca5a12 100644 --- a/service/internal/benchmark/go.sum +++ b/service/internal/benchmark/go.sum @@ -1,9 +1,5 @@ github.com/aws/aws-sdk-go v1.34.33 h1:ymkFm0rNPEOlgjyX3ojEd4zqzW6kGICBkqWs7LqgHtU= github.com/aws/aws-sdk-go v1.34.33/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= diff --git a/service/internal/integrationtest/config.go b/service/internal/integrationtest/config.go index 1a3d231537e..edc3f7add10 100644 --- a/service/internal/integrationtest/config.go +++ b/service/internal/integrationtest/config.go @@ -7,24 +7,21 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" - smithyhttp "github.com/awslabs/smithy-go/transport/http" ) // LoadConfigWithDefaultRegion loads the default configuration for the SDK, and // falls back to a default region if one is not specified. func LoadConfigWithDefaultRegion(defaultRegion string) (cfg aws.Config, err error) { - var opts []config.Config + var lm aws.ClientLogMode if strings.EqualFold(os.Getenv("AWS_DEBUG_REQUEST"), "true") { - opts = append(opts, config.WithHTTPClient(smithyhttp.WrapLogClient( - logger{}, aws.NewBuildableHTTPClient(), false))) + lm |= aws.LogRequest } else if strings.EqualFold(os.Getenv("AWS_DEBUG_REQUEST_BODY"), "true") { - opts = append(opts, config.WithHTTPClient(smithyhttp.WrapLogClient( - logger{}, aws.NewBuildableHTTPClient(), true))) + lm |= aws.LogRequestWithBody } - cfg, err = config.LoadDefaultConfig(opts...) + cfg, err = config.LoadDefaultConfig(config.WithClientLogMode(lm)) if err != nil { return cfg, err } diff --git a/service/internal/integrationtest/go.mod b/service/internal/integrationtest/go.mod index b8820940d6e..6f88785d562 100644 --- a/service/internal/integrationtest/go.mod +++ b/service/internal/integrationtest/go.mod @@ -85,7 +85,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v0.29.0 github.com/aws/aws-sdk-go-v2/service/wafv2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/workspaces v0.29.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) go 1.15 diff --git a/service/internal/integrationtest/go.sum b/service/internal/integrationtest/go.sum index f8642733024..8a4986a5fc4 100644 --- a/service/internal/integrationtest/go.sum +++ b/service/internal/integrationtest/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/internal/presigned-url/go.sum b/service/internal/presigned-url/go.sum index 3555b0e4bad..8a4986a5fc4 100644 --- a/service/internal/presigned-url/go.sum +++ b/service/internal/presigned-url/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/internal/s3shared/go.sum b/service/internal/s3shared/go.sum index 97804f67207..fd672e20286 100644 --- a/service/internal/s3shared/go.sum +++ b/service/internal/s3shared/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iot/api_client.go b/service/iot/api_client.go index 81ad00fffc4..b089449c624 100644 --- a/service/iot/api_client.go +++ b/service/iot/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iot/api_op_AcceptCertificateTransfer.go b/service/iot/api_op_AcceptCertificateTransfer.go index c64fff212c0..1da6fd309fd 100644 --- a/service/iot/api_op_AcceptCertificateTransfer.go +++ b/service/iot/api_op_AcceptCertificateTransfer.go @@ -55,6 +55,9 @@ func addOperationAcceptCertificateTransferMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAcceptCertificateTransferMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AddThingToBillingGroup.go b/service/iot/api_op_AddThingToBillingGroup.go index d52bdc13533..d33c2eb192d 100644 --- a/service/iot/api_op_AddThingToBillingGroup.go +++ b/service/iot/api_op_AddThingToBillingGroup.go @@ -55,6 +55,9 @@ func addOperationAddThingToBillingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationAddThingToBillingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AddThingToThingGroup.go b/service/iot/api_op_AddThingToThingGroup.go index 7a692c25d3e..ac922ffef57 100644 --- a/service/iot/api_op_AddThingToThingGroup.go +++ b/service/iot/api_op_AddThingToThingGroup.go @@ -61,6 +61,9 @@ func addOperationAddThingToThingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAddThingToThingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AssociateTargetsWithJob.go b/service/iot/api_op_AssociateTargetsWithJob.go index 1e8f7b553b9..8aac1e00606 100644 --- a/service/iot/api_op_AssociateTargetsWithJob.go +++ b/service/iot/api_op_AssociateTargetsWithJob.go @@ -83,6 +83,9 @@ func addOperationAssociateTargetsWithJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationAssociateTargetsWithJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AttachPolicy.go b/service/iot/api_op_AttachPolicy.go index 7e4dddb003a..7a1c3948a21 100644 --- a/service/iot/api_op_AttachPolicy.go +++ b/service/iot/api_op_AttachPolicy.go @@ -55,6 +55,9 @@ func addOperationAttachPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAttachPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AttachPrincipalPolicy.go b/service/iot/api_op_AttachPrincipalPolicy.go index 2fa0c15aac3..769e4c43dec 100644 --- a/service/iot/api_op_AttachPrincipalPolicy.go +++ b/service/iot/api_op_AttachPrincipalPolicy.go @@ -56,6 +56,9 @@ func addOperationAttachPrincipalPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAttachPrincipalPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AttachSecurityProfile.go b/service/iot/api_op_AttachSecurityProfile.go index c0df263ba5d..9346bd67d6c 100644 --- a/service/iot/api_op_AttachSecurityProfile.go +++ b/service/iot/api_op_AttachSecurityProfile.go @@ -55,6 +55,9 @@ func addOperationAttachSecurityProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAttachSecurityProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_AttachThingPrincipal.go b/service/iot/api_op_AttachThingPrincipal.go index 842950b9ab1..10f5a2e78cc 100644 --- a/service/iot/api_op_AttachThingPrincipal.go +++ b/service/iot/api_op_AttachThingPrincipal.go @@ -58,6 +58,9 @@ func addOperationAttachThingPrincipalMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAttachThingPrincipalMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CancelAuditMitigationActionsTask.go b/service/iot/api_op_CancelAuditMitigationActionsTask.go index 87310b7e7d4..0825d6edec3 100644 --- a/service/iot/api_op_CancelAuditMitigationActionsTask.go +++ b/service/iot/api_op_CancelAuditMitigationActionsTask.go @@ -49,6 +49,9 @@ func addOperationCancelAuditMitigationActionsTaskMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationCancelAuditMitigationActionsTaskMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CancelAuditTask.go b/service/iot/api_op_CancelAuditTask.go index 42a0d2602d6..730dec38c51 100644 --- a/service/iot/api_op_CancelAuditTask.go +++ b/service/iot/api_op_CancelAuditTask.go @@ -50,6 +50,9 @@ func addOperationCancelAuditTaskMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationCancelAuditTaskMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CancelCertificateTransfer.go b/service/iot/api_op_CancelCertificateTransfer.go index e6c999e7516..807041517bc 100644 --- a/service/iot/api_op_CancelCertificateTransfer.go +++ b/service/iot/api_op_CancelCertificateTransfer.go @@ -56,6 +56,9 @@ func addOperationCancelCertificateTransferMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCancelCertificateTransferMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CancelJob.go b/service/iot/api_op_CancelJob.go index 72307bd40af..9d0842552bb 100644 --- a/service/iot/api_op_CancelJob.go +++ b/service/iot/api_op_CancelJob.go @@ -72,6 +72,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CancelJobExecution.go b/service/iot/api_op_CancelJobExecution.go index 538f7b1ed87..62897536222 100644 --- a/service/iot/api_op_CancelJobExecution.go +++ b/service/iot/api_op_CancelJobExecution.go @@ -77,6 +77,9 @@ func addOperationCancelJobExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCancelJobExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ClearDefaultAuthorizer.go b/service/iot/api_op_ClearDefaultAuthorizer.go index de1024835f9..680fc92262d 100644 --- a/service/iot/api_op_ClearDefaultAuthorizer.go +++ b/service/iot/api_op_ClearDefaultAuthorizer.go @@ -43,6 +43,9 @@ func addOperationClearDefaultAuthorizerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationClearDefaultAuthorizerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ConfirmTopicRuleDestination.go b/service/iot/api_op_ConfirmTopicRuleDestination.go index e14402c2a97..30f5cd0244d 100644 --- a/service/iot/api_op_ConfirmTopicRuleDestination.go +++ b/service/iot/api_op_ConfirmTopicRuleDestination.go @@ -53,6 +53,9 @@ func addOperationConfirmTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationConfirmTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateAuditSuppression.go b/service/iot/api_op_CreateAuditSuppression.go index 43737651786..dc8047dabcf 100644 --- a/service/iot/api_op_CreateAuditSuppression.go +++ b/service/iot/api_op_CreateAuditSuppression.go @@ -73,6 +73,9 @@ func addOperationCreateAuditSuppressionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateAuditSuppressionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateAuthorizer.go b/service/iot/api_op_CreateAuthorizer.go index e64ca9ca4be..d452f9caf80 100644 --- a/service/iot/api_op_CreateAuthorizer.go +++ b/service/iot/api_op_CreateAuthorizer.go @@ -81,6 +81,9 @@ func addOperationCreateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateBillingGroup.go b/service/iot/api_op_CreateBillingGroup.go index 735f0481cf0..aed7cd0dcae 100644 --- a/service/iot/api_op_CreateBillingGroup.go +++ b/service/iot/api_op_CreateBillingGroup.go @@ -65,6 +65,9 @@ func addOperationCreateBillingGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateBillingGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateCertificateFromCsr.go b/service/iot/api_op_CreateCertificateFromCsr.go index e71fc8fa056..d0f2b965ff6 100644 --- a/service/iot/api_op_CreateCertificateFromCsr.go +++ b/service/iot/api_op_CreateCertificateFromCsr.go @@ -87,6 +87,9 @@ func addOperationCreateCertificateFromCsrMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateCertificateFromCsrMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateDimension.go b/service/iot/api_op_CreateDimension.go index 6fa77bdbc54..6a803a55e6b 100644 --- a/service/iot/api_op_CreateDimension.go +++ b/service/iot/api_op_CreateDimension.go @@ -84,6 +84,9 @@ func addOperationCreateDimensionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateDimensionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateDomainConfiguration.go b/service/iot/api_op_CreateDomainConfiguration.go index c93aceda1fa..69ef344d7e6 100644 --- a/service/iot/api_op_CreateDomainConfiguration.go +++ b/service/iot/api_op_CreateDomainConfiguration.go @@ -83,6 +83,9 @@ func addOperationCreateDomainConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateDomainConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateDynamicThingGroup.go b/service/iot/api_op_CreateDynamicThingGroup.go index 12f12a15f13..76f55ef21ba 100644 --- a/service/iot/api_op_CreateDynamicThingGroup.go +++ b/service/iot/api_op_CreateDynamicThingGroup.go @@ -89,6 +89,9 @@ func addOperationCreateDynamicThingGroupMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateDynamicThingGroupMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateJob.go b/service/iot/api_op_CreateJob.go index d7ac81dd233..b76c1cca0ab 100644 --- a/service/iot/api_op_CreateJob.go +++ b/service/iot/api_op_CreateJob.go @@ -111,6 +111,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateKeysAndCertificate.go b/service/iot/api_op_CreateKeysAndCertificate.go index 34642f28422..f327a3ef733 100644 --- a/service/iot/api_op_CreateKeysAndCertificate.go +++ b/service/iot/api_op_CreateKeysAndCertificate.go @@ -68,6 +68,9 @@ func addOperationCreateKeysAndCertificateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateKeysAndCertificateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateMitigationAction.go b/service/iot/api_op_CreateMitigationAction.go index 52749977b6b..d5e9fd9b0e6 100644 --- a/service/iot/api_op_CreateMitigationAction.go +++ b/service/iot/api_op_CreateMitigationAction.go @@ -74,6 +74,9 @@ func addOperationCreateMitigationActionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateMitigationActionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateOTAUpdate.go b/service/iot/api_op_CreateOTAUpdate.go index 797fa6199da..789a5d5477e 100644 --- a/service/iot/api_op_CreateOTAUpdate.go +++ b/service/iot/api_op_CreateOTAUpdate.go @@ -118,6 +118,9 @@ func addOperationCreateOTAUpdateMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateOTAUpdateMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreatePolicy.go b/service/iot/api_op_CreatePolicy.go index 39f29a3afbc..216954e4bd1 100644 --- a/service/iot/api_op_CreatePolicy.go +++ b/service/iot/api_op_CreatePolicy.go @@ -78,6 +78,9 @@ func addOperationCreatePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreatePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreatePolicyVersion.go b/service/iot/api_op_CreatePolicyVersion.go index 261864603e0..e202a782c2d 100644 --- a/service/iot/api_op_CreatePolicyVersion.go +++ b/service/iot/api_op_CreatePolicyVersion.go @@ -80,6 +80,9 @@ func addOperationCreatePolicyVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreatePolicyVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateProvisioningClaim.go b/service/iot/api_op_CreateProvisioningClaim.go index 6a6a89272a3..48044ea5859 100644 --- a/service/iot/api_op_CreateProvisioningClaim.go +++ b/service/iot/api_op_CreateProvisioningClaim.go @@ -63,6 +63,9 @@ func addOperationCreateProvisioningClaimMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateProvisioningClaimMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateProvisioningTemplate.go b/service/iot/api_op_CreateProvisioningTemplate.go index 97e063074bc..fe7bedfb6f4 100644 --- a/service/iot/api_op_CreateProvisioningTemplate.go +++ b/service/iot/api_op_CreateProvisioningTemplate.go @@ -85,6 +85,9 @@ func addOperationCreateProvisioningTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateProvisioningTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateProvisioningTemplateVersion.go b/service/iot/api_op_CreateProvisioningTemplateVersion.go index 267900035e4..474c5441015 100644 --- a/service/iot/api_op_CreateProvisioningTemplateVersion.go +++ b/service/iot/api_op_CreateProvisioningTemplateVersion.go @@ -70,6 +70,9 @@ func addOperationCreateProvisioningTemplateVersionMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateProvisioningTemplateVersionMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateRoleAlias.go b/service/iot/api_op_CreateRoleAlias.go index 0ae8a59bcf1..e704b68d77c 100644 --- a/service/iot/api_op_CreateRoleAlias.go +++ b/service/iot/api_op_CreateRoleAlias.go @@ -71,6 +71,9 @@ func addOperationCreateRoleAliasMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateRoleAliasMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateScheduledAudit.go b/service/iot/api_op_CreateScheduledAudit.go index edc8198debf..64984651e0e 100644 --- a/service/iot/api_op_CreateScheduledAudit.go +++ b/service/iot/api_op_CreateScheduledAudit.go @@ -82,6 +82,9 @@ func addOperationCreateScheduledAuditMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateScheduledAuditMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateSecurityProfile.go b/service/iot/api_op_CreateSecurityProfile.go index 6cfe407e3f1..0a93b9eae10 100644 --- a/service/iot/api_op_CreateSecurityProfile.go +++ b/service/iot/api_op_CreateSecurityProfile.go @@ -80,6 +80,9 @@ func addOperationCreateSecurityProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateSecurityProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateStream.go b/service/iot/api_op_CreateStream.go index 4e1846e550c..3edd5d233ec 100644 --- a/service/iot/api_op_CreateStream.go +++ b/service/iot/api_op_CreateStream.go @@ -81,6 +81,9 @@ func addOperationCreateStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateThing.go b/service/iot/api_op_CreateThing.go index 6fb7120f30b..b2b69cf6a8b 100644 --- a/service/iot/api_op_CreateThing.go +++ b/service/iot/api_op_CreateThing.go @@ -79,6 +79,9 @@ func addOperationCreateThingMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateThingMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateThingGroup.go b/service/iot/api_op_CreateThingGroup.go index 03c8973b0d6..22343cb4fa8 100644 --- a/service/iot/api_op_CreateThingGroup.go +++ b/service/iot/api_op_CreateThingGroup.go @@ -70,6 +70,9 @@ func addOperationCreateThingGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateThingGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateThingType.go b/service/iot/api_op_CreateThingType.go index 6ecd23c39a2..62dd97dcccc 100644 --- a/service/iot/api_op_CreateThingType.go +++ b/service/iot/api_op_CreateThingType.go @@ -69,6 +69,9 @@ func addOperationCreateThingTypeMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateThingTypeMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateTopicRule.go b/service/iot/api_op_CreateTopicRule.go index 9a22b20447c..754d2b58efd 100644 --- a/service/iot/api_op_CreateTopicRule.go +++ b/service/iot/api_op_CreateTopicRule.go @@ -63,6 +63,9 @@ func addOperationCreateTopicRuleMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateTopicRuleMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_CreateTopicRuleDestination.go b/service/iot/api_op_CreateTopicRuleDestination.go index 42c486a9cb7..f6b9e9a897a 100644 --- a/service/iot/api_op_CreateTopicRuleDestination.go +++ b/service/iot/api_op_CreateTopicRuleDestination.go @@ -54,6 +54,9 @@ func addOperationCreateTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationCreateTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteAccountAuditConfiguration.go b/service/iot/api_op_DeleteAccountAuditConfiguration.go index 5b0c87e0c4b..fcba0846536 100644 --- a/service/iot/api_op_DeleteAccountAuditConfiguration.go +++ b/service/iot/api_op_DeleteAccountAuditConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeleteAccountAuditConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDeleteAccountAuditConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteAuditSuppression.go b/service/iot/api_op_DeleteAuditSuppression.go index c401497112a..eb277df5d4d 100644 --- a/service/iot/api_op_DeleteAuditSuppression.go +++ b/service/iot/api_op_DeleteAuditSuppression.go @@ -57,6 +57,9 @@ func addOperationDeleteAuditSuppressionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteAuditSuppressionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteAuthorizer.go b/service/iot/api_op_DeleteAuthorizer.go index 7608c25d40e..304bc96a4b4 100644 --- a/service/iot/api_op_DeleteAuthorizer.go +++ b/service/iot/api_op_DeleteAuthorizer.go @@ -48,6 +48,9 @@ func addOperationDeleteAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteBillingGroup.go b/service/iot/api_op_DeleteBillingGroup.go index 159c3fa2e76..d10bbaa6b6d 100644 --- a/service/iot/api_op_DeleteBillingGroup.go +++ b/service/iot/api_op_DeleteBillingGroup.go @@ -53,6 +53,9 @@ func addOperationDeleteBillingGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteBillingGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteCACertificate.go b/service/iot/api_op_DeleteCACertificate.go index a55ccc37e27..5fd7d94bd33 100644 --- a/service/iot/api_op_DeleteCACertificate.go +++ b/service/iot/api_op_DeleteCACertificate.go @@ -51,6 +51,9 @@ func addOperationDeleteCACertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteCACertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteCertificate.go b/service/iot/api_op_DeleteCertificate.go index 871d5a828c2..b0f1735829c 100644 --- a/service/iot/api_op_DeleteCertificate.go +++ b/service/iot/api_op_DeleteCertificate.go @@ -58,6 +58,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteDimension.go b/service/iot/api_op_DeleteDimension.go index 39309b07598..23ee3f0d22a 100644 --- a/service/iot/api_op_DeleteDimension.go +++ b/service/iot/api_op_DeleteDimension.go @@ -48,6 +48,9 @@ func addOperationDeleteDimensionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDimensionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteDomainConfiguration.go b/service/iot/api_op_DeleteDomainConfiguration.go index 20023bd5c80..6cc7f55ba1f 100644 --- a/service/iot/api_op_DeleteDomainConfiguration.go +++ b/service/iot/api_op_DeleteDomainConfiguration.go @@ -49,6 +49,9 @@ func addOperationDeleteDomainConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteDomainConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteDynamicThingGroup.go b/service/iot/api_op_DeleteDynamicThingGroup.go index 83147221fd5..490a42b047b 100644 --- a/service/iot/api_op_DeleteDynamicThingGroup.go +++ b/service/iot/api_op_DeleteDynamicThingGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteDynamicThingGroupMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDynamicThingGroupMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteJob.go b/service/iot/api_op_DeleteJob.go index 4c5346ff0a3..2c637e5d01d 100644 --- a/service/iot/api_op_DeleteJob.go +++ b/service/iot/api_op_DeleteJob.go @@ -73,6 +73,9 @@ func addOperationDeleteJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteJobExecution.go b/service/iot/api_op_DeleteJobExecution.go index 4f840f80a41..3b90205b1d3 100644 --- a/service/iot/api_op_DeleteJobExecution.go +++ b/service/iot/api_op_DeleteJobExecution.go @@ -77,6 +77,9 @@ func addOperationDeleteJobExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDeleteJobExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteMitigationAction.go b/service/iot/api_op_DeleteMitigationAction.go index cf2efdbc8ff..a1798beff68 100644 --- a/service/iot/api_op_DeleteMitigationAction.go +++ b/service/iot/api_op_DeleteMitigationAction.go @@ -48,6 +48,9 @@ func addOperationDeleteMitigationActionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteMitigationActionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteOTAUpdate.go b/service/iot/api_op_DeleteOTAUpdate.go index a63b5ed9c44..7c3f687ef92 100644 --- a/service/iot/api_op_DeleteOTAUpdate.go +++ b/service/iot/api_op_DeleteOTAUpdate.go @@ -56,6 +56,9 @@ func addOperationDeleteOTAUpdateMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteOTAUpdateMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeletePolicy.go b/service/iot/api_op_DeletePolicy.go index a42aea96a1b..036829e85fe 100644 --- a/service/iot/api_op_DeletePolicy.go +++ b/service/iot/api_op_DeletePolicy.go @@ -54,6 +54,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeletePolicyVersion.go b/service/iot/api_op_DeletePolicyVersion.go index 74fd5b7750b..d1d51315c59 100644 --- a/service/iot/api_op_DeletePolicyVersion.go +++ b/service/iot/api_op_DeletePolicyVersion.go @@ -57,6 +57,9 @@ func addOperationDeletePolicyVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeletePolicyVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteProvisioningTemplate.go b/service/iot/api_op_DeleteProvisioningTemplate.go index bb55bbdb82f..a664164e372 100644 --- a/service/iot/api_op_DeleteProvisioningTemplate.go +++ b/service/iot/api_op_DeleteProvisioningTemplate.go @@ -48,6 +48,9 @@ func addOperationDeleteProvisioningTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteProvisioningTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteProvisioningTemplateVersion.go b/service/iot/api_op_DeleteProvisioningTemplateVersion.go index 4bcdaad3d25..7c1e0295df7 100644 --- a/service/iot/api_op_DeleteProvisioningTemplateVersion.go +++ b/service/iot/api_op_DeleteProvisioningTemplateVersion.go @@ -53,6 +53,9 @@ func addOperationDeleteProvisioningTemplateVersionMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteProvisioningTemplateVersionMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteRegistrationCode.go b/service/iot/api_op_DeleteRegistrationCode.go index ba319050452..da5e1e69c1a 100644 --- a/service/iot/api_op_DeleteRegistrationCode.go +++ b/service/iot/api_op_DeleteRegistrationCode.go @@ -45,6 +45,9 @@ func addOperationDeleteRegistrationCodeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationDeleteRegistrationCodeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteRoleAlias.go b/service/iot/api_op_DeleteRoleAlias.go index dccce6c0746..6d794f9024c 100644 --- a/service/iot/api_op_DeleteRoleAlias.go +++ b/service/iot/api_op_DeleteRoleAlias.go @@ -48,6 +48,9 @@ func addOperationDeleteRoleAliasMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteRoleAliasMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteScheduledAudit.go b/service/iot/api_op_DeleteScheduledAudit.go index 5a268b64425..df8c150fc3c 100644 --- a/service/iot/api_op_DeleteScheduledAudit.go +++ b/service/iot/api_op_DeleteScheduledAudit.go @@ -48,6 +48,9 @@ func addOperationDeleteScheduledAuditMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteScheduledAuditMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteSecurityProfile.go b/service/iot/api_op_DeleteSecurityProfile.go index 4eca59ed6c2..980fd21bffe 100644 --- a/service/iot/api_op_DeleteSecurityProfile.go +++ b/service/iot/api_op_DeleteSecurityProfile.go @@ -53,6 +53,9 @@ func addOperationDeleteSecurityProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteSecurityProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteStream.go b/service/iot/api_op_DeleteStream.go index eebb414f47d..cd2537d084a 100644 --- a/service/iot/api_op_DeleteStream.go +++ b/service/iot/api_op_DeleteStream.go @@ -48,6 +48,9 @@ func addOperationDeleteStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteThing.go b/service/iot/api_op_DeleteThing.go index ef71b715ed4..b6da9665213 100644 --- a/service/iot/api_op_DeleteThing.go +++ b/service/iot/api_op_DeleteThing.go @@ -56,6 +56,9 @@ func addOperationDeleteThingMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteThingMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteThingGroup.go b/service/iot/api_op_DeleteThingGroup.go index 2e30bb5f58d..3e5d20f0ef0 100644 --- a/service/iot/api_op_DeleteThingGroup.go +++ b/service/iot/api_op_DeleteThingGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteThingGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteThingGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteThingType.go b/service/iot/api_op_DeleteThingType.go index 03551925319..57b711bb743 100644 --- a/service/iot/api_op_DeleteThingType.go +++ b/service/iot/api_op_DeleteThingType.go @@ -54,6 +54,9 @@ func addOperationDeleteThingTypeMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteThingTypeMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteTopicRule.go b/service/iot/api_op_DeleteTopicRule.go index 430fc4dc40f..5ca02ec1334 100644 --- a/service/iot/api_op_DeleteTopicRule.go +++ b/service/iot/api_op_DeleteTopicRule.go @@ -49,6 +49,9 @@ func addOperationDeleteTopicRuleMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteTopicRuleMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteTopicRuleDestination.go b/service/iot/api_op_DeleteTopicRuleDestination.go index 08661c21bd6..b2125799f5e 100644 --- a/service/iot/api_op_DeleteTopicRuleDestination.go +++ b/service/iot/api_op_DeleteTopicRuleDestination.go @@ -48,6 +48,9 @@ func addOperationDeleteTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeleteV2LoggingLevel.go b/service/iot/api_op_DeleteV2LoggingLevel.go index 297c85e483a..8bf649deec2 100644 --- a/service/iot/api_op_DeleteV2LoggingLevel.go +++ b/service/iot/api_op_DeleteV2LoggingLevel.go @@ -54,6 +54,9 @@ func addOperationDeleteV2LoggingLevelMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteV2LoggingLevelMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DeprecateThingType.go b/service/iot/api_op_DeprecateThingType.go index b700904143c..1c3d6165e53 100644 --- a/service/iot/api_op_DeprecateThingType.go +++ b/service/iot/api_op_DeprecateThingType.go @@ -55,6 +55,9 @@ func addOperationDeprecateThingTypeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeprecateThingTypeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeAccountAuditConfiguration.go b/service/iot/api_op_DescribeAccountAuditConfiguration.go index 32974d8c425..cfb68536971 100644 --- a/service/iot/api_op_DescribeAccountAuditConfiguration.go +++ b/service/iot/api_op_DescribeAccountAuditConfiguration.go @@ -60,6 +60,9 @@ func addOperationDescribeAccountAuditConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeAccountAuditConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeAuditFinding.go b/service/iot/api_op_DescribeAuditFinding.go index 2bcb04a94e4..5211b85f9d3 100644 --- a/service/iot/api_op_DescribeAuditFinding.go +++ b/service/iot/api_op_DescribeAuditFinding.go @@ -56,6 +56,9 @@ func addOperationDescribeAuditFindingMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeAuditFindingMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeAuditMitigationActionsTask.go b/service/iot/api_op_DescribeAuditMitigationActionsTask.go index 99d2f93011b..4b18741a194 100644 --- a/service/iot/api_op_DescribeAuditMitigationActionsTask.go +++ b/service/iot/api_op_DescribeAuditMitigationActionsTask.go @@ -79,6 +79,9 @@ func addOperationDescribeAuditMitigationActionsTaskMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeAuditMitigationActionsTaskMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeAuditSuppression.go b/service/iot/api_op_DescribeAuditSuppression.go index e0812914c29..329359ad8d3 100644 --- a/service/iot/api_op_DescribeAuditSuppression.go +++ b/service/iot/api_op_DescribeAuditSuppression.go @@ -77,6 +77,9 @@ func addOperationDescribeAuditSuppressionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeAuditSuppressionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeAuditTask.go b/service/iot/api_op_DescribeAuditTask.go index ef2ad5ba25f..e1489f26402 100644 --- a/service/iot/api_op_DescribeAuditTask.go +++ b/service/iot/api_op_DescribeAuditTask.go @@ -70,6 +70,9 @@ func addOperationDescribeAuditTaskMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeAuditTaskMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeAuthorizer.go b/service/iot/api_op_DescribeAuthorizer.go index 97a5a7a50c8..edcc111ef3f 100644 --- a/service/iot/api_op_DescribeAuthorizer.go +++ b/service/iot/api_op_DescribeAuthorizer.go @@ -53,6 +53,9 @@ func addOperationDescribeAuthorizerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeAuthorizerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeBillingGroup.go b/service/iot/api_op_DescribeBillingGroup.go index c218199ee1e..d0f707b0138 100644 --- a/service/iot/api_op_DescribeBillingGroup.go +++ b/service/iot/api_op_DescribeBillingGroup.go @@ -68,6 +68,9 @@ func addOperationDescribeBillingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeBillingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeCACertificate.go b/service/iot/api_op_DescribeCACertificate.go index d9b5f941992..b2865644ed2 100644 --- a/service/iot/api_op_DescribeCACertificate.go +++ b/service/iot/api_op_DescribeCACertificate.go @@ -58,6 +58,9 @@ func addOperationDescribeCACertificateMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeCACertificateMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeCertificate.go b/service/iot/api_op_DescribeCertificate.go index a9ab5b2fc76..a26c2952f83 100644 --- a/service/iot/api_op_DescribeCertificate.go +++ b/service/iot/api_op_DescribeCertificate.go @@ -56,6 +56,9 @@ func addOperationDescribeCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeDefaultAuthorizer.go b/service/iot/api_op_DescribeDefaultAuthorizer.go index 888a77b6957..aedce9c8066 100644 --- a/service/iot/api_op_DescribeDefaultAuthorizer.go +++ b/service/iot/api_op_DescribeDefaultAuthorizer.go @@ -48,6 +48,9 @@ func addOperationDescribeDefaultAuthorizerMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDescribeDefaultAuthorizerMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeDimension.go b/service/iot/api_op_DescribeDimension.go index a014b651027..f48a024eca6 100644 --- a/service/iot/api_op_DescribeDimension.go +++ b/service/iot/api_op_DescribeDimension.go @@ -70,6 +70,9 @@ func addOperationDescribeDimensionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeDimensionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeDomainConfiguration.go b/service/iot/api_op_DescribeDomainConfiguration.go index a88b72ee1f4..e988313543a 100644 --- a/service/iot/api_op_DescribeDomainConfiguration.go +++ b/service/iot/api_op_DescribeDomainConfiguration.go @@ -80,6 +80,9 @@ func addOperationDescribeDomainConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeDomainConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeEndpoint.go b/service/iot/api_op_DescribeEndpoint.go index c175d4d0d8e..c6d4d9ed324 100644 --- a/service/iot/api_op_DescribeEndpoint.go +++ b/service/iot/api_op_DescribeEndpoint.go @@ -69,6 +69,9 @@ func addOperationDescribeEndpointMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeEndpointMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeEventConfigurations.go b/service/iot/api_op_DescribeEventConfigurations.go index 225747d6a0f..9afefab71b2 100644 --- a/service/iot/api_op_DescribeEventConfigurations.go +++ b/service/iot/api_op_DescribeEventConfigurations.go @@ -55,6 +55,9 @@ func addOperationDescribeEventConfigurationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribeEventConfigurationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeIndex.go b/service/iot/api_op_DescribeIndex.go index 97eaaa82739..588cfff2d58 100644 --- a/service/iot/api_op_DescribeIndex.go +++ b/service/iot/api_op_DescribeIndex.go @@ -73,6 +73,9 @@ func addOperationDescribeIndexMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeIndexMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeJob.go b/service/iot/api_op_DescribeJob.go index 3f890351992..ec14b17a93b 100644 --- a/service/iot/api_op_DescribeJob.go +++ b/service/iot/api_op_DescribeJob.go @@ -56,6 +56,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeJobExecution.go b/service/iot/api_op_DescribeJobExecution.go index 8345c6d164d..65e71565b71 100644 --- a/service/iot/api_op_DescribeJobExecution.go +++ b/service/iot/api_op_DescribeJobExecution.go @@ -62,6 +62,9 @@ func addOperationDescribeJobExecutionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeJobExecutionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeMitigationAction.go b/service/iot/api_op_DescribeMitigationAction.go index 33b719ac200..297001b4759 100644 --- a/service/iot/api_op_DescribeMitigationAction.go +++ b/service/iot/api_op_DescribeMitigationAction.go @@ -76,6 +76,9 @@ func addOperationDescribeMitigationActionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeMitigationActionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeProvisioningTemplate.go b/service/iot/api_op_DescribeProvisioningTemplate.go index dc9612b3d3a..7b84d5e32e8 100644 --- a/service/iot/api_op_DescribeProvisioningTemplate.go +++ b/service/iot/api_op_DescribeProvisioningTemplate.go @@ -82,6 +82,9 @@ func addOperationDescribeProvisioningTemplateMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeProvisioningTemplateMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeProvisioningTemplateVersion.go b/service/iot/api_op_DescribeProvisioningTemplateVersion.go index ea87bc4a7ed..f0ff458542c 100644 --- a/service/iot/api_op_DescribeProvisioningTemplateVersion.go +++ b/service/iot/api_op_DescribeProvisioningTemplateVersion.go @@ -67,6 +67,9 @@ func addOperationDescribeProvisioningTemplateVersionMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeProvisioningTemplateVersionMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeRoleAlias.go b/service/iot/api_op_DescribeRoleAlias.go index 4e05448b42a..d855336023b 100644 --- a/service/iot/api_op_DescribeRoleAlias.go +++ b/service/iot/api_op_DescribeRoleAlias.go @@ -53,6 +53,9 @@ func addOperationDescribeRoleAliasMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeRoleAliasMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeScheduledAudit.go b/service/iot/api_op_DescribeScheduledAudit.go index 00327dc8e16..a2605dcc70f 100644 --- a/service/iot/api_op_DescribeScheduledAudit.go +++ b/service/iot/api_op_DescribeScheduledAudit.go @@ -75,6 +75,9 @@ func addOperationDescribeScheduledAuditMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeScheduledAuditMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeSecurityProfile.go b/service/iot/api_op_DescribeSecurityProfile.go index d77dcbeb6a2..532a107daca 100644 --- a/service/iot/api_op_DescribeSecurityProfile.go +++ b/service/iot/api_op_DescribeSecurityProfile.go @@ -88,6 +88,9 @@ func addOperationDescribeSecurityProfileMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeSecurityProfileMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeStream.go b/service/iot/api_op_DescribeStream.go index 311a66341e6..20710f9d28a 100644 --- a/service/iot/api_op_DescribeStream.go +++ b/service/iot/api_op_DescribeStream.go @@ -53,6 +53,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeThing.go b/service/iot/api_op_DescribeThing.go index fd8b8b7ed8f..223831527b7 100644 --- a/service/iot/api_op_DescribeThing.go +++ b/service/iot/api_op_DescribeThing.go @@ -83,6 +83,9 @@ func addOperationDescribeThingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeThingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeThingGroup.go b/service/iot/api_op_DescribeThingGroup.go index 68a0896269f..e6ed3393d80 100644 --- a/service/iot/api_op_DescribeThingGroup.go +++ b/service/iot/api_op_DescribeThingGroup.go @@ -80,6 +80,9 @@ func addOperationDescribeThingGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeThingGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeThingRegistrationTask.go b/service/iot/api_op_DescribeThingRegistrationTask.go index 90553fc499f..0bdaaf2616a 100644 --- a/service/iot/api_op_DescribeThingRegistrationTask.go +++ b/service/iot/api_op_DescribeThingRegistrationTask.go @@ -87,6 +87,9 @@ func addOperationDescribeThingRegistrationTaskMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeThingRegistrationTaskMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DescribeThingType.go b/service/iot/api_op_DescribeThingType.go index e3e707e0875..7b7eb2662c5 100644 --- a/service/iot/api_op_DescribeThingType.go +++ b/service/iot/api_op_DescribeThingType.go @@ -70,6 +70,9 @@ func addOperationDescribeThingTypeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeThingTypeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DetachPolicy.go b/service/iot/api_op_DetachPolicy.go index e82167c4d7c..2429c3c6b9f 100644 --- a/service/iot/api_op_DetachPolicy.go +++ b/service/iot/api_op_DetachPolicy.go @@ -53,6 +53,9 @@ func addOperationDetachPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDetachPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DetachPrincipalPolicy.go b/service/iot/api_op_DetachPrincipalPolicy.go index fc54f626898..0cc0112ab9d 100644 --- a/service/iot/api_op_DetachPrincipalPolicy.go +++ b/service/iot/api_op_DetachPrincipalPolicy.go @@ -57,6 +57,9 @@ func addOperationDetachPrincipalPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDetachPrincipalPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DetachSecurityProfile.go b/service/iot/api_op_DetachSecurityProfile.go index 1b9168f237f..7194f14a105 100644 --- a/service/iot/api_op_DetachSecurityProfile.go +++ b/service/iot/api_op_DetachSecurityProfile.go @@ -54,6 +54,9 @@ func addOperationDetachSecurityProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDetachSecurityProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DetachThingPrincipal.go b/service/iot/api_op_DetachThingPrincipal.go index 35fea30a563..4b9462bcb66 100644 --- a/service/iot/api_op_DetachThingPrincipal.go +++ b/service/iot/api_op_DetachThingPrincipal.go @@ -60,6 +60,9 @@ func addOperationDetachThingPrincipalMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDetachThingPrincipalMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_DisableTopicRule.go b/service/iot/api_op_DisableTopicRule.go index dd423d92a0b..b8739553171 100644 --- a/service/iot/api_op_DisableTopicRule.go +++ b/service/iot/api_op_DisableTopicRule.go @@ -49,6 +49,9 @@ func addOperationDisableTopicRuleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisableTopicRuleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_EnableTopicRule.go b/service/iot/api_op_EnableTopicRule.go index ed52b1d263b..077fee81cd4 100644 --- a/service/iot/api_op_EnableTopicRule.go +++ b/service/iot/api_op_EnableTopicRule.go @@ -49,6 +49,9 @@ func addOperationEnableTopicRuleMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationEnableTopicRuleMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetCardinality.go b/service/iot/api_op_GetCardinality.go index 75dce81c141..ba4f5e107e0 100644 --- a/service/iot/api_op_GetCardinality.go +++ b/service/iot/api_op_GetCardinality.go @@ -61,6 +61,9 @@ func addOperationGetCardinalityMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetCardinalityMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetEffectivePolicies.go b/service/iot/api_op_GetEffectivePolicies.go index 2239e25e2c1..f7f8e1a7390 100644 --- a/service/iot/api_op_GetEffectivePolicies.go +++ b/service/iot/api_op_GetEffectivePolicies.go @@ -60,6 +60,9 @@ func addOperationGetEffectivePoliciesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetEffectivePoliciesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetIndexingConfiguration.go b/service/iot/api_op_GetIndexingConfiguration.go index 4acd9c96524..fbcd02e1df8 100644 --- a/service/iot/api_op_GetIndexingConfiguration.go +++ b/service/iot/api_op_GetIndexingConfiguration.go @@ -51,6 +51,9 @@ func addOperationGetIndexingConfigurationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetIndexingConfigurationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetJobDocument.go b/service/iot/api_op_GetJobDocument.go index 4d54329bfed..c7079256821 100644 --- a/service/iot/api_op_GetJobDocument.go +++ b/service/iot/api_op_GetJobDocument.go @@ -52,6 +52,9 @@ func addOperationGetJobDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGetJobDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetLoggingOptions.go b/service/iot/api_op_GetLoggingOptions.go index 956275e1070..0ed752062e7 100644 --- a/service/iot/api_op_GetLoggingOptions.go +++ b/service/iot/api_op_GetLoggingOptions.go @@ -54,6 +54,9 @@ func addOperationGetLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetOTAUpdate.go b/service/iot/api_op_GetOTAUpdate.go index 3212ff7c803..b46e1c62b42 100644 --- a/service/iot/api_op_GetOTAUpdate.go +++ b/service/iot/api_op_GetOTAUpdate.go @@ -53,6 +53,9 @@ func addOperationGetOTAUpdateMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetOTAUpdateMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetPercentiles.go b/service/iot/api_op_GetPercentiles.go index 059772fdcec..9b304dd7197 100644 --- a/service/iot/api_op_GetPercentiles.go +++ b/service/iot/api_op_GetPercentiles.go @@ -73,6 +73,9 @@ func addOperationGetPercentilesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetPercentilesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetPolicy.go b/service/iot/api_op_GetPolicy.go index f0453b44f82..7d0a39c826e 100644 --- a/service/iot/api_op_GetPolicy.go +++ b/service/iot/api_op_GetPolicy.go @@ -74,6 +74,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetPolicyVersion.go b/service/iot/api_op_GetPolicyVersion.go index 0f5389af5d3..c4268b7eeb1 100644 --- a/service/iot/api_op_GetPolicyVersion.go +++ b/service/iot/api_op_GetPolicyVersion.go @@ -81,6 +81,9 @@ func addOperationGetPolicyVersionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetPolicyVersionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetRegistrationCode.go b/service/iot/api_op_GetRegistrationCode.go index 454ae4bf61d..d5415a349b4 100644 --- a/service/iot/api_op_GetRegistrationCode.go +++ b/service/iot/api_op_GetRegistrationCode.go @@ -49,6 +49,9 @@ func addOperationGetRegistrationCodeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGetRegistrationCodeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetStatistics.go b/service/iot/api_op_GetStatistics.go index 4fd417d29e0..170e5caca01 100644 --- a/service/iot/api_op_GetStatistics.go +++ b/service/iot/api_op_GetStatistics.go @@ -66,6 +66,9 @@ func addOperationGetStatisticsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetStatisticsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetTopicRule.go b/service/iot/api_op_GetTopicRule.go index 94233c99263..f42d6d33867 100644 --- a/service/iot/api_op_GetTopicRule.go +++ b/service/iot/api_op_GetTopicRule.go @@ -58,6 +58,9 @@ func addOperationGetTopicRuleMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetTopicRuleMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetTopicRuleDestination.go b/service/iot/api_op_GetTopicRuleDestination.go index 9d5f9f4bf7d..381dc77e823 100644 --- a/service/iot/api_op_GetTopicRuleDestination.go +++ b/service/iot/api_op_GetTopicRuleDestination.go @@ -53,6 +53,9 @@ func addOperationGetTopicRuleDestinationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetTopicRuleDestinationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_GetV2LoggingOptions.go b/service/iot/api_op_GetV2LoggingOptions.go index 710d5754fb9..0794c894ae0 100644 --- a/service/iot/api_op_GetV2LoggingOptions.go +++ b/service/iot/api_op_GetV2LoggingOptions.go @@ -54,6 +54,9 @@ func addOperationGetV2LoggingOptionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetV2LoggingOptionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListActiveViolations.go b/service/iot/api_op_ListActiveViolations.go index 214187cdc7a..c272d1770da 100644 --- a/service/iot/api_op_ListActiveViolations.go +++ b/service/iot/api_op_ListActiveViolations.go @@ -65,6 +65,9 @@ func addOperationListActiveViolationsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListActiveViolationsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAttachedPolicies.go b/service/iot/api_op_ListAttachedPolicies.go index c720396055f..1c3853d7f6b 100644 --- a/service/iot/api_op_ListAttachedPolicies.go +++ b/service/iot/api_op_ListAttachedPolicies.go @@ -69,6 +69,9 @@ func addOperationListAttachedPoliciesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListAttachedPoliciesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAuditFindings.go b/service/iot/api_op_ListAuditFindings.go index 457ee0205fe..5bac85f59bc 100644 --- a/service/iot/api_op_ListAuditFindings.go +++ b/service/iot/api_op_ListAuditFindings.go @@ -83,6 +83,9 @@ func addOperationListAuditFindingsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListAuditFindingsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAuditMitigationActionsExecutions.go b/service/iot/api_op_ListAuditMitigationActionsExecutions.go index 6519c347ed0..71e0950b185 100644 --- a/service/iot/api_op_ListAuditMitigationActionsExecutions.go +++ b/service/iot/api_op_ListAuditMitigationActionsExecutions.go @@ -73,6 +73,9 @@ func addOperationListAuditMitigationActionsExecutionsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListAuditMitigationActionsExecutionsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAuditMitigationActionsTasks.go b/service/iot/api_op_ListAuditMitigationActionsTasks.go index 3d80eff3c15..03eb9e9a406 100644 --- a/service/iot/api_op_ListAuditMitigationActionsTasks.go +++ b/service/iot/api_op_ListAuditMitigationActionsTasks.go @@ -81,6 +81,9 @@ func addOperationListAuditMitigationActionsTasksMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListAuditMitigationActionsTasksMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAuditSuppressions.go b/service/iot/api_op_ListAuditSuppressions.go index 8d1b2f97e28..a13b16aef8a 100644 --- a/service/iot/api_op_ListAuditSuppressions.go +++ b/service/iot/api_op_ListAuditSuppressions.go @@ -71,6 +71,9 @@ func addOperationListAuditSuppressionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListAuditSuppressionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAuditTasks.go b/service/iot/api_op_ListAuditTasks.go index 131e6974dff..cf000f5813a 100644 --- a/service/iot/api_op_ListAuditTasks.go +++ b/service/iot/api_op_ListAuditTasks.go @@ -80,6 +80,9 @@ func addOperationListAuditTasksMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListAuditTasksMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListAuthorizers.go b/service/iot/api_op_ListAuthorizers.go index 1fd2729dd4f..193e0ebdbcf 100644 --- a/service/iot/api_op_ListAuthorizers.go +++ b/service/iot/api_op_ListAuthorizers.go @@ -63,6 +63,9 @@ func addOperationListAuthorizersMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListAuthorizersMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListBillingGroups.go b/service/iot/api_op_ListBillingGroups.go index b656711624e..2448a7ee3ca 100644 --- a/service/iot/api_op_ListBillingGroups.go +++ b/service/iot/api_op_ListBillingGroups.go @@ -61,6 +61,9 @@ func addOperationListBillingGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListBillingGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListCACertificates.go b/service/iot/api_op_ListCACertificates.go index 2f03056fa2e..b2243c4f9fd 100644 --- a/service/iot/api_op_ListCACertificates.go +++ b/service/iot/api_op_ListCACertificates.go @@ -64,6 +64,9 @@ func addOperationListCACertificatesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListCACertificatesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListCertificates.go b/service/iot/api_op_ListCertificates.go index 7e905b994ba..32535e000e2 100644 --- a/service/iot/api_op_ListCertificates.go +++ b/service/iot/api_op_ListCertificates.go @@ -66,6 +66,9 @@ func addOperationListCertificatesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListCertificatesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListCertificatesByCA.go b/service/iot/api_op_ListCertificatesByCA.go index 8a9f32a164e..18a02f901e8 100644 --- a/service/iot/api_op_ListCertificatesByCA.go +++ b/service/iot/api_op_ListCertificatesByCA.go @@ -70,6 +70,9 @@ func addOperationListCertificatesByCAMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListCertificatesByCAMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListDimensions.go b/service/iot/api_op_ListDimensions.go index fca5a063333..4c0ecc50218 100644 --- a/service/iot/api_op_ListDimensions.go +++ b/service/iot/api_op_ListDimensions.go @@ -58,6 +58,9 @@ func addOperationListDimensionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListDimensionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListDomainConfigurations.go b/service/iot/api_op_ListDomainConfigurations.go index e59408725fa..12a5fe14329 100644 --- a/service/iot/api_op_ListDomainConfigurations.go +++ b/service/iot/api_op_ListDomainConfigurations.go @@ -63,6 +63,9 @@ func addOperationListDomainConfigurationsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListDomainConfigurationsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListIndices.go b/service/iot/api_op_ListIndices.go index 4fe984d6a4f..bfe4077b1e3 100644 --- a/service/iot/api_op_ListIndices.go +++ b/service/iot/api_op_ListIndices.go @@ -58,6 +58,9 @@ func addOperationListIndicesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListIndicesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListJobExecutionsForJob.go b/service/iot/api_op_ListJobExecutionsForJob.go index bdad26b1061..cad6ca09c27 100644 --- a/service/iot/api_op_ListJobExecutionsForJob.go +++ b/service/iot/api_op_ListJobExecutionsForJob.go @@ -66,6 +66,9 @@ func addOperationListJobExecutionsForJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListJobExecutionsForJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListJobExecutionsForThing.go b/service/iot/api_op_ListJobExecutionsForThing.go index 91b174e412c..6f722cb9014 100644 --- a/service/iot/api_op_ListJobExecutionsForThing.go +++ b/service/iot/api_op_ListJobExecutionsForThing.go @@ -73,6 +73,9 @@ func addOperationListJobExecutionsForThingMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListJobExecutionsForThingMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListJobs.go b/service/iot/api_op_ListJobs.go index 2d6202288d4..df6dcadddb7 100644 --- a/service/iot/api_op_ListJobs.go +++ b/service/iot/api_op_ListJobs.go @@ -82,6 +82,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListMitigationActions.go b/service/iot/api_op_ListMitigationActions.go index 4f3a5e86aca..dd096dc8d23 100644 --- a/service/iot/api_op_ListMitigationActions.go +++ b/service/iot/api_op_ListMitigationActions.go @@ -61,6 +61,9 @@ func addOperationListMitigationActionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListMitigationActionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListOTAUpdates.go b/service/iot/api_op_ListOTAUpdates.go index bcb06a8fdd2..d79ec251b38 100644 --- a/service/iot/api_op_ListOTAUpdates.go +++ b/service/iot/api_op_ListOTAUpdates.go @@ -60,6 +60,9 @@ func addOperationListOTAUpdatesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListOTAUpdatesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListOutgoingCertificates.go b/service/iot/api_op_ListOutgoingCertificates.go index fd52097ea43..765ae4b2765 100644 --- a/service/iot/api_op_ListOutgoingCertificates.go +++ b/service/iot/api_op_ListOutgoingCertificates.go @@ -63,6 +63,9 @@ func addOperationListOutgoingCertificatesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListOutgoingCertificatesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListPolicies.go b/service/iot/api_op_ListPolicies.go index 4f733f75925..2b2e3bec81a 100644 --- a/service/iot/api_op_ListPolicies.go +++ b/service/iot/api_op_ListPolicies.go @@ -64,6 +64,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListPolicyPrincipals.go b/service/iot/api_op_ListPolicyPrincipals.go index 3c78a61e64c..cf355427b73 100644 --- a/service/iot/api_op_ListPolicyPrincipals.go +++ b/service/iot/api_op_ListPolicyPrincipals.go @@ -69,6 +69,9 @@ func addOperationListPolicyPrincipalsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListPolicyPrincipalsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListPolicyVersions.go b/service/iot/api_op_ListPolicyVersions.go index 560dd305b56..94da9d18871 100644 --- a/service/iot/api_op_ListPolicyVersions.go +++ b/service/iot/api_op_ListPolicyVersions.go @@ -55,6 +55,9 @@ func addOperationListPolicyVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListPolicyVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListPrincipalPolicies.go b/service/iot/api_op_ListPrincipalPolicies.go index 4e235c7a38f..dfe8c6e3d44 100644 --- a/service/iot/api_op_ListPrincipalPolicies.go +++ b/service/iot/api_op_ListPrincipalPolicies.go @@ -74,6 +74,9 @@ func addOperationListPrincipalPoliciesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListPrincipalPoliciesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListPrincipalThings.go b/service/iot/api_op_ListPrincipalThings.go index fe94d099402..a137f788c09 100644 --- a/service/iot/api_op_ListPrincipalThings.go +++ b/service/iot/api_op_ListPrincipalThings.go @@ -66,6 +66,9 @@ func addOperationListPrincipalThingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListPrincipalThingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListProvisioningTemplateVersions.go b/service/iot/api_op_ListProvisioningTemplateVersions.go index 0f8a5170319..be36233c3e1 100644 --- a/service/iot/api_op_ListProvisioningTemplateVersions.go +++ b/service/iot/api_op_ListProvisioningTemplateVersions.go @@ -62,6 +62,9 @@ func addOperationListProvisioningTemplateVersionsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListProvisioningTemplateVersionsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListProvisioningTemplates.go b/service/iot/api_op_ListProvisioningTemplates.go index 82043521113..805d5b50150 100644 --- a/service/iot/api_op_ListProvisioningTemplates.go +++ b/service/iot/api_op_ListProvisioningTemplates.go @@ -57,6 +57,9 @@ func addOperationListProvisioningTemplatesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListProvisioningTemplatesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListRoleAliases.go b/service/iot/api_op_ListRoleAliases.go index cb8d8f61c8f..7b585cb6365 100644 --- a/service/iot/api_op_ListRoleAliases.go +++ b/service/iot/api_op_ListRoleAliases.go @@ -59,6 +59,9 @@ func addOperationListRoleAliasesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListRoleAliasesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListScheduledAudits.go b/service/iot/api_op_ListScheduledAudits.go index 4c87a8e9f94..f6afea22eef 100644 --- a/service/iot/api_op_ListScheduledAudits.go +++ b/service/iot/api_op_ListScheduledAudits.go @@ -58,6 +58,9 @@ func addOperationListScheduledAuditsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListScheduledAuditsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListSecurityProfiles.go b/service/iot/api_op_ListSecurityProfiles.go index 89f331ff7cd..9091a98b691 100644 --- a/service/iot/api_op_ListSecurityProfiles.go +++ b/service/iot/api_op_ListSecurityProfiles.go @@ -64,6 +64,9 @@ func addOperationListSecurityProfilesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListSecurityProfilesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListSecurityProfilesForTarget.go b/service/iot/api_op_ListSecurityProfilesForTarget.go index 4faa83aced1..59ca8a52e01 100644 --- a/service/iot/api_op_ListSecurityProfilesForTarget.go +++ b/service/iot/api_op_ListSecurityProfilesForTarget.go @@ -67,6 +67,9 @@ func addOperationListSecurityProfilesForTargetMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListSecurityProfilesForTargetMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListStreams.go b/service/iot/api_op_ListStreams.go index cad58e93391..2f1fc466def 100644 --- a/service/iot/api_op_ListStreams.go +++ b/service/iot/api_op_ListStreams.go @@ -60,6 +60,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListTagsForResource.go b/service/iot/api_op_ListTagsForResource.go index 0e7084a6c7b..5077f86717d 100644 --- a/service/iot/api_op_ListTagsForResource.go +++ b/service/iot/api_op_ListTagsForResource.go @@ -60,6 +60,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListTargetsForPolicy.go b/service/iot/api_op_ListTargetsForPolicy.go index 20f1657cf83..14938b25d53 100644 --- a/service/iot/api_op_ListTargetsForPolicy.go +++ b/service/iot/api_op_ListTargetsForPolicy.go @@ -61,6 +61,9 @@ func addOperationListTargetsForPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTargetsForPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListTargetsForSecurityProfile.go b/service/iot/api_op_ListTargetsForSecurityProfile.go index 0a26e29e451..6dedaea4452 100644 --- a/service/iot/api_op_ListTargetsForSecurityProfile.go +++ b/service/iot/api_op_ListTargetsForSecurityProfile.go @@ -64,6 +64,9 @@ func addOperationListTargetsForSecurityProfileMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListTargetsForSecurityProfileMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingGroups.go b/service/iot/api_op_ListThingGroups.go index 0d3ed41530b..317b3297789 100644 --- a/service/iot/api_op_ListThingGroups.go +++ b/service/iot/api_op_ListThingGroups.go @@ -67,6 +67,9 @@ func addOperationListThingGroupsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListThingGroupsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingGroupsForThing.go b/service/iot/api_op_ListThingGroupsForThing.go index cedb4777706..3009f83ab23 100644 --- a/service/iot/api_op_ListThingGroupsForThing.go +++ b/service/iot/api_op_ListThingGroupsForThing.go @@ -63,6 +63,9 @@ func addOperationListThingGroupsForThingMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListThingGroupsForThingMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingPrincipals.go b/service/iot/api_op_ListThingPrincipals.go index aa27c395d28..4be53b779f6 100644 --- a/service/iot/api_op_ListThingPrincipals.go +++ b/service/iot/api_op_ListThingPrincipals.go @@ -56,6 +56,9 @@ func addOperationListThingPrincipalsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListThingPrincipalsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingRegistrationTaskReports.go b/service/iot/api_op_ListThingRegistrationTaskReports.go index 467054f9961..be96b31333c 100644 --- a/service/iot/api_op_ListThingRegistrationTaskReports.go +++ b/service/iot/api_op_ListThingRegistrationTaskReports.go @@ -71,6 +71,9 @@ func addOperationListThingRegistrationTaskReportsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListThingRegistrationTaskReportsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingRegistrationTasks.go b/service/iot/api_op_ListThingRegistrationTasks.go index 85814465ef1..d58d5404f2b 100644 --- a/service/iot/api_op_ListThingRegistrationTasks.go +++ b/service/iot/api_op_ListThingRegistrationTasks.go @@ -61,6 +61,9 @@ func addOperationListThingRegistrationTasksMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListThingRegistrationTasksMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingTypes.go b/service/iot/api_op_ListThingTypes.go index c9b41c5d7d6..84be6fe200b 100644 --- a/service/iot/api_op_ListThingTypes.go +++ b/service/iot/api_op_ListThingTypes.go @@ -63,6 +63,9 @@ func addOperationListThingTypesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListThingTypesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThings.go b/service/iot/api_op_ListThings.go index 4c153ae2399..4ed6314221d 100644 --- a/service/iot/api_op_ListThings.go +++ b/service/iot/api_op_ListThings.go @@ -75,6 +75,9 @@ func addOperationListThingsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListThingsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingsInBillingGroup.go b/service/iot/api_op_ListThingsInBillingGroup.go index a4075d6ed6b..f492c150efa 100644 --- a/service/iot/api_op_ListThingsInBillingGroup.go +++ b/service/iot/api_op_ListThingsInBillingGroup.go @@ -62,6 +62,9 @@ func addOperationListThingsInBillingGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListThingsInBillingGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListThingsInThingGroup.go b/service/iot/api_op_ListThingsInThingGroup.go index e224fbbcfc1..f511eb6ec1e 100644 --- a/service/iot/api_op_ListThingsInThingGroup.go +++ b/service/iot/api_op_ListThingsInThingGroup.go @@ -65,6 +65,9 @@ func addOperationListThingsInThingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListThingsInThingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListTopicRuleDestinations.go b/service/iot/api_op_ListTopicRuleDestinations.go index b9ac4733bdb..0f4be633588 100644 --- a/service/iot/api_op_ListTopicRuleDestinations.go +++ b/service/iot/api_op_ListTopicRuleDestinations.go @@ -57,6 +57,9 @@ func addOperationListTopicRuleDestinationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTopicRuleDestinationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListTopicRules.go b/service/iot/api_op_ListTopicRules.go index e169777de87..25bfcdecb75 100644 --- a/service/iot/api_op_ListTopicRules.go +++ b/service/iot/api_op_ListTopicRules.go @@ -65,6 +65,9 @@ func addOperationListTopicRulesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTopicRulesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListV2LoggingLevels.go b/service/iot/api_op_ListV2LoggingLevels.go index 7deb08e2b0c..7448148d0d4 100644 --- a/service/iot/api_op_ListV2LoggingLevels.go +++ b/service/iot/api_op_ListV2LoggingLevels.go @@ -62,6 +62,9 @@ func addOperationListV2LoggingLevelsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListV2LoggingLevelsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ListViolationEvents.go b/service/iot/api_op_ListViolationEvents.go index 068c0c2b923..4a1446bd12e 100644 --- a/service/iot/api_op_ListViolationEvents.go +++ b/service/iot/api_op_ListViolationEvents.go @@ -80,6 +80,9 @@ func addOperationListViolationEventsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListViolationEventsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RegisterCACertificate.go b/service/iot/api_op_RegisterCACertificate.go index 627136af9df..945bb77c73d 100644 --- a/service/iot/api_op_RegisterCACertificate.go +++ b/service/iot/api_op_RegisterCACertificate.go @@ -85,6 +85,9 @@ func addOperationRegisterCACertificateMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationRegisterCACertificateMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RegisterCertificate.go b/service/iot/api_op_RegisterCertificate.go index 3a9a2a2d5d6..4dab2e26062 100644 --- a/service/iot/api_op_RegisterCertificate.go +++ b/service/iot/api_op_RegisterCertificate.go @@ -69,6 +69,9 @@ func addOperationRegisterCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationRegisterCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RegisterCertificateWithoutCA.go b/service/iot/api_op_RegisterCertificateWithoutCA.go index ea7744e2e69..efca963eaaf 100644 --- a/service/iot/api_op_RegisterCertificateWithoutCA.go +++ b/service/iot/api_op_RegisterCertificateWithoutCA.go @@ -60,6 +60,9 @@ func addOperationRegisterCertificateWithoutCAMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRegisterCertificateWithoutCAMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RegisterThing.go b/service/iot/api_op_RegisterThing.go index e5901ae9d95..59b99960cd5 100644 --- a/service/iot/api_op_RegisterThing.go +++ b/service/iot/api_op_RegisterThing.go @@ -69,6 +69,9 @@ func addOperationRegisterThingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationRegisterThingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RejectCertificateTransfer.go b/service/iot/api_op_RejectCertificateTransfer.go index 545f7bf1c5e..4a4d8e4de82 100644 --- a/service/iot/api_op_RejectCertificateTransfer.go +++ b/service/iot/api_op_RejectCertificateTransfer.go @@ -58,6 +58,9 @@ func addOperationRejectCertificateTransferMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRejectCertificateTransferMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RemoveThingFromBillingGroup.go b/service/iot/api_op_RemoveThingFromBillingGroup.go index 866f82bd3b3..262c408b3c7 100644 --- a/service/iot/api_op_RemoveThingFromBillingGroup.go +++ b/service/iot/api_op_RemoveThingFromBillingGroup.go @@ -55,6 +55,9 @@ func addOperationRemoveThingFromBillingGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationRemoveThingFromBillingGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_RemoveThingFromThingGroup.go b/service/iot/api_op_RemoveThingFromThingGroup.go index 189644d8ddb..85b16876824 100644 --- a/service/iot/api_op_RemoveThingFromThingGroup.go +++ b/service/iot/api_op_RemoveThingFromThingGroup.go @@ -57,6 +57,9 @@ func addOperationRemoveThingFromThingGroupMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationRemoveThingFromThingGroupMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ReplaceTopicRule.go b/service/iot/api_op_ReplaceTopicRule.go index 33827624a5e..4a496d771c4 100644 --- a/service/iot/api_op_ReplaceTopicRule.go +++ b/service/iot/api_op_ReplaceTopicRule.go @@ -57,6 +57,9 @@ func addOperationReplaceTopicRuleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationReplaceTopicRuleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_SearchIndex.go b/service/iot/api_op_SearchIndex.go index 707935bf304..411eab63738 100644 --- a/service/iot/api_op_SearchIndex.go +++ b/service/iot/api_op_SearchIndex.go @@ -73,6 +73,9 @@ func addOperationSearchIndexMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSearchIndexMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_SetDefaultAuthorizer.go b/service/iot/api_op_SetDefaultAuthorizer.go index 54999289329..b84a893d241 100644 --- a/service/iot/api_op_SetDefaultAuthorizer.go +++ b/service/iot/api_op_SetDefaultAuthorizer.go @@ -56,6 +56,9 @@ func addOperationSetDefaultAuthorizerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationSetDefaultAuthorizerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_SetDefaultPolicyVersion.go b/service/iot/api_op_SetDefaultPolicyVersion.go index c818bdd3d24..fb2c09f27a8 100644 --- a/service/iot/api_op_SetDefaultPolicyVersion.go +++ b/service/iot/api_op_SetDefaultPolicyVersion.go @@ -57,6 +57,9 @@ func addOperationSetDefaultPolicyVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationSetDefaultPolicyVersionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_SetLoggingOptions.go b/service/iot/api_op_SetLoggingOptions.go index fd65b0da299..c6a7dc7f701 100644 --- a/service/iot/api_op_SetLoggingOptions.go +++ b/service/iot/api_op_SetLoggingOptions.go @@ -51,6 +51,9 @@ func addOperationSetLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationSetLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_SetV2LoggingLevel.go b/service/iot/api_op_SetV2LoggingLevel.go index ce3d0b1b7e1..08632af9768 100644 --- a/service/iot/api_op_SetV2LoggingLevel.go +++ b/service/iot/api_op_SetV2LoggingLevel.go @@ -54,6 +54,9 @@ func addOperationSetV2LoggingLevelMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationSetV2LoggingLevelMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_SetV2LoggingOptions.go b/service/iot/api_op_SetV2LoggingOptions.go index 80a27d81782..cb40da5b8ab 100644 --- a/service/iot/api_op_SetV2LoggingOptions.go +++ b/service/iot/api_op_SetV2LoggingOptions.go @@ -53,6 +53,9 @@ func addOperationSetV2LoggingOptionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationSetV2LoggingOptionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_StartAuditMitigationActionsTask.go b/service/iot/api_op_StartAuditMitigationActionsTask.go index ab15f2fe689..aa6df7c4a28 100644 --- a/service/iot/api_op_StartAuditMitigationActionsTask.go +++ b/service/iot/api_op_StartAuditMitigationActionsTask.go @@ -77,6 +77,9 @@ func addOperationStartAuditMitigationActionsTaskMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationStartAuditMitigationActionsTaskMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_StartOnDemandAuditTask.go b/service/iot/api_op_StartOnDemandAuditTask.go index 6c7c0c11f4e..0e39ce5b61e 100644 --- a/service/iot/api_op_StartOnDemandAuditTask.go +++ b/service/iot/api_op_StartOnDemandAuditTask.go @@ -56,6 +56,9 @@ func addOperationStartOnDemandAuditTaskMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartOnDemandAuditTaskMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_StartThingRegistrationTask.go b/service/iot/api_op_StartThingRegistrationTask.go index 3f07a298128..de59c8542f5 100644 --- a/service/iot/api_op_StartThingRegistrationTask.go +++ b/service/iot/api_op_StartThingRegistrationTask.go @@ -69,6 +69,9 @@ func addOperationStartThingRegistrationTaskMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationStartThingRegistrationTaskMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_StopThingRegistrationTask.go b/service/iot/api_op_StopThingRegistrationTask.go index a14acb39970..bd362da6756 100644 --- a/service/iot/api_op_StopThingRegistrationTask.go +++ b/service/iot/api_op_StopThingRegistrationTask.go @@ -48,6 +48,9 @@ func addOperationStopThingRegistrationTaskMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopThingRegistrationTaskMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_TagResource.go b/service/iot/api_op_TagResource.go index 60db20ff3b6..3956d8cdf0d 100644 --- a/service/iot/api_op_TagResource.go +++ b/service/iot/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_TestAuthorization.go b/service/iot/api_op_TestAuthorization.go index d08d88f9b82..dd03161af37 100644 --- a/service/iot/api_op_TestAuthorization.go +++ b/service/iot/api_op_TestAuthorization.go @@ -75,6 +75,9 @@ func addOperationTestAuthorizationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationTestAuthorizationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_TestInvokeAuthorizer.go b/service/iot/api_op_TestInvokeAuthorizer.go index 2828c72efc0..1aa94855fe4 100644 --- a/service/iot/api_op_TestInvokeAuthorizer.go +++ b/service/iot/api_op_TestInvokeAuthorizer.go @@ -83,6 +83,9 @@ func addOperationTestInvokeAuthorizerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationTestInvokeAuthorizerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_TransferCertificate.go b/service/iot/api_op_TransferCertificate.go index a00c9905f3b..c9f0967459f 100644 --- a/service/iot/api_op_TransferCertificate.go +++ b/service/iot/api_op_TransferCertificate.go @@ -69,6 +69,9 @@ func addOperationTransferCertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationTransferCertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UntagResource.go b/service/iot/api_op_UntagResource.go index 4029fe16879..133dfd10237 100644 --- a/service/iot/api_op_UntagResource.go +++ b/service/iot/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateAccountAuditConfiguration.go b/service/iot/api_op_UpdateAccountAuditConfiguration.go index 872731bdef9..4a6d30295fb 100644 --- a/service/iot/api_op_UpdateAccountAuditConfiguration.go +++ b/service/iot/api_op_UpdateAccountAuditConfiguration.go @@ -65,6 +65,9 @@ func addOperationUpdateAccountAuditConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateAccountAuditConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateAuditSuppression.go b/service/iot/api_op_UpdateAuditSuppression.go index f74aa469447..0a768f063e6 100644 --- a/service/iot/api_op_UpdateAuditSuppression.go +++ b/service/iot/api_op_UpdateAuditSuppression.go @@ -68,6 +68,9 @@ func addOperationUpdateAuditSuppressionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateAuditSuppressionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateAuthorizer.go b/service/iot/api_op_UpdateAuthorizer.go index 3c3aca704d7..1990a3bab18 100644 --- a/service/iot/api_op_UpdateAuthorizer.go +++ b/service/iot/api_op_UpdateAuthorizer.go @@ -68,6 +68,9 @@ func addOperationUpdateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateAuthorizerMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateBillingGroup.go b/service/iot/api_op_UpdateBillingGroup.go index 318b381fa89..e1b4efc61e5 100644 --- a/service/iot/api_op_UpdateBillingGroup.go +++ b/service/iot/api_op_UpdateBillingGroup.go @@ -63,6 +63,9 @@ func addOperationUpdateBillingGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateBillingGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateCACertificate.go b/service/iot/api_op_UpdateCACertificate.go index 1b37c435fe3..05e08883006 100644 --- a/service/iot/api_op_UpdateCACertificate.go +++ b/service/iot/api_op_UpdateCACertificate.go @@ -64,6 +64,9 @@ func addOperationUpdateCACertificateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateCACertificateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateCertificate.go b/service/iot/api_op_UpdateCertificate.go index 03e96599b43..f274aee5329 100644 --- a/service/iot/api_op_UpdateCertificate.go +++ b/service/iot/api_op_UpdateCertificate.go @@ -65,6 +65,9 @@ func addOperationUpdateCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateDimension.go b/service/iot/api_op_UpdateDimension.go index 2b135f32828..26a531a2201 100644 --- a/service/iot/api_op_UpdateDimension.go +++ b/service/iot/api_op_UpdateDimension.go @@ -81,6 +81,9 @@ func addOperationUpdateDimensionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdateDimensionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateDomainConfiguration.go b/service/iot/api_op_UpdateDomainConfiguration.go index 0440a883aa5..bc3e2dd80ca 100644 --- a/service/iot/api_op_UpdateDomainConfiguration.go +++ b/service/iot/api_op_UpdateDomainConfiguration.go @@ -67,6 +67,9 @@ func addOperationUpdateDomainConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateDomainConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateDynamicThingGroup.go b/service/iot/api_op_UpdateDynamicThingGroup.go index 88b558e7ca9..c6f2583dc4f 100644 --- a/service/iot/api_op_UpdateDynamicThingGroup.go +++ b/service/iot/api_op_UpdateDynamicThingGroup.go @@ -73,6 +73,9 @@ func addOperationUpdateDynamicThingGroupMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateDynamicThingGroupMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateEventConfigurations.go b/service/iot/api_op_UpdateEventConfigurations.go index be78afa3e16..10ad553975c 100644 --- a/service/iot/api_op_UpdateEventConfigurations.go +++ b/service/iot/api_op_UpdateEventConfigurations.go @@ -47,6 +47,9 @@ func addOperationUpdateEventConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationUpdateEventConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateIndexingConfiguration.go b/service/iot/api_op_UpdateIndexingConfiguration.go index 4b26b9ef8be..f8327c74524 100644 --- a/service/iot/api_op_UpdateIndexingConfiguration.go +++ b/service/iot/api_op_UpdateIndexingConfiguration.go @@ -50,6 +50,9 @@ func addOperationUpdateIndexingConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationUpdateIndexingConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateJob.go b/service/iot/api_op_UpdateJob.go index 24431b07a33..de03a1d3b81 100644 --- a/service/iot/api_op_UpdateJob.go +++ b/service/iot/api_op_UpdateJob.go @@ -74,6 +74,9 @@ func addOperationUpdateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateMitigationAction.go b/service/iot/api_op_UpdateMitigationAction.go index 0490e53f035..1ff62dd4b0a 100644 --- a/service/iot/api_op_UpdateMitigationAction.go +++ b/service/iot/api_op_UpdateMitigationAction.go @@ -64,6 +64,9 @@ func addOperationUpdateMitigationActionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateMitigationActionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateProvisioningTemplate.go b/service/iot/api_op_UpdateProvisioningTemplate.go index 6382c58a361..503ec97dd45 100644 --- a/service/iot/api_op_UpdateProvisioningTemplate.go +++ b/service/iot/api_op_UpdateProvisioningTemplate.go @@ -68,6 +68,9 @@ func addOperationUpdateProvisioningTemplateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateProvisioningTemplateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateRoleAlias.go b/service/iot/api_op_UpdateRoleAlias.go index e93884e8975..7f65406b447 100644 --- a/service/iot/api_op_UpdateRoleAlias.go +++ b/service/iot/api_op_UpdateRoleAlias.go @@ -61,6 +61,9 @@ func addOperationUpdateRoleAliasMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateRoleAliasMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateScheduledAudit.go b/service/iot/api_op_UpdateScheduledAudit.go index 4d3bdeee47a..aab83a71c5a 100644 --- a/service/iot/api_op_UpdateScheduledAudit.go +++ b/service/iot/api_op_UpdateScheduledAudit.go @@ -76,6 +76,9 @@ func addOperationUpdateScheduledAuditMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateScheduledAuditMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateSecurityProfile.go b/service/iot/api_op_UpdateSecurityProfile.go index 6ff592cf4dd..0dda5323ca5 100644 --- a/service/iot/api_op_UpdateSecurityProfile.go +++ b/service/iot/api_op_UpdateSecurityProfile.go @@ -124,6 +124,9 @@ func addOperationUpdateSecurityProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateSecurityProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateStream.go b/service/iot/api_op_UpdateStream.go index 17cc1d88855..3d4a1971a50 100644 --- a/service/iot/api_op_UpdateStream.go +++ b/service/iot/api_op_UpdateStream.go @@ -72,6 +72,9 @@ func addOperationUpdateStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateThing.go b/service/iot/api_op_UpdateThing.go index 635a3a8a386..eabc52f76d6 100644 --- a/service/iot/api_op_UpdateThing.go +++ b/service/iot/api_op_UpdateThing.go @@ -69,6 +69,9 @@ func addOperationUpdateThingMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateThingMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateThingGroup.go b/service/iot/api_op_UpdateThingGroup.go index 665765187e3..b1858b7e027 100644 --- a/service/iot/api_op_UpdateThingGroup.go +++ b/service/iot/api_op_UpdateThingGroup.go @@ -62,6 +62,9 @@ func addOperationUpdateThingGroupMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateThingGroupMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateThingGroupsForThing.go b/service/iot/api_op_UpdateThingGroupsForThing.go index 609b0fc99cc..9560f927362 100644 --- a/service/iot/api_op_UpdateThingGroupsForThing.go +++ b/service/iot/api_op_UpdateThingGroupsForThing.go @@ -58,6 +58,9 @@ func addOperationUpdateThingGroupsForThingMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateThingGroupsForThingMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_UpdateTopicRuleDestination.go b/service/iot/api_op_UpdateTopicRuleDestination.go index c956298175a..203fa70c655 100644 --- a/service/iot/api_op_UpdateTopicRuleDestination.go +++ b/service/iot/api_op_UpdateTopicRuleDestination.go @@ -67,6 +67,9 @@ func addOperationUpdateTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateTopicRuleDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/api_op_ValidateSecurityProfileBehaviors.go b/service/iot/api_op_ValidateSecurityProfileBehaviors.go index 17b422b3f39..3b6563139de 100644 --- a/service/iot/api_op_ValidateSecurityProfileBehaviors.go +++ b/service/iot/api_op_ValidateSecurityProfileBehaviors.go @@ -56,6 +56,9 @@ func addOperationValidateSecurityProfileBehaviorsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationValidateSecurityProfileBehaviorsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot/go.mod b/service/iot/go.mod index 9efbf5d2ca3..0d5db54092a 100644 --- a/service/iot/go.mod +++ b/service/iot/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iot go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot/go.sum b/service/iot/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iot/go.sum +++ b/service/iot/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iot1clickdevicesservice/api_client.go b/service/iot1clickdevicesservice/api_client.go index 304e4f240a6..2c778b27970 100644 --- a/service/iot1clickdevicesservice/api_client.go +++ b/service/iot1clickdevicesservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go b/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go index 864e90d2322..976e99e8daa 100644 --- a/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go +++ b/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go @@ -57,6 +57,9 @@ func addOperationClaimDevicesByClaimCodeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationClaimDevicesByClaimCodeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_DescribeDevice.go b/service/iot1clickdevicesservice/api_op_DescribeDevice.go index 87b661f274b..cb5e6599540 100644 --- a/service/iot1clickdevicesservice/api_op_DescribeDevice.go +++ b/service/iot1clickdevicesservice/api_op_DescribeDevice.go @@ -54,6 +54,9 @@ func addOperationDescribeDeviceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeDeviceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go b/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go index ca0f3b8359a..b0472091b15 100644 --- a/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go +++ b/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go @@ -61,6 +61,9 @@ func addOperationFinalizeDeviceClaimMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationFinalizeDeviceClaimMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go b/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go index 3a375783c38..146bc5d3c6b 100644 --- a/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go +++ b/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go @@ -53,6 +53,9 @@ func addOperationGetDeviceMethodsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetDeviceMethodsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go b/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go index 5e8eea9211f..4360554e99b 100644 --- a/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go +++ b/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go @@ -55,6 +55,9 @@ func addOperationInitiateDeviceClaimMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationInitiateDeviceClaimMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go b/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go index 097cf13d818..050b58d7760 100644 --- a/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go +++ b/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go @@ -60,6 +60,9 @@ func addOperationInvokeDeviceMethodMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationInvokeDeviceMethodMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go b/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go index 1408aebcaa0..5eed75d0eba 100644 --- a/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go +++ b/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go @@ -78,6 +78,9 @@ func addOperationListDeviceEventsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListDeviceEventsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_ListDevices.go b/service/iot1clickdevicesservice/api_op_ListDevices.go index b0ead10369a..93703969ce7 100644 --- a/service/iot1clickdevicesservice/api_op_ListDevices.go +++ b/service/iot1clickdevicesservice/api_op_ListDevices.go @@ -61,6 +61,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_ListTagsForResource.go b/service/iot1clickdevicesservice/api_op_ListTagsForResource.go index 988de5ccd86..351f037c58a 100644 --- a/service/iot1clickdevicesservice/api_op_ListTagsForResource.go +++ b/service/iot1clickdevicesservice/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_TagResource.go b/service/iot1clickdevicesservice/api_op_TagResource.go index f6aa2931dfb..14348a5d1af 100644 --- a/service/iot1clickdevicesservice/api_op_TagResource.go +++ b/service/iot1clickdevicesservice/api_op_TagResource.go @@ -59,6 +59,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_UnclaimDevice.go b/service/iot1clickdevicesservice/api_op_UnclaimDevice.go index 17c11bca82d..436165509d8 100644 --- a/service/iot1clickdevicesservice/api_op_UnclaimDevice.go +++ b/service/iot1clickdevicesservice/api_op_UnclaimDevice.go @@ -52,6 +52,9 @@ func addOperationUnclaimDeviceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUnclaimDeviceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_UntagResource.go b/service/iot1clickdevicesservice/api_op_UntagResource.go index 0fe1813c37f..7522af3c13d 100644 --- a/service/iot1clickdevicesservice/api_op_UntagResource.go +++ b/service/iot1clickdevicesservice/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go b/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go index b08a7ebc96c..89811209d2e 100644 --- a/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go +++ b/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go @@ -52,6 +52,9 @@ func addOperationUpdateDeviceStateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUpdateDeviceStateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickdevicesservice/go.mod b/service/iot1clickdevicesservice/go.mod index fc2ea1876bf..937f3a5d246 100644 --- a/service/iot1clickdevicesservice/go.mod +++ b/service/iot1clickdevicesservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iot1clickdevicesservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot1clickdevicesservice/go.sum b/service/iot1clickdevicesservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iot1clickdevicesservice/go.sum +++ b/service/iot1clickdevicesservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iot1clickprojects/api_client.go b/service/iot1clickprojects/api_client.go index 596e53f00cd..44c36960bc8 100644 --- a/service/iot1clickprojects/api_client.go +++ b/service/iot1clickprojects/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go b/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go index eca6d9cc4bc..a1ddd3eaf29 100644 --- a/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go +++ b/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go @@ -66,6 +66,9 @@ func addOperationAssociateDeviceWithPlacementMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationAssociateDeviceWithPlacementMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_CreatePlacement.go b/service/iot1clickprojects/api_op_CreatePlacement.go index 2701c4f4f62..819e4ea068d 100644 --- a/service/iot1clickprojects/api_op_CreatePlacement.go +++ b/service/iot1clickprojects/api_op_CreatePlacement.go @@ -57,6 +57,9 @@ func addOperationCreatePlacementMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreatePlacementMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_CreateProject.go b/service/iot1clickprojects/api_op_CreateProject.go index 591145b97c0..cc2958c7964 100644 --- a/service/iot1clickprojects/api_op_CreateProject.go +++ b/service/iot1clickprojects/api_op_CreateProject.go @@ -65,6 +65,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_DeletePlacement.go b/service/iot1clickprojects/api_op_DeletePlacement.go index b1f8f5c0aa2..4855d9f7dfd 100644 --- a/service/iot1clickprojects/api_op_DeletePlacement.go +++ b/service/iot1clickprojects/api_op_DeletePlacement.go @@ -55,6 +55,9 @@ func addOperationDeletePlacementMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeletePlacementMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_DeleteProject.go b/service/iot1clickprojects/api_op_DeleteProject.go index a26dc1caff1..ad069bfe906 100644 --- a/service/iot1clickprojects/api_op_DeleteProject.go +++ b/service/iot1clickprojects/api_op_DeleteProject.go @@ -50,6 +50,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_DescribePlacement.go b/service/iot1clickprojects/api_op_DescribePlacement.go index 0f78a00e46a..5a7742de928 100644 --- a/service/iot1clickprojects/api_op_DescribePlacement.go +++ b/service/iot1clickprojects/api_op_DescribePlacement.go @@ -60,6 +60,9 @@ func addOperationDescribePlacementMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribePlacementMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_DescribeProject.go b/service/iot1clickprojects/api_op_DescribeProject.go index f26a5f55a75..5ddbff7b06c 100644 --- a/service/iot1clickprojects/api_op_DescribeProject.go +++ b/service/iot1clickprojects/api_op_DescribeProject.go @@ -55,6 +55,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go b/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go index 336f742d7cb..e918ef1566e 100644 --- a/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go +++ b/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go @@ -58,6 +58,9 @@ func addOperationDisassociateDeviceFromPlacementMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDisassociateDeviceFromPlacementMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_GetDevicesInPlacement.go b/service/iot1clickprojects/api_op_GetDevicesInPlacement.go index 3b4448e5e59..e0903388f9e 100644 --- a/service/iot1clickprojects/api_op_GetDevicesInPlacement.go +++ b/service/iot1clickprojects/api_op_GetDevicesInPlacement.go @@ -59,6 +59,9 @@ func addOperationGetDevicesInPlacementMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetDevicesInPlacementMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_ListPlacements.go b/service/iot1clickprojects/api_op_ListPlacements.go index 038691e4748..126b555a0fa 100644 --- a/service/iot1clickprojects/api_op_ListPlacements.go +++ b/service/iot1clickprojects/api_op_ListPlacements.go @@ -66,6 +66,9 @@ func addOperationListPlacementsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListPlacementsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_ListProjects.go b/service/iot1clickprojects/api_op_ListProjects.go index ef03f7b84e0..61fc62b366c 100644 --- a/service/iot1clickprojects/api_op_ListProjects.go +++ b/service/iot1clickprojects/api_op_ListProjects.go @@ -62,6 +62,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_ListTagsForResource.go b/service/iot1clickprojects/api_op_ListTagsForResource.go index 5ee5e6a5836..3f11329ce96 100644 --- a/service/iot1clickprojects/api_op_ListTagsForResource.go +++ b/service/iot1clickprojects/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_TagResource.go b/service/iot1clickprojects/api_op_TagResource.go index 02f7f34f55e..f3ce5a0598d 100644 --- a/service/iot1clickprojects/api_op_TagResource.go +++ b/service/iot1clickprojects/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_UntagResource.go b/service/iot1clickprojects/api_op_UntagResource.go index 4f54eafca58..dcbabf3bbda 100644 --- a/service/iot1clickprojects/api_op_UntagResource.go +++ b/service/iot1clickprojects/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_UpdatePlacement.go b/service/iot1clickprojects/api_op_UpdatePlacement.go index 73113e9fe9d..95ef2869865 100644 --- a/service/iot1clickprojects/api_op_UpdatePlacement.go +++ b/service/iot1clickprojects/api_op_UpdatePlacement.go @@ -58,6 +58,9 @@ func addOperationUpdatePlacementMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdatePlacementMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/api_op_UpdateProject.go b/service/iot1clickprojects/api_op_UpdateProject.go index b677ae0f8a9..9c5db2c0f9f 100644 --- a/service/iot1clickprojects/api_op_UpdateProject.go +++ b/service/iot1clickprojects/api_op_UpdateProject.go @@ -61,6 +61,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iot1clickprojects/go.mod b/service/iot1clickprojects/go.mod index 317cba4b9cd..cf6a64999cc 100644 --- a/service/iot1clickprojects/go.mod +++ b/service/iot1clickprojects/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iot1clickprojects go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot1clickprojects/go.sum b/service/iot1clickprojects/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iot1clickprojects/go.sum +++ b/service/iot1clickprojects/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotanalytics/api_client.go b/service/iotanalytics/api_client.go index ffeb1f7fb77..1061f62fa1c 100644 --- a/service/iotanalytics/api_client.go +++ b/service/iotanalytics/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotanalytics/api_op_BatchPutMessage.go b/service/iotanalytics/api_op_BatchPutMessage.go index eaa0c6888f4..46510ffb734 100644 --- a/service/iotanalytics/api_op_BatchPutMessage.go +++ b/service/iotanalytics/api_op_BatchPutMessage.go @@ -82,6 +82,9 @@ func addOperationBatchPutMessageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationBatchPutMessageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_CancelPipelineReprocessing.go b/service/iotanalytics/api_op_CancelPipelineReprocessing.go index f3892864578..ebbef36cdd8 100644 --- a/service/iotanalytics/api_op_CancelPipelineReprocessing.go +++ b/service/iotanalytics/api_op_CancelPipelineReprocessing.go @@ -53,6 +53,9 @@ func addOperationCancelPipelineReprocessingMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCancelPipelineReprocessingMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_CreateChannel.go b/service/iotanalytics/api_op_CreateChannel.go index f35a803d285..23a4704df69 100644 --- a/service/iotanalytics/api_op_CreateChannel.go +++ b/service/iotanalytics/api_op_CreateChannel.go @@ -72,6 +72,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_CreateDataset.go b/service/iotanalytics/api_op_CreateDataset.go index 61bf3207a04..638005ca34c 100644 --- a/service/iotanalytics/api_op_CreateDataset.go +++ b/service/iotanalytics/api_op_CreateDataset.go @@ -95,6 +95,9 @@ func addOperationCreateDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_CreateDatasetContent.go b/service/iotanalytics/api_op_CreateDatasetContent.go index 77de0de797e..02f3a4fb00c 100644 --- a/service/iotanalytics/api_op_CreateDatasetContent.go +++ b/service/iotanalytics/api_op_CreateDatasetContent.go @@ -53,6 +53,9 @@ func addOperationCreateDatasetContentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCreateDatasetContentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_CreateDatastore.go b/service/iotanalytics/api_op_CreateDatastore.go index a7ea1048f33..e6e7740e5d3 100644 --- a/service/iotanalytics/api_op_CreateDatastore.go +++ b/service/iotanalytics/api_op_CreateDatastore.go @@ -71,6 +71,9 @@ func addOperationCreateDatastoreMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateDatastoreMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_CreatePipeline.go b/service/iotanalytics/api_op_CreatePipeline.go index 90b13ae911b..8de11b699a7 100644 --- a/service/iotanalytics/api_op_CreatePipeline.go +++ b/service/iotanalytics/api_op_CreatePipeline.go @@ -74,6 +74,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DeleteChannel.go b/service/iotanalytics/api_op_DeleteChannel.go index 66e03dded0b..46a7f45f422 100644 --- a/service/iotanalytics/api_op_DeleteChannel.go +++ b/service/iotanalytics/api_op_DeleteChannel.go @@ -48,6 +48,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DeleteDataset.go b/service/iotanalytics/api_op_DeleteDataset.go index d370e9b72a5..0c0464f255e 100644 --- a/service/iotanalytics/api_op_DeleteDataset.go +++ b/service/iotanalytics/api_op_DeleteDataset.go @@ -49,6 +49,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DeleteDatasetContent.go b/service/iotanalytics/api_op_DeleteDatasetContent.go index 1813c89c48e..c008fdd311c 100644 --- a/service/iotanalytics/api_op_DeleteDatasetContent.go +++ b/service/iotanalytics/api_op_DeleteDatasetContent.go @@ -54,6 +54,9 @@ func addOperationDeleteDatasetContentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteDatasetContentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DeleteDatastore.go b/service/iotanalytics/api_op_DeleteDatastore.go index d0bf0ff9705..52d6676d0a7 100644 --- a/service/iotanalytics/api_op_DeleteDatastore.go +++ b/service/iotanalytics/api_op_DeleteDatastore.go @@ -48,6 +48,9 @@ func addOperationDeleteDatastoreMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDatastoreMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DeletePipeline.go b/service/iotanalytics/api_op_DeletePipeline.go index 6e06cea913e..faeb5cd6287 100644 --- a/service/iotanalytics/api_op_DeletePipeline.go +++ b/service/iotanalytics/api_op_DeletePipeline.go @@ -48,6 +48,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeletePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DescribeChannel.go b/service/iotanalytics/api_op_DescribeChannel.go index c9e8d827425..da6d67b54ca 100644 --- a/service/iotanalytics/api_op_DescribeChannel.go +++ b/service/iotanalytics/api_op_DescribeChannel.go @@ -62,6 +62,9 @@ func addOperationDescribeChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DescribeDataset.go b/service/iotanalytics/api_op_DescribeDataset.go index a81012c07bb..f4d62c81700 100644 --- a/service/iotanalytics/api_op_DescribeDataset.go +++ b/service/iotanalytics/api_op_DescribeDataset.go @@ -53,6 +53,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DescribeDatastore.go b/service/iotanalytics/api_op_DescribeDatastore.go index e3776911a5b..361ade2d63c 100644 --- a/service/iotanalytics/api_op_DescribeDatastore.go +++ b/service/iotanalytics/api_op_DescribeDatastore.go @@ -62,6 +62,9 @@ func addOperationDescribeDatastoreMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeDatastoreMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DescribeLoggingOptions.go b/service/iotanalytics/api_op_DescribeLoggingOptions.go index 6f270f2582e..6a7ba8aec8b 100644 --- a/service/iotanalytics/api_op_DescribeLoggingOptions.go +++ b/service/iotanalytics/api_op_DescribeLoggingOptions.go @@ -48,6 +48,9 @@ func addOperationDescribeLoggingOptionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDescribeLoggingOptionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_DescribePipeline.go b/service/iotanalytics/api_op_DescribePipeline.go index 73aa21cb8d2..5f21a5ab7c1 100644 --- a/service/iotanalytics/api_op_DescribePipeline.go +++ b/service/iotanalytics/api_op_DescribePipeline.go @@ -53,6 +53,9 @@ func addOperationDescribePipelineMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribePipelineMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_GetDatasetContent.go b/service/iotanalytics/api_op_GetDatasetContent.go index 4e45e48326d..eec26ac16f5 100644 --- a/service/iotanalytics/api_op_GetDatasetContent.go +++ b/service/iotanalytics/api_op_GetDatasetContent.go @@ -66,6 +66,9 @@ func addOperationGetDatasetContentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetDatasetContentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_ListChannels.go b/service/iotanalytics/api_op_ListChannels.go index 71c26cd45be..5a1cad868e5 100644 --- a/service/iotanalytics/api_op_ListChannels.go +++ b/service/iotanalytics/api_op_ListChannels.go @@ -59,6 +59,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_ListDatasetContents.go b/service/iotanalytics/api_op_ListDatasetContents.go index e0f648b0353..0aa71c498de 100644 --- a/service/iotanalytics/api_op_ListDatasetContents.go +++ b/service/iotanalytics/api_op_ListDatasetContents.go @@ -74,6 +74,9 @@ func addOperationListDatasetContentsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListDatasetContentsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_ListDatasets.go b/service/iotanalytics/api_op_ListDatasets.go index d4b51bf1a04..cef59b6216a 100644 --- a/service/iotanalytics/api_op_ListDatasets.go +++ b/service/iotanalytics/api_op_ListDatasets.go @@ -59,6 +59,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_ListDatastores.go b/service/iotanalytics/api_op_ListDatastores.go index 7c643686fc3..86f3dc6ae29 100644 --- a/service/iotanalytics/api_op_ListDatastores.go +++ b/service/iotanalytics/api_op_ListDatastores.go @@ -59,6 +59,9 @@ func addOperationListDatastoresMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDatastoresMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_ListPipelines.go b/service/iotanalytics/api_op_ListPipelines.go index 2b8207993fe..f2d1bffd523 100644 --- a/service/iotanalytics/api_op_ListPipelines.go +++ b/service/iotanalytics/api_op_ListPipelines.go @@ -59,6 +59,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListPipelinesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_ListTagsForResource.go b/service/iotanalytics/api_op_ListTagsForResource.go index 09b86aaa66c..895d70b0b0f 100644 --- a/service/iotanalytics/api_op_ListTagsForResource.go +++ b/service/iotanalytics/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_PutLoggingOptions.go b/service/iotanalytics/api_op_PutLoggingOptions.go index 96e4e67166b..fc968163da6 100644 --- a/service/iotanalytics/api_op_PutLoggingOptions.go +++ b/service/iotanalytics/api_op_PutLoggingOptions.go @@ -53,6 +53,9 @@ func addOperationPutLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationPutLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_RunPipelineActivity.go b/service/iotanalytics/api_op_RunPipelineActivity.go index 44fb2a87e6c..5cc2e4a818f 100644 --- a/service/iotanalytics/api_op_RunPipelineActivity.go +++ b/service/iotanalytics/api_op_RunPipelineActivity.go @@ -67,6 +67,9 @@ func addOperationRunPipelineActivityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRunPipelineActivityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_SampleChannelData.go b/service/iotanalytics/api_op_SampleChannelData.go index c1a8c8212cd..a158f647ae5 100644 --- a/service/iotanalytics/api_op_SampleChannelData.go +++ b/service/iotanalytics/api_op_SampleChannelData.go @@ -65,6 +65,9 @@ func addOperationSampleChannelDataMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSampleChannelDataMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_StartPipelineReprocessing.go b/service/iotanalytics/api_op_StartPipelineReprocessing.go index d95a4f606f0..e710513a2e7 100644 --- a/service/iotanalytics/api_op_StartPipelineReprocessing.go +++ b/service/iotanalytics/api_op_StartPipelineReprocessing.go @@ -59,6 +59,9 @@ func addOperationStartPipelineReprocessingMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationStartPipelineReprocessingMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_TagResource.go b/service/iotanalytics/api_op_TagResource.go index c874e9ace45..e81c4c83512 100644 --- a/service/iotanalytics/api_op_TagResource.go +++ b/service/iotanalytics/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_UntagResource.go b/service/iotanalytics/api_op_UntagResource.go index 0853e483c24..6e96438e481 100644 --- a/service/iotanalytics/api_op_UntagResource.go +++ b/service/iotanalytics/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_UpdateChannel.go b/service/iotanalytics/api_op_UpdateChannel.go index b38f0fc07d0..ea5aad9fd5d 100644 --- a/service/iotanalytics/api_op_UpdateChannel.go +++ b/service/iotanalytics/api_op_UpdateChannel.go @@ -58,6 +58,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_UpdateDataset.go b/service/iotanalytics/api_op_UpdateDataset.go index 575eebd686f..2e8b5a042a2 100644 --- a/service/iotanalytics/api_op_UpdateDataset.go +++ b/service/iotanalytics/api_op_UpdateDataset.go @@ -72,6 +72,9 @@ func addOperationUpdateDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_UpdateDatastore.go b/service/iotanalytics/api_op_UpdateDatastore.go index 52a8dfba1d4..1ea5bef046b 100644 --- a/service/iotanalytics/api_op_UpdateDatastore.go +++ b/service/iotanalytics/api_op_UpdateDatastore.go @@ -58,6 +58,9 @@ func addOperationUpdateDatastoreMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateDatastoreMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/api_op_UpdatePipeline.go b/service/iotanalytics/api_op_UpdatePipeline.go index b1ef87f6bdd..2b4f155b066 100644 --- a/service/iotanalytics/api_op_UpdatePipeline.go +++ b/service/iotanalytics/api_op_UpdatePipeline.go @@ -63,6 +63,9 @@ func addOperationUpdatePipelineMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdatePipelineMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotanalytics/go.mod b/service/iotanalytics/go.mod index 9900f7b2361..7a614351e8d 100644 --- a/service/iotanalytics/go.mod +++ b/service/iotanalytics/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotanalytics go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotanalytics/go.sum b/service/iotanalytics/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotanalytics/go.sum +++ b/service/iotanalytics/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotdataplane/api_client.go b/service/iotdataplane/api_client.go index d3e996ef66b..3255fcffd1f 100644 --- a/service/iotdataplane/api_client.go +++ b/service/iotdataplane/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotdataplane/api_op_DeleteThingShadow.go b/service/iotdataplane/api_op_DeleteThingShadow.go index c24699ec15e..90de8da30bc 100644 --- a/service/iotdataplane/api_op_DeleteThingShadow.go +++ b/service/iotdataplane/api_op_DeleteThingShadow.go @@ -62,6 +62,9 @@ func addOperationDeleteThingShadowMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteThingShadowMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotdataplane/api_op_GetThingShadow.go b/service/iotdataplane/api_op_GetThingShadow.go index 8d7b407f6bb..b0d5046e84e 100644 --- a/service/iotdataplane/api_op_GetThingShadow.go +++ b/service/iotdataplane/api_op_GetThingShadow.go @@ -60,6 +60,9 @@ func addOperationGetThingShadowMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetThingShadowMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotdataplane/api_op_ListNamedShadowsForThing.go b/service/iotdataplane/api_op_ListNamedShadowsForThing.go index d592374c7e8..a0873ad81e0 100644 --- a/service/iotdataplane/api_op_ListNamedShadowsForThing.go +++ b/service/iotdataplane/api_op_ListNamedShadowsForThing.go @@ -65,6 +65,9 @@ func addOperationListNamedShadowsForThingMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListNamedShadowsForThingMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotdataplane/api_op_Publish.go b/service/iotdataplane/api_op_Publish.go index dd99a84c9cf..d5b024a797b 100644 --- a/service/iotdataplane/api_op_Publish.go +++ b/service/iotdataplane/api_op_Publish.go @@ -57,6 +57,9 @@ func addOperationPublishMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPublishMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotdataplane/api_op_UpdateThingShadow.go b/service/iotdataplane/api_op_UpdateThingShadow.go index 5759b51c9c3..bb8cb9424b6 100644 --- a/service/iotdataplane/api_op_UpdateThingShadow.go +++ b/service/iotdataplane/api_op_UpdateThingShadow.go @@ -65,6 +65,9 @@ func addOperationUpdateThingShadowMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateThingShadowMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotdataplane/go.mod b/service/iotdataplane/go.mod index 1adcbe4fde3..a3a260b593d 100644 --- a/service/iotdataplane/go.mod +++ b/service/iotdataplane/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotdataplane go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotdataplane/go.sum b/service/iotdataplane/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotdataplane/go.sum +++ b/service/iotdataplane/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotevents/api_client.go b/service/iotevents/api_client.go index 73004b75b9a..95e68620ca4 100644 --- a/service/iotevents/api_client.go +++ b/service/iotevents/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotevents/api_op_CreateDetectorModel.go b/service/iotevents/api_op_CreateDetectorModel.go index fc711b2c48e..ca48ce495e6 100644 --- a/service/iotevents/api_op_CreateDetectorModel.go +++ b/service/iotevents/api_op_CreateDetectorModel.go @@ -81,6 +81,9 @@ func addOperationCreateDetectorModelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateDetectorModelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_CreateInput.go b/service/iotevents/api_op_CreateInput.go index 27a7e655799..acfa940e28c 100644 --- a/service/iotevents/api_op_CreateInput.go +++ b/service/iotevents/api_op_CreateInput.go @@ -64,6 +64,9 @@ func addOperationCreateInputMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateInputMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_DeleteDetectorModel.go b/service/iotevents/api_op_DeleteDetectorModel.go index 5cca0a184c1..9cbcaa445fa 100644 --- a/service/iotevents/api_op_DeleteDetectorModel.go +++ b/service/iotevents/api_op_DeleteDetectorModel.go @@ -49,6 +49,9 @@ func addOperationDeleteDetectorModelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteDetectorModelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_DeleteInput.go b/service/iotevents/api_op_DeleteInput.go index fc87078b4a7..bf69b4b6b3b 100644 --- a/service/iotevents/api_op_DeleteInput.go +++ b/service/iotevents/api_op_DeleteInput.go @@ -48,6 +48,9 @@ func addOperationDeleteInputMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteInputMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_DescribeDetectorModel.go b/service/iotevents/api_op_DescribeDetectorModel.go index 76bfa3c2ea5..40d4a70ddc8 100644 --- a/service/iotevents/api_op_DescribeDetectorModel.go +++ b/service/iotevents/api_op_DescribeDetectorModel.go @@ -57,6 +57,9 @@ func addOperationDescribeDetectorModelMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeDetectorModelMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_DescribeInput.go b/service/iotevents/api_op_DescribeInput.go index 1b81598f0aa..125f09c6f7b 100644 --- a/service/iotevents/api_op_DescribeInput.go +++ b/service/iotevents/api_op_DescribeInput.go @@ -53,6 +53,9 @@ func addOperationDescribeInputMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeInputMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_DescribeLoggingOptions.go b/service/iotevents/api_op_DescribeLoggingOptions.go index 62bdfb578cb..f245407aecc 100644 --- a/service/iotevents/api_op_DescribeLoggingOptions.go +++ b/service/iotevents/api_op_DescribeLoggingOptions.go @@ -48,6 +48,9 @@ func addOperationDescribeLoggingOptionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDescribeLoggingOptionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_ListDetectorModelVersions.go b/service/iotevents/api_op_ListDetectorModelVersions.go index b79c20eb0cb..08c162027cb 100644 --- a/service/iotevents/api_op_ListDetectorModelVersions.go +++ b/service/iotevents/api_op_ListDetectorModelVersions.go @@ -64,6 +64,9 @@ func addOperationListDetectorModelVersionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDetectorModelVersionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_ListDetectorModels.go b/service/iotevents/api_op_ListDetectorModels.go index 8db52e73c68..bc51029c3f7 100644 --- a/service/iotevents/api_op_ListDetectorModels.go +++ b/service/iotevents/api_op_ListDetectorModels.go @@ -59,6 +59,9 @@ func addOperationListDetectorModelsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDetectorModelsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_ListInputs.go b/service/iotevents/api_op_ListInputs.go index e16de9791d8..4836ed9ab33 100644 --- a/service/iotevents/api_op_ListInputs.go +++ b/service/iotevents/api_op_ListInputs.go @@ -58,6 +58,9 @@ func addOperationListInputsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListInputsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_ListTagsForResource.go b/service/iotevents/api_op_ListTagsForResource.go index cd97e16d83a..d01e59cae80 100644 --- a/service/iotevents/api_op_ListTagsForResource.go +++ b/service/iotevents/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_PutLoggingOptions.go b/service/iotevents/api_op_PutLoggingOptions.go index dd5aab94607..89bcca04bc3 100644 --- a/service/iotevents/api_op_PutLoggingOptions.go +++ b/service/iotevents/api_op_PutLoggingOptions.go @@ -53,6 +53,9 @@ func addOperationPutLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationPutLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_TagResource.go b/service/iotevents/api_op_TagResource.go index 682623ea299..f1238671302 100644 --- a/service/iotevents/api_op_TagResource.go +++ b/service/iotevents/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_UntagResource.go b/service/iotevents/api_op_UntagResource.go index 61b68558b67..07fafa35ee1 100644 --- a/service/iotevents/api_op_UntagResource.go +++ b/service/iotevents/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_UpdateDetectorModel.go b/service/iotevents/api_op_UpdateDetectorModel.go index 12c01e2504e..9666753ae5f 100644 --- a/service/iotevents/api_op_UpdateDetectorModel.go +++ b/service/iotevents/api_op_UpdateDetectorModel.go @@ -72,6 +72,9 @@ func addOperationUpdateDetectorModelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateDetectorModelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/api_op_UpdateInput.go b/service/iotevents/api_op_UpdateInput.go index fd2a879ca65..fa675fc00c3 100644 --- a/service/iotevents/api_op_UpdateInput.go +++ b/service/iotevents/api_op_UpdateInput.go @@ -61,6 +61,9 @@ func addOperationUpdateInputMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateInputMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotevents/go.mod b/service/iotevents/go.mod index 2faabe565d8..4a9b5ca0e44 100644 --- a/service/iotevents/go.mod +++ b/service/iotevents/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotevents go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotevents/go.sum b/service/iotevents/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotevents/go.sum +++ b/service/iotevents/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ioteventsdata/api_client.go b/service/ioteventsdata/api_client.go index e753c9b99de..00f8c5bc6d4 100644 --- a/service/ioteventsdata/api_client.go +++ b/service/ioteventsdata/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ioteventsdata/api_op_BatchPutMessage.go b/service/ioteventsdata/api_op_BatchPutMessage.go index 3829357894b..5d8414a5059 100644 --- a/service/ioteventsdata/api_op_BatchPutMessage.go +++ b/service/ioteventsdata/api_op_BatchPutMessage.go @@ -58,6 +58,9 @@ func addOperationBatchPutMessageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationBatchPutMessageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ioteventsdata/api_op_BatchUpdateDetector.go b/service/ioteventsdata/api_op_BatchUpdateDetector.go index 00cc47fd8d2..fbca9db0687 100644 --- a/service/ioteventsdata/api_op_BatchUpdateDetector.go +++ b/service/ioteventsdata/api_op_BatchUpdateDetector.go @@ -55,6 +55,9 @@ func addOperationBatchUpdateDetectorMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationBatchUpdateDetectorMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ioteventsdata/api_op_DescribeDetector.go b/service/ioteventsdata/api_op_DescribeDetector.go index 5c1e07f91ac..7e6251556c4 100644 --- a/service/ioteventsdata/api_op_DescribeDetector.go +++ b/service/ioteventsdata/api_op_DescribeDetector.go @@ -58,6 +58,9 @@ func addOperationDescribeDetectorMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeDetectorMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ioteventsdata/api_op_ListDetectors.go b/service/ioteventsdata/api_op_ListDetectors.go index c234ffc157e..5f74b6e8010 100644 --- a/service/ioteventsdata/api_op_ListDetectors.go +++ b/service/ioteventsdata/api_op_ListDetectors.go @@ -66,6 +66,9 @@ func addOperationListDetectorsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListDetectorsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ioteventsdata/go.mod b/service/ioteventsdata/go.mod index 3eaa2bb3626..b694a5d0700 100644 --- a/service/ioteventsdata/go.mod +++ b/service/ioteventsdata/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ioteventsdata go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ioteventsdata/go.sum b/service/ioteventsdata/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ioteventsdata/go.sum +++ b/service/ioteventsdata/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotjobsdataplane/api_client.go b/service/iotjobsdataplane/api_client.go index 009f86e4182..0d0f3732e7b 100644 --- a/service/iotjobsdataplane/api_client.go +++ b/service/iotjobsdataplane/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotjobsdataplane/api_op_DescribeJobExecution.go b/service/iotjobsdataplane/api_op_DescribeJobExecution.go index ceef6123c12..21fddb4b8a7 100644 --- a/service/iotjobsdataplane/api_op_DescribeJobExecution.go +++ b/service/iotjobsdataplane/api_op_DescribeJobExecution.go @@ -66,6 +66,9 @@ func addOperationDescribeJobExecutionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeJobExecutionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go b/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go index fa921e0138e..500773db6be 100644 --- a/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go +++ b/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go @@ -56,6 +56,9 @@ func addOperationGetPendingJobExecutionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetPendingJobExecutionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go b/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go index ce0202cbe79..7cfaaad2f5a 100644 --- a/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go +++ b/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go @@ -68,6 +68,9 @@ func addOperationStartNextPendingJobExecutionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationStartNextPendingJobExecutionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotjobsdataplane/api_op_UpdateJobExecution.go b/service/iotjobsdataplane/api_op_UpdateJobExecution.go index a5b6deffa49..2152b23fbc3 100644 --- a/service/iotjobsdataplane/api_op_UpdateJobExecution.go +++ b/service/iotjobsdataplane/api_op_UpdateJobExecution.go @@ -102,6 +102,9 @@ func addOperationUpdateJobExecutionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationUpdateJobExecutionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotjobsdataplane/go.mod b/service/iotjobsdataplane/go.mod index 24bc82ccbdd..a71875573e1 100644 --- a/service/iotjobsdataplane/go.mod +++ b/service/iotjobsdataplane/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotjobsdataplane go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotjobsdataplane/go.sum b/service/iotjobsdataplane/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotjobsdataplane/go.sum +++ b/service/iotjobsdataplane/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotsecuretunneling/api_client.go b/service/iotsecuretunneling/api_client.go index b1cd0b9ba6c..82b2d84c262 100644 --- a/service/iotsecuretunneling/api_client.go +++ b/service/iotsecuretunneling/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotsecuretunneling/api_op_CloseTunnel.go b/service/iotsecuretunneling/api_op_CloseTunnel.go index 4e8e1381d2e..384d6a903a7 100644 --- a/service/iotsecuretunneling/api_op_CloseTunnel.go +++ b/service/iotsecuretunneling/api_op_CloseTunnel.go @@ -53,6 +53,9 @@ func addOperationCloseTunnelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCloseTunnelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/api_op_DescribeTunnel.go b/service/iotsecuretunneling/api_op_DescribeTunnel.go index 68c93bdbb7d..92b9fdc8c01 100644 --- a/service/iotsecuretunneling/api_op_DescribeTunnel.go +++ b/service/iotsecuretunneling/api_op_DescribeTunnel.go @@ -53,6 +53,9 @@ func addOperationDescribeTunnelMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeTunnelMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/api_op_ListTagsForResource.go b/service/iotsecuretunneling/api_op_ListTagsForResource.go index 8c0120696d2..1bbed3c90ab 100644 --- a/service/iotsecuretunneling/api_op_ListTagsForResource.go +++ b/service/iotsecuretunneling/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/api_op_ListTunnels.go b/service/iotsecuretunneling/api_op_ListTunnels.go index a37c5ca3c40..7feb0374b2a 100644 --- a/service/iotsecuretunneling/api_op_ListTunnels.go +++ b/service/iotsecuretunneling/api_op_ListTunnels.go @@ -61,6 +61,9 @@ func addOperationListTunnelsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListTunnelsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/api_op_OpenTunnel.go b/service/iotsecuretunneling/api_op_OpenTunnel.go index fb2492c989f..4c313a98b37 100644 --- a/service/iotsecuretunneling/api_op_OpenTunnel.go +++ b/service/iotsecuretunneling/api_op_OpenTunnel.go @@ -73,6 +73,9 @@ func addOperationOpenTunnelMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationOpenTunnelMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/api_op_TagResource.go b/service/iotsecuretunneling/api_op_TagResource.go index 15145c2f95a..048a902ce06 100644 --- a/service/iotsecuretunneling/api_op_TagResource.go +++ b/service/iotsecuretunneling/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/api_op_UntagResource.go b/service/iotsecuretunneling/api_op_UntagResource.go index 8f8fee25f08..8eba54610c4 100644 --- a/service/iotsecuretunneling/api_op_UntagResource.go +++ b/service/iotsecuretunneling/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsecuretunneling/go.mod b/service/iotsecuretunneling/go.mod index 6516b5345db..ff7eb9090c2 100644 --- a/service/iotsecuretunneling/go.mod +++ b/service/iotsecuretunneling/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotsecuretunneling/go.sum b/service/iotsecuretunneling/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotsecuretunneling/go.sum +++ b/service/iotsecuretunneling/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotsitewise/api_client.go b/service/iotsitewise/api_client.go index c7ae4dd6189..bf0bf575960 100644 --- a/service/iotsitewise/api_client.go +++ b/service/iotsitewise/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotsitewise/api_op_AssociateAssets.go b/service/iotsitewise/api_op_AssociateAssets.go index 3ba280a6fe5..a3552dc197f 100644 --- a/service/iotsitewise/api_op_AssociateAssets.go +++ b/service/iotsitewise/api_op_AssociateAssets.go @@ -71,6 +71,9 @@ func addOperationAssociateAssetsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAssociateAssetsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_BatchAssociateProjectAssets.go b/service/iotsitewise/api_op_BatchAssociateProjectAssets.go index d4e8cb49b3f..530dc1cf941 100644 --- a/service/iotsitewise/api_op_BatchAssociateProjectAssets.go +++ b/service/iotsitewise/api_op_BatchAssociateProjectAssets.go @@ -64,6 +64,9 @@ func addOperationBatchAssociateProjectAssetsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationBatchAssociateProjectAssetsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go b/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go index 7ff5a6e3363..b07e24a835e 100644 --- a/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go +++ b/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go @@ -65,6 +65,9 @@ func addOperationBatchDisassociateProjectAssetsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationBatchDisassociateProjectAssetsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go b/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go index f0bfef8b329..66c56c2cc3f 100644 --- a/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go +++ b/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go @@ -84,6 +84,9 @@ func addOperationBatchPutAssetPropertyValueMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationBatchPutAssetPropertyValueMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreateAccessPolicy.go b/service/iotsitewise/api_op_CreateAccessPolicy.go index 940d20a2aef..e4d4d8a6daa 100644 --- a/service/iotsitewise/api_op_CreateAccessPolicy.go +++ b/service/iotsitewise/api_op_CreateAccessPolicy.go @@ -90,6 +90,9 @@ func addOperationCreateAccessPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateAccessPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreateAsset.go b/service/iotsitewise/api_op_CreateAsset.go index d6d7b9bf2d1..88d6c779ca1 100644 --- a/service/iotsitewise/api_op_CreateAsset.go +++ b/service/iotsitewise/api_op_CreateAsset.go @@ -90,6 +90,9 @@ func addOperationCreateAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreateAssetModel.go b/service/iotsitewise/api_op_CreateAssetModel.go index fd93c1b44d9..2d89679e4e8 100644 --- a/service/iotsitewise/api_op_CreateAssetModel.go +++ b/service/iotsitewise/api_op_CreateAssetModel.go @@ -110,6 +110,9 @@ func addOperationCreateAssetModelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationCreateAssetModelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreateDashboard.go b/service/iotsitewise/api_op_CreateDashboard.go index 28997f1db7d..f5f9fe0dd0a 100644 --- a/service/iotsitewise/api_op_CreateDashboard.go +++ b/service/iotsitewise/api_op_CreateDashboard.go @@ -90,6 +90,9 @@ func addOperationCreateDashboardMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateDashboardMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreateGateway.go b/service/iotsitewise/api_op_CreateGateway.go index aa095af0138..cacd1a321d9 100644 --- a/service/iotsitewise/api_op_CreateGateway.go +++ b/service/iotsitewise/api_op_CreateGateway.go @@ -80,6 +80,9 @@ func addOperationCreateGatewayMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateGatewayMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreatePortal.go b/service/iotsitewise/api_op_CreatePortal.go index f0bc0ddfe3a..ae0bee6f209 100644 --- a/service/iotsitewise/api_op_CreatePortal.go +++ b/service/iotsitewise/api_op_CreatePortal.go @@ -144,6 +144,9 @@ func addOperationCreatePortalMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationCreatePortalMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreatePresignedPortalUrl.go b/service/iotsitewise/api_op_CreatePresignedPortalUrl.go index 4f0a881c8db..12b2cce18d6 100644 --- a/service/iotsitewise/api_op_CreatePresignedPortalUrl.go +++ b/service/iotsitewise/api_op_CreatePresignedPortalUrl.go @@ -65,6 +65,9 @@ func addOperationCreatePresignedPortalUrlMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreatePresignedPortalUrlMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_CreateProject.go b/service/iotsitewise/api_op_CreateProject.go index 2b30ffeb2f8..6de75a39fef 100644 --- a/service/iotsitewise/api_op_CreateProject.go +++ b/service/iotsitewise/api_op_CreateProject.go @@ -82,6 +82,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeleteAccessPolicy.go b/service/iotsitewise/api_op_DeleteAccessPolicy.go index d895af41ade..2caae7d579c 100644 --- a/service/iotsitewise/api_op_DeleteAccessPolicy.go +++ b/service/iotsitewise/api_op_DeleteAccessPolicy.go @@ -56,6 +56,9 @@ func addOperationDeleteAccessPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteAccessPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeleteAsset.go b/service/iotsitewise/api_op_DeleteAsset.go index 52becea69a9..78d11542cf6 100644 --- a/service/iotsitewise/api_op_DeleteAsset.go +++ b/service/iotsitewise/api_op_DeleteAsset.go @@ -67,6 +67,9 @@ func addOperationDeleteAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeleteAssetModel.go b/service/iotsitewise/api_op_DeleteAssetModel.go index 3fcd02d20ca..77b0ef0ec13 100644 --- a/service/iotsitewise/api_op_DeleteAssetModel.go +++ b/service/iotsitewise/api_op_DeleteAssetModel.go @@ -68,6 +68,9 @@ func addOperationDeleteAssetModelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDeleteAssetModelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeleteDashboard.go b/service/iotsitewise/api_op_DeleteDashboard.go index 02eed82e895..e5723728772 100644 --- a/service/iotsitewise/api_op_DeleteDashboard.go +++ b/service/iotsitewise/api_op_DeleteDashboard.go @@ -54,6 +54,9 @@ func addOperationDeleteDashboardMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteDashboardMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeleteGateway.go b/service/iotsitewise/api_op_DeleteGateway.go index fefcfc0249e..64fbcab9118 100644 --- a/service/iotsitewise/api_op_DeleteGateway.go +++ b/service/iotsitewise/api_op_DeleteGateway.go @@ -50,6 +50,9 @@ func addOperationDeleteGatewayMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteGatewayMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeletePortal.go b/service/iotsitewise/api_op_DeletePortal.go index c893c7373aa..e95158d4df3 100644 --- a/service/iotsitewise/api_op_DeletePortal.go +++ b/service/iotsitewise/api_op_DeletePortal.go @@ -62,6 +62,9 @@ func addOperationDeletePortalMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeletePortalMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DeleteProject.go b/service/iotsitewise/api_op_DeleteProject.go index 66522a5c74f..80df522a602 100644 --- a/service/iotsitewise/api_op_DeleteProject.go +++ b/service/iotsitewise/api_op_DeleteProject.go @@ -54,6 +54,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeAccessPolicy.go b/service/iotsitewise/api_op_DescribeAccessPolicy.go index 24dff57baab..c043a7c5acb 100644 --- a/service/iotsitewise/api_op_DescribeAccessPolicy.go +++ b/service/iotsitewise/api_op_DescribeAccessPolicy.go @@ -94,6 +94,9 @@ func addOperationDescribeAccessPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeAccessPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeAsset.go b/service/iotsitewise/api_op_DescribeAsset.go index cd85d8c5167..87d216387c4 100644 --- a/service/iotsitewise/api_op_DescribeAsset.go +++ b/service/iotsitewise/api_op_DescribeAsset.go @@ -101,6 +101,9 @@ func addOperationDescribeAssetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDescribeAssetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeAssetModel.go b/service/iotsitewise/api_op_DescribeAssetModel.go index 14cbb3c6cb1..c574574d4ad 100644 --- a/service/iotsitewise/api_op_DescribeAssetModel.go +++ b/service/iotsitewise/api_op_DescribeAssetModel.go @@ -103,6 +103,9 @@ func addOperationDescribeAssetModelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationDescribeAssetModelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeAssetProperty.go b/service/iotsitewise/api_op_DescribeAssetProperty.go index f4b4196e92e..dfd385c20e7 100644 --- a/service/iotsitewise/api_op_DescribeAssetProperty.go +++ b/service/iotsitewise/api_op_DescribeAssetProperty.go @@ -82,6 +82,9 @@ func addOperationDescribeAssetPropertyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeAssetPropertyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeDashboard.go b/service/iotsitewise/api_op_DescribeDashboard.go index d56693bde8b..34ea6ffa8be 100644 --- a/service/iotsitewise/api_op_DescribeDashboard.go +++ b/service/iotsitewise/api_op_DescribeDashboard.go @@ -95,6 +95,9 @@ func addOperationDescribeDashboardMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeDashboardMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeGateway.go b/service/iotsitewise/api_op_DescribeGateway.go index d7e54c13721..3028dad0aa6 100644 --- a/service/iotsitewise/api_op_DescribeGateway.go +++ b/service/iotsitewise/api_op_DescribeGateway.go @@ -92,6 +92,9 @@ func addOperationDescribeGatewayMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeGatewayMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go b/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go index cb9c694ce94..00a5756b3d7 100644 --- a/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go +++ b/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go @@ -98,6 +98,9 @@ func addOperationDescribeGatewayCapabilityConfigurationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeGatewayCapabilityConfigurationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeLoggingOptions.go b/service/iotsitewise/api_op_DescribeLoggingOptions.go index a7331c1a8cb..39e1d89b845 100644 --- a/service/iotsitewise/api_op_DescribeLoggingOptions.go +++ b/service/iotsitewise/api_op_DescribeLoggingOptions.go @@ -51,6 +51,9 @@ func addOperationDescribeLoggingOptionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDescribeLoggingOptionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribePortal.go b/service/iotsitewise/api_op_DescribePortal.go index 6109d5bdc61..f70d1679de6 100644 --- a/service/iotsitewise/api_op_DescribePortal.go +++ b/service/iotsitewise/api_op_DescribePortal.go @@ -125,6 +125,9 @@ func addOperationDescribePortalMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationDescribePortalMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DescribeProject.go b/service/iotsitewise/api_op_DescribeProject.go index 81e0afe539d..23b73cb8770 100644 --- a/service/iotsitewise/api_op_DescribeProject.go +++ b/service/iotsitewise/api_op_DescribeProject.go @@ -87,6 +87,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_DisassociateAssets.go b/service/iotsitewise/api_op_DisassociateAssets.go index e8b1b72e472..c1a6f8f8188 100644 --- a/service/iotsitewise/api_op_DisassociateAssets.go +++ b/service/iotsitewise/api_op_DisassociateAssets.go @@ -70,6 +70,9 @@ func addOperationDisassociateAssetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDisassociateAssetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_GetAssetPropertyAggregates.go b/service/iotsitewise/api_op_GetAssetPropertyAggregates.go index 25d9a1571e6..19ce9d98721 100644 --- a/service/iotsitewise/api_op_GetAssetPropertyAggregates.go +++ b/service/iotsitewise/api_op_GetAssetPropertyAggregates.go @@ -115,6 +115,9 @@ func addOperationGetAssetPropertyAggregatesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetAssetPropertyAggregatesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_GetAssetPropertyValue.go b/service/iotsitewise/api_op_GetAssetPropertyValue.go index bf057fa1778..100166cf83e 100644 --- a/service/iotsitewise/api_op_GetAssetPropertyValue.go +++ b/service/iotsitewise/api_op_GetAssetPropertyValue.go @@ -74,6 +74,9 @@ func addOperationGetAssetPropertyValueMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetAssetPropertyValueMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go b/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go index a6647236682..b3625f2a054 100644 --- a/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go +++ b/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go @@ -101,6 +101,9 @@ func addOperationGetAssetPropertyValueHistoryMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationGetAssetPropertyValueHistoryMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListAccessPolicies.go b/service/iotsitewise/api_op_ListAccessPolicies.go index d057d1e36c3..92c32b0f32f 100644 --- a/service/iotsitewise/api_op_ListAccessPolicies.go +++ b/service/iotsitewise/api_op_ListAccessPolicies.go @@ -84,6 +84,9 @@ func addOperationListAccessPoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListAccessPoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListAssetModels.go b/service/iotsitewise/api_op_ListAssetModels.go index ae2d28500fa..f7b46b19039 100644 --- a/service/iotsitewise/api_op_ListAssetModels.go +++ b/service/iotsitewise/api_op_ListAssetModels.go @@ -61,6 +61,9 @@ func addOperationListAssetModelsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListAssetModelsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListAssets.go b/service/iotsitewise/api_op_ListAssets.go index 2fad292b35f..bdaf5e5c362 100644 --- a/service/iotsitewise/api_op_ListAssets.go +++ b/service/iotsitewise/api_op_ListAssets.go @@ -89,6 +89,9 @@ func addOperationListAssetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListAssetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListAssociatedAssets.go b/service/iotsitewise/api_op_ListAssociatedAssets.go index 66ccdde0fc8..3c134b60f06 100644 --- a/service/iotsitewise/api_op_ListAssociatedAssets.go +++ b/service/iotsitewise/api_op_ListAssociatedAssets.go @@ -95,6 +95,9 @@ func addOperationListAssociatedAssetsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationListAssociatedAssetsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListDashboards.go b/service/iotsitewise/api_op_ListDashboards.go index d2338e631bd..41b55e2ea29 100644 --- a/service/iotsitewise/api_op_ListDashboards.go +++ b/service/iotsitewise/api_op_ListDashboards.go @@ -67,6 +67,9 @@ func addOperationListDashboardsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListDashboardsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListGateways.go b/service/iotsitewise/api_op_ListGateways.go index 172fb0531ef..d3c99bab252 100644 --- a/service/iotsitewise/api_op_ListGateways.go +++ b/service/iotsitewise/api_op_ListGateways.go @@ -61,6 +61,9 @@ func addOperationListGatewaysMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListGatewaysMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListPortals.go b/service/iotsitewise/api_op_ListPortals.go index 485dc0ce61b..820c26abfe9 100644 --- a/service/iotsitewise/api_op_ListPortals.go +++ b/service/iotsitewise/api_op_ListPortals.go @@ -59,6 +59,9 @@ func addOperationListPortalsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListPortalsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListProjectAssets.go b/service/iotsitewise/api_op_ListProjectAssets.go index 6b0cb6ac3a7..cbbda67334e 100644 --- a/service/iotsitewise/api_op_ListProjectAssets.go +++ b/service/iotsitewise/api_op_ListProjectAssets.go @@ -66,6 +66,9 @@ func addOperationListProjectAssetsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListProjectAssetsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListProjects.go b/service/iotsitewise/api_op_ListProjects.go index 2aef7db1d83..915a340a25d 100644 --- a/service/iotsitewise/api_op_ListProjects.go +++ b/service/iotsitewise/api_op_ListProjects.go @@ -66,6 +66,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_ListTagsForResource.go b/service/iotsitewise/api_op_ListTagsForResource.go index 1cb6a54c445..f505fd3cf2f 100644 --- a/service/iotsitewise/api_op_ListTagsForResource.go +++ b/service/iotsitewise/api_op_ListTagsForResource.go @@ -57,6 +57,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_PutLoggingOptions.go b/service/iotsitewise/api_op_PutLoggingOptions.go index 3ffa93437b4..35a4a11b57b 100644 --- a/service/iotsitewise/api_op_PutLoggingOptions.go +++ b/service/iotsitewise/api_op_PutLoggingOptions.go @@ -50,6 +50,9 @@ func addOperationPutLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationPutLoggingOptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_TagResource.go b/service/iotsitewise/api_op_TagResource.go index 212f47855fb..b68762f337d 100644 --- a/service/iotsitewise/api_op_TagResource.go +++ b/service/iotsitewise/api_op_TagResource.go @@ -59,6 +59,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UntagResource.go b/service/iotsitewise/api_op_UntagResource.go index cc38a50a997..8d60cf26663 100644 --- a/service/iotsitewise/api_op_UntagResource.go +++ b/service/iotsitewise/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateAccessPolicy.go b/service/iotsitewise/api_op_UpdateAccessPolicy.go index faaa59ef3e5..72d04f5fe0f 100644 --- a/service/iotsitewise/api_op_UpdateAccessPolicy.go +++ b/service/iotsitewise/api_op_UpdateAccessPolicy.go @@ -74,6 +74,9 @@ func addOperationUpdateAccessPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateAccessPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateAsset.go b/service/iotsitewise/api_op_UpdateAsset.go index 248e9a2a09c..d5e0c2f39d9 100644 --- a/service/iotsitewise/api_op_UpdateAsset.go +++ b/service/iotsitewise/api_op_UpdateAsset.go @@ -69,6 +69,9 @@ func addOperationUpdateAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateAssetModel.go b/service/iotsitewise/api_op_UpdateAssetModel.go index 500619839a9..313611bd034 100644 --- a/service/iotsitewise/api_op_UpdateAssetModel.go +++ b/service/iotsitewise/api_op_UpdateAssetModel.go @@ -101,6 +101,9 @@ func addOperationUpdateAssetModelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationUpdateAssetModelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateAssetProperty.go b/service/iotsitewise/api_op_UpdateAssetProperty.go index 2506797440a..62a63ed7411 100644 --- a/service/iotsitewise/api_op_UpdateAssetProperty.go +++ b/service/iotsitewise/api_op_UpdateAssetProperty.go @@ -82,6 +82,9 @@ func addOperationUpdateAssetPropertyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationUpdateAssetPropertyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateDashboard.go b/service/iotsitewise/api_op_UpdateDashboard.go index 51bd421d73b..14bca9e7ad3 100644 --- a/service/iotsitewise/api_op_UpdateDashboard.go +++ b/service/iotsitewise/api_op_UpdateDashboard.go @@ -70,6 +70,9 @@ func addOperationUpdateDashboardMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateDashboardMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateGateway.go b/service/iotsitewise/api_op_UpdateGateway.go index 70d1e2e31ff..fbb3d44a03e 100644 --- a/service/iotsitewise/api_op_UpdateGateway.go +++ b/service/iotsitewise/api_op_UpdateGateway.go @@ -54,6 +54,9 @@ func addOperationUpdateGatewayMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateGatewayMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go b/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go index 79a4ba1dfb7..306384de75d 100644 --- a/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go +++ b/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go @@ -97,6 +97,9 @@ func addOperationUpdateGatewayCapabilityConfigurationMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationUpdateGatewayCapabilityConfigurationMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdatePortal.go b/service/iotsitewise/api_op_UpdatePortal.go index dc55120e789..926eabfd0d3 100644 --- a/service/iotsitewise/api_op_UpdatePortal.go +++ b/service/iotsitewise/api_op_UpdatePortal.go @@ -95,6 +95,9 @@ func addOperationUpdatePortalMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationUpdatePortalMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/api_op_UpdateProject.go b/service/iotsitewise/api_op_UpdateProject.go index f09336a70da..8bce53fe839 100644 --- a/service/iotsitewise/api_op_UpdateProject.go +++ b/service/iotsitewise/api_op_UpdateProject.go @@ -62,6 +62,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotsitewise/go.mod b/service/iotsitewise/go.mod index c8dd664f460..4ae6bde30ab 100644 --- a/service/iotsitewise/go.mod +++ b/service/iotsitewise/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotsitewise go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotsitewise/go.sum b/service/iotsitewise/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotsitewise/go.sum +++ b/service/iotsitewise/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotthingsgraph/api_client.go b/service/iotthingsgraph/api_client.go index 4434589b4ab..0b66a0858a2 100644 --- a/service/iotthingsgraph/api_client.go +++ b/service/iotthingsgraph/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/iotthingsgraph/api_op_AssociateEntityToThing.go b/service/iotthingsgraph/api_op_AssociateEntityToThing.go index 7218ac24c3d..04cfee7e47a 100644 --- a/service/iotthingsgraph/api_op_AssociateEntityToThing.go +++ b/service/iotthingsgraph/api_op_AssociateEntityToThing.go @@ -60,6 +60,9 @@ func addOperationAssociateEntityToThingMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAssociateEntityToThingMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_CreateFlowTemplate.go b/service/iotthingsgraph/api_op_CreateFlowTemplate.go index bd115f18e01..be9e2130442 100644 --- a/service/iotthingsgraph/api_op_CreateFlowTemplate.go +++ b/service/iotthingsgraph/api_op_CreateFlowTemplate.go @@ -61,6 +61,9 @@ func addOperationCreateFlowTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateFlowTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_CreateSystemInstance.go b/service/iotthingsgraph/api_op_CreateSystemInstance.go index 6ad81fe0cf0..9d3d752705a 100644 --- a/service/iotthingsgraph/api_op_CreateSystemInstance.go +++ b/service/iotthingsgraph/api_op_CreateSystemInstance.go @@ -93,6 +93,9 @@ func addOperationCreateSystemInstanceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateSystemInstanceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_CreateSystemTemplate.go b/service/iotthingsgraph/api_op_CreateSystemTemplate.go index d6c8b88c71b..73d846612be 100644 --- a/service/iotthingsgraph/api_op_CreateSystemTemplate.go +++ b/service/iotthingsgraph/api_op_CreateSystemTemplate.go @@ -59,6 +59,9 @@ func addOperationCreateSystemTemplateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationCreateSystemTemplateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeleteFlowTemplate.go b/service/iotthingsgraph/api_op_DeleteFlowTemplate.go index 8ee7a474498..750d2dd0acd 100644 --- a/service/iotthingsgraph/api_op_DeleteFlowTemplate.go +++ b/service/iotthingsgraph/api_op_DeleteFlowTemplate.go @@ -52,6 +52,9 @@ func addOperationDeleteFlowTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteFlowTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeleteNamespace.go b/service/iotthingsgraph/api_op_DeleteNamespace.go index 824ebd98b72..d18a767903f 100644 --- a/service/iotthingsgraph/api_op_DeleteNamespace.go +++ b/service/iotthingsgraph/api_op_DeleteNamespace.go @@ -52,6 +52,9 @@ func addOperationDeleteNamespaceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteNamespaceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeleteSystemInstance.go b/service/iotthingsgraph/api_op_DeleteSystemInstance.go index c96ca9ae48b..14141093435 100644 --- a/service/iotthingsgraph/api_op_DeleteSystemInstance.go +++ b/service/iotthingsgraph/api_op_DeleteSystemInstance.go @@ -48,6 +48,9 @@ func addOperationDeleteSystemInstanceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDeleteSystemInstanceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeleteSystemTemplate.go b/service/iotthingsgraph/api_op_DeleteSystemTemplate.go index 6825cdd1cbd..f3b9f99fbbd 100644 --- a/service/iotthingsgraph/api_op_DeleteSystemTemplate.go +++ b/service/iotthingsgraph/api_op_DeleteSystemTemplate.go @@ -51,6 +51,9 @@ func addOperationDeleteSystemTemplateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteSystemTemplateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeploySystemInstance.go b/service/iotthingsgraph/api_op_DeploySystemInstance.go index ef48292ed04..6c3cb254ad4 100644 --- a/service/iotthingsgraph/api_op_DeploySystemInstance.go +++ b/service/iotthingsgraph/api_op_DeploySystemInstance.go @@ -69,6 +69,9 @@ func addOperationDeploySystemInstanceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeploySystemInstanceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go b/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go index ad1dc589a73..2b526114d2e 100644 --- a/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go +++ b/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go @@ -51,6 +51,9 @@ func addOperationDeprecateFlowTemplateMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeprecateFlowTemplateMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go b/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go index cfa62b27648..23b94c6a90d 100644 --- a/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go +++ b/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go @@ -49,6 +49,9 @@ func addOperationDeprecateSystemTemplateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeprecateSystemTemplateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DescribeNamespace.go b/service/iotthingsgraph/api_op_DescribeNamespace.go index 0e0de83506e..e5de0687b58 100644 --- a/service/iotthingsgraph/api_op_DescribeNamespace.go +++ b/service/iotthingsgraph/api_op_DescribeNamespace.go @@ -63,6 +63,9 @@ func addOperationDescribeNamespaceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeNamespaceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_DissociateEntityFromThing.go b/service/iotthingsgraph/api_op_DissociateEntityFromThing.go index 09999988ef1..66832befc0a 100644 --- a/service/iotthingsgraph/api_op_DissociateEntityFromThing.go +++ b/service/iotthingsgraph/api_op_DissociateEntityFromThing.go @@ -56,6 +56,9 @@ func addOperationDissociateEntityFromThingMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDissociateEntityFromThingMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetEntities.go b/service/iotthingsgraph/api_op_GetEntities.go index 9d315899a81..5e272f8bd22 100644 --- a/service/iotthingsgraph/api_op_GetEntities.go +++ b/service/iotthingsgraph/api_op_GetEntities.go @@ -82,6 +82,9 @@ func addOperationGetEntitiesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetEntitiesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetFlowTemplate.go b/service/iotthingsgraph/api_op_GetFlowTemplate.go index 175bf7e2627..73ceb8735b1 100644 --- a/service/iotthingsgraph/api_op_GetFlowTemplate.go +++ b/service/iotthingsgraph/api_op_GetFlowTemplate.go @@ -58,6 +58,9 @@ func addOperationGetFlowTemplateMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetFlowTemplateMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go b/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go index a18fa6dfc96..b7d974269b7 100644 --- a/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go +++ b/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go @@ -67,6 +67,9 @@ func addOperationGetFlowTemplateRevisionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetFlowTemplateRevisionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go b/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go index c09912b3a9d..2e8c4090679 100644 --- a/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go +++ b/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go @@ -60,6 +60,9 @@ func addOperationGetNamespaceDeletionStatusMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetNamespaceDeletionStatusMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetSystemInstance.go b/service/iotthingsgraph/api_op_GetSystemInstance.go index 370020e4774..06f6f9133ca 100644 --- a/service/iotthingsgraph/api_op_GetSystemInstance.go +++ b/service/iotthingsgraph/api_op_GetSystemInstance.go @@ -55,6 +55,9 @@ func addOperationGetSystemInstanceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetSystemInstanceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetSystemTemplate.go b/service/iotthingsgraph/api_op_GetSystemTemplate.go index 933d1d34bc0..b79a7d010bc 100644 --- a/service/iotthingsgraph/api_op_GetSystemTemplate.go +++ b/service/iotthingsgraph/api_op_GetSystemTemplate.go @@ -58,6 +58,9 @@ func addOperationGetSystemTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetSystemTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go b/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go index c30c22cda70..5e32e14d0b9 100644 --- a/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go +++ b/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go @@ -68,6 +68,9 @@ func addOperationGetSystemTemplateRevisionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetSystemTemplateRevisionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_GetUploadStatus.go b/service/iotthingsgraph/api_op_GetUploadStatus.go index 07c23034183..977860a8432 100644 --- a/service/iotthingsgraph/api_op_GetUploadStatus.go +++ b/service/iotthingsgraph/api_op_GetUploadStatus.go @@ -81,6 +81,9 @@ func addOperationGetUploadStatusMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetUploadStatusMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go b/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go index 5ef25176e5b..b810910a202 100644 --- a/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go +++ b/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go @@ -65,6 +65,9 @@ func addOperationListFlowExecutionMessagesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListFlowExecutionMessagesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_ListTagsForResource.go b/service/iotthingsgraph/api_op_ListTagsForResource.go index d256d151b75..913ed1700b8 100644 --- a/service/iotthingsgraph/api_op_ListTagsForResource.go +++ b/service/iotthingsgraph/api_op_ListTagsForResource.go @@ -62,6 +62,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_SearchEntities.go b/service/iotthingsgraph/api_op_SearchEntities.go index 0310167e07e..8cc46fc7b36 100644 --- a/service/iotthingsgraph/api_op_SearchEntities.go +++ b/service/iotthingsgraph/api_op_SearchEntities.go @@ -76,6 +76,9 @@ func addOperationSearchEntitiesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationSearchEntitiesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_SearchFlowExecutions.go b/service/iotthingsgraph/api_op_SearchFlowExecutions.go index 0d86259cace..2d23b3cb318 100644 --- a/service/iotthingsgraph/api_op_SearchFlowExecutions.go +++ b/service/iotthingsgraph/api_op_SearchFlowExecutions.go @@ -74,6 +74,9 @@ func addOperationSearchFlowExecutionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationSearchFlowExecutionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_SearchFlowTemplates.go b/service/iotthingsgraph/api_op_SearchFlowTemplates.go index 43d219d0999..9a128d98cc4 100644 --- a/service/iotthingsgraph/api_op_SearchFlowTemplates.go +++ b/service/iotthingsgraph/api_op_SearchFlowTemplates.go @@ -63,6 +63,9 @@ func addOperationSearchFlowTemplatesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationSearchFlowTemplatesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_SearchSystemInstances.go b/service/iotthingsgraph/api_op_SearchSystemInstances.go index f7282194c2c..0e4cef43b0b 100644 --- a/service/iotthingsgraph/api_op_SearchSystemInstances.go +++ b/service/iotthingsgraph/api_op_SearchSystemInstances.go @@ -64,6 +64,9 @@ func addOperationSearchSystemInstancesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationSearchSystemInstancesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_SearchSystemTemplates.go b/service/iotthingsgraph/api_op_SearchSystemTemplates.go index 4baf3b13c96..fefd9b5a327 100644 --- a/service/iotthingsgraph/api_op_SearchSystemTemplates.go +++ b/service/iotthingsgraph/api_op_SearchSystemTemplates.go @@ -65,6 +65,9 @@ func addOperationSearchSystemTemplatesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationSearchSystemTemplatesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_SearchThings.go b/service/iotthingsgraph/api_op_SearchThings.go index 5d258de71d0..b2a0dc0b285 100644 --- a/service/iotthingsgraph/api_op_SearchThings.go +++ b/service/iotthingsgraph/api_op_SearchThings.go @@ -73,6 +73,9 @@ func addOperationSearchThingsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSearchThingsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_TagResource.go b/service/iotthingsgraph/api_op_TagResource.go index 67a1e818559..fda4a415cb1 100644 --- a/service/iotthingsgraph/api_op_TagResource.go +++ b/service/iotthingsgraph/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_UndeploySystemInstance.go b/service/iotthingsgraph/api_op_UndeploySystemInstance.go index 396fab1d7b2..68704926abb 100644 --- a/service/iotthingsgraph/api_op_UndeploySystemInstance.go +++ b/service/iotthingsgraph/api_op_UndeploySystemInstance.go @@ -52,6 +52,9 @@ func addOperationUndeploySystemInstanceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationUndeploySystemInstanceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_UntagResource.go b/service/iotthingsgraph/api_op_UntagResource.go index 82e4afae69c..07cb9742515 100644 --- a/service/iotthingsgraph/api_op_UntagResource.go +++ b/service/iotthingsgraph/api_op_UntagResource.go @@ -59,6 +59,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_UpdateFlowTemplate.go b/service/iotthingsgraph/api_op_UpdateFlowTemplate.go index 0c27d5bea0e..8709c45f5bb 100644 --- a/service/iotthingsgraph/api_op_UpdateFlowTemplate.go +++ b/service/iotthingsgraph/api_op_UpdateFlowTemplate.go @@ -68,6 +68,9 @@ func addOperationUpdateFlowTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateFlowTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_UpdateSystemTemplate.go b/service/iotthingsgraph/api_op_UpdateSystemTemplate.go index 5238ce9e6b2..03c48ad87ea 100644 --- a/service/iotthingsgraph/api_op_UpdateSystemTemplate.go +++ b/service/iotthingsgraph/api_op_UpdateSystemTemplate.go @@ -66,6 +66,9 @@ func addOperationUpdateSystemTemplateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateSystemTemplateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/api_op_UploadEntityDefinitions.go b/service/iotthingsgraph/api_op_UploadEntityDefinitions.go index bce79a23144..82e9759b8b7 100644 --- a/service/iotthingsgraph/api_op_UploadEntityDefinitions.go +++ b/service/iotthingsgraph/api_op_UploadEntityDefinitions.go @@ -80,6 +80,9 @@ func addOperationUploadEntityDefinitionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUploadEntityDefinitionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/iotthingsgraph/go.mod b/service/iotthingsgraph/go.mod index 323f21c4a77..4c7ad3e4256 100644 --- a/service/iotthingsgraph/go.mod +++ b/service/iotthingsgraph/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/iotthingsgraph go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotthingsgraph/go.sum b/service/iotthingsgraph/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/iotthingsgraph/go.sum +++ b/service/iotthingsgraph/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ivs/api_client.go b/service/ivs/api_client.go index 2143548c6e5..454b36e715d 100644 --- a/service/ivs/api_client.go +++ b/service/ivs/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ivs/api_op_BatchGetChannel.go b/service/ivs/api_op_BatchGetChannel.go index 9370d89c607..9dfbce14d7f 100644 --- a/service/ivs/api_op_BatchGetChannel.go +++ b/service/ivs/api_op_BatchGetChannel.go @@ -54,6 +54,9 @@ func addOperationBatchGetChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationBatchGetChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_BatchGetStreamKey.go b/service/ivs/api_op_BatchGetStreamKey.go index 9547c0aa5c9..6efbf40e841 100644 --- a/service/ivs/api_op_BatchGetStreamKey.go +++ b/service/ivs/api_op_BatchGetStreamKey.go @@ -53,6 +53,9 @@ func addOperationBatchGetStreamKeyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationBatchGetStreamKeyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_CreateChannel.go b/service/ivs/api_op_CreateChannel.go index 01dd74863fe..2fa29024351 100644 --- a/service/ivs/api_op_CreateChannel.go +++ b/service/ivs/api_op_CreateChannel.go @@ -80,6 +80,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_CreateStreamKey.go b/service/ivs/api_op_CreateStreamKey.go index 0b5d93898f1..f3674865561 100644 --- a/service/ivs/api_op_CreateStreamKey.go +++ b/service/ivs/api_op_CreateStreamKey.go @@ -60,6 +60,9 @@ func addOperationCreateStreamKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateStreamKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_DeleteChannel.go b/service/ivs/api_op_DeleteChannel.go index 1c99812b047..3aac33fd57e 100644 --- a/service/ivs/api_op_DeleteChannel.go +++ b/service/ivs/api_op_DeleteChannel.go @@ -48,6 +48,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_DeletePlaybackKeyPair.go b/service/ivs/api_op_DeletePlaybackKeyPair.go index ad9dd25df11..ef642f8ae85 100644 --- a/service/ivs/api_op_DeletePlaybackKeyPair.go +++ b/service/ivs/api_op_DeletePlaybackKeyPair.go @@ -49,6 +49,9 @@ func addOperationDeletePlaybackKeyPairMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeletePlaybackKeyPairMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_DeleteStreamKey.go b/service/ivs/api_op_DeleteStreamKey.go index 54d3c407a3d..79a31173f93 100644 --- a/service/ivs/api_op_DeleteStreamKey.go +++ b/service/ivs/api_op_DeleteStreamKey.go @@ -49,6 +49,9 @@ func addOperationDeleteStreamKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteStreamKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_GetChannel.go b/service/ivs/api_op_GetChannel.go index d9c2b01c868..f16e9514f40 100644 --- a/service/ivs/api_op_GetChannel.go +++ b/service/ivs/api_op_GetChannel.go @@ -54,6 +54,9 @@ func addOperationGetChannelMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetChannelMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_GetPlaybackKeyPair.go b/service/ivs/api_op_GetPlaybackKeyPair.go index 4556ba2fa41..9fb932cd2ae 100644 --- a/service/ivs/api_op_GetPlaybackKeyPair.go +++ b/service/ivs/api_op_GetPlaybackKeyPair.go @@ -55,6 +55,9 @@ func addOperationGetPlaybackKeyPairMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetPlaybackKeyPairMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_GetStream.go b/service/ivs/api_op_GetStream.go index 0cf3b8bea2b..e7b83b6e3b3 100644 --- a/service/ivs/api_op_GetStream.go +++ b/service/ivs/api_op_GetStream.go @@ -53,6 +53,9 @@ func addOperationGetStreamMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetStreamMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_GetStreamKey.go b/service/ivs/api_op_GetStreamKey.go index 0fb0a67cc37..23d7f2fbc94 100644 --- a/service/ivs/api_op_GetStreamKey.go +++ b/service/ivs/api_op_GetStreamKey.go @@ -53,6 +53,9 @@ func addOperationGetStreamKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetStreamKeyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_ImportPlaybackKeyPair.go b/service/ivs/api_op_ImportPlaybackKeyPair.go index d59ad5b3ff5..5a387416c0c 100644 --- a/service/ivs/api_op_ImportPlaybackKeyPair.go +++ b/service/ivs/api_op_ImportPlaybackKeyPair.go @@ -62,6 +62,9 @@ func addOperationImportPlaybackKeyPairMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationImportPlaybackKeyPairMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_ListChannels.go b/service/ivs/api_op_ListChannels.go index f72fbeedbdf..6b5908463e8 100644 --- a/service/ivs/api_op_ListChannels.go +++ b/service/ivs/api_op_ListChannels.go @@ -66,6 +66,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_ListPlaybackKeyPairs.go b/service/ivs/api_op_ListPlaybackKeyPairs.go index 21bbef5999a..4b56b01350b 100644 --- a/service/ivs/api_op_ListPlaybackKeyPairs.go +++ b/service/ivs/api_op_ListPlaybackKeyPairs.go @@ -61,6 +61,9 @@ func addOperationListPlaybackKeyPairsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListPlaybackKeyPairsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_ListStreamKeys.go b/service/ivs/api_op_ListStreamKeys.go index 72de9f95132..59c53f7d522 100644 --- a/service/ivs/api_op_ListStreamKeys.go +++ b/service/ivs/api_op_ListStreamKeys.go @@ -66,6 +66,9 @@ func addOperationListStreamKeysMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListStreamKeysMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_ListStreams.go b/service/ivs/api_op_ListStreams.go index dba63daa8ec..7b9bd0a20f2 100644 --- a/service/ivs/api_op_ListStreams.go +++ b/service/ivs/api_op_ListStreams.go @@ -62,6 +62,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_ListTagsForResource.go b/service/ivs/api_op_ListTagsForResource.go index 71cbac20c1f..f0fc8e91536 100644 --- a/service/ivs/api_op_ListTagsForResource.go +++ b/service/ivs/api_op_ListTagsForResource.go @@ -61,6 +61,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_PutMetadata.go b/service/ivs/api_op_PutMetadata.go index 341dab64044..d1ccf80975c 100644 --- a/service/ivs/api_op_PutMetadata.go +++ b/service/ivs/api_op_PutMetadata.go @@ -55,6 +55,9 @@ func addOperationPutMetadataMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationPutMetadataMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_StopStream.go b/service/ivs/api_op_StopStream.go index 7b7a863a180..098decadfc7 100644 --- a/service/ivs/api_op_StopStream.go +++ b/service/ivs/api_op_StopStream.go @@ -52,6 +52,9 @@ func addOperationStopStreamMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStopStreamMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_TagResource.go b/service/ivs/api_op_TagResource.go index 7fd4c8cdf8e..7afd24ae97e 100644 --- a/service/ivs/api_op_TagResource.go +++ b/service/ivs/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_UntagResource.go b/service/ivs/api_op_UntagResource.go index 86af26e489f..e65f650a0c7 100644 --- a/service/ivs/api_op_UntagResource.go +++ b/service/ivs/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/api_op_UpdateChannel.go b/service/ivs/api_op_UpdateChannel.go index de1a35518e4..81cd1d37ece 100644 --- a/service/ivs/api_op_UpdateChannel.go +++ b/service/ivs/api_op_UpdateChannel.go @@ -81,6 +81,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ivs/go.mod b/service/ivs/go.mod index db6e43e2a4b..7e28d796fe3 100644 --- a/service/ivs/go.mod +++ b/service/ivs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ivs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ivs/go.sum b/service/ivs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ivs/go.sum +++ b/service/ivs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kafka/api_client.go b/service/kafka/api_client.go index 85a12a28179..16574c13499 100644 --- a/service/kafka/api_client.go +++ b/service/kafka/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kafka/api_op_BatchAssociateScramSecret.go b/service/kafka/api_op_BatchAssociateScramSecret.go index b9939fdd4a8..429f4d7d410 100644 --- a/service/kafka/api_op_BatchAssociateScramSecret.go +++ b/service/kafka/api_op_BatchAssociateScramSecret.go @@ -62,6 +62,9 @@ func addOperationBatchAssociateScramSecretMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationBatchAssociateScramSecretMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_BatchDisassociateScramSecret.go b/service/kafka/api_op_BatchDisassociateScramSecret.go index e9446d84159..7bf57130dd1 100644 --- a/service/kafka/api_op_BatchDisassociateScramSecret.go +++ b/service/kafka/api_op_BatchDisassociateScramSecret.go @@ -62,6 +62,9 @@ func addOperationBatchDisassociateScramSecretMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationBatchDisassociateScramSecretMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_CreateCluster.go b/service/kafka/api_op_CreateCluster.go index 42dbffe5b30..e7af1c9ca81 100644 --- a/service/kafka/api_op_CreateCluster.go +++ b/service/kafka/api_op_CreateCluster.go @@ -96,6 +96,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_CreateConfiguration.go b/service/kafka/api_op_CreateConfiguration.go index 775b533f198..ad615d86542 100644 --- a/service/kafka/api_op_CreateConfiguration.go +++ b/service/kafka/api_op_CreateConfiguration.go @@ -81,6 +81,9 @@ func addOperationCreateConfigurationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateConfigurationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_DeleteCluster.go b/service/kafka/api_op_DeleteCluster.go index ddc5b414926..454cb299732 100644 --- a/service/kafka/api_op_DeleteCluster.go +++ b/service/kafka/api_op_DeleteCluster.go @@ -60,6 +60,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_DeleteConfiguration.go b/service/kafka/api_op_DeleteConfiguration.go index 21c6a7bd665..e4bf27f3d90 100644 --- a/service/kafka/api_op_DeleteConfiguration.go +++ b/service/kafka/api_op_DeleteConfiguration.go @@ -57,6 +57,9 @@ func addOperationDeleteConfigurationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteConfigurationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_DescribeCluster.go b/service/kafka/api_op_DescribeCluster.go index be48f718c42..b2503b59e48 100644 --- a/service/kafka/api_op_DescribeCluster.go +++ b/service/kafka/api_op_DescribeCluster.go @@ -54,6 +54,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_DescribeClusterOperation.go b/service/kafka/api_op_DescribeClusterOperation.go index 2582910779c..dba22325b67 100644 --- a/service/kafka/api_op_DescribeClusterOperation.go +++ b/service/kafka/api_op_DescribeClusterOperation.go @@ -54,6 +54,9 @@ func addOperationDescribeClusterOperationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeClusterOperationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_DescribeConfiguration.go b/service/kafka/api_op_DescribeConfiguration.go index 145fd8bb15e..c863aae756e 100644 --- a/service/kafka/api_op_DescribeConfiguration.go +++ b/service/kafka/api_op_DescribeConfiguration.go @@ -74,6 +74,9 @@ func addOperationDescribeConfigurationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeConfigurationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_DescribeConfigurationRevision.go b/service/kafka/api_op_DescribeConfigurationRevision.go index 7a03ed43480..7b290e81bb0 100644 --- a/service/kafka/api_op_DescribeConfigurationRevision.go +++ b/service/kafka/api_op_DescribeConfigurationRevision.go @@ -74,6 +74,9 @@ func addOperationDescribeConfigurationRevisionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeConfigurationRevisionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_GetBootstrapBrokers.go b/service/kafka/api_op_GetBootstrapBrokers.go index 307924b4f7b..3d99a50fde7 100644 --- a/service/kafka/api_op_GetBootstrapBrokers.go +++ b/service/kafka/api_op_GetBootstrapBrokers.go @@ -58,6 +58,9 @@ func addOperationGetBootstrapBrokersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetBootstrapBrokersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_GetCompatibleKafkaVersions.go b/service/kafka/api_op_GetCompatibleKafkaVersions.go index fab22f014e7..5661caf57aa 100644 --- a/service/kafka/api_op_GetCompatibleKafkaVersions.go +++ b/service/kafka/api_op_GetCompatibleKafkaVersions.go @@ -51,6 +51,9 @@ func addOperationGetCompatibleKafkaVersionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetCompatibleKafkaVersionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListClusterOperations.go b/service/kafka/api_op_ListClusterOperations.go index 69d2e935614..5caf98ad98f 100644 --- a/service/kafka/api_op_ListClusterOperations.go +++ b/service/kafka/api_op_ListClusterOperations.go @@ -68,6 +68,9 @@ func addOperationListClusterOperationsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListClusterOperationsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListClusters.go b/service/kafka/api_op_ListClusters.go index afa9b7bb10e..7288a4394ab 100644 --- a/service/kafka/api_op_ListClusters.go +++ b/service/kafka/api_op_ListClusters.go @@ -66,6 +66,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListConfigurationRevisions.go b/service/kafka/api_op_ListConfigurationRevisions.go index 870748c4663..2420e2c5c6e 100644 --- a/service/kafka/api_op_ListConfigurationRevisions.go +++ b/service/kafka/api_op_ListConfigurationRevisions.go @@ -66,6 +66,9 @@ func addOperationListConfigurationRevisionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListConfigurationRevisionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListConfigurations.go b/service/kafka/api_op_ListConfigurations.go index 73459beb922..6064e13f221 100644 --- a/service/kafka/api_op_ListConfigurations.go +++ b/service/kafka/api_op_ListConfigurations.go @@ -62,6 +62,9 @@ func addOperationListConfigurationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListConfigurationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListKafkaVersions.go b/service/kafka/api_op_ListKafkaVersions.go index 06ac0f040f1..3141de03b4f 100644 --- a/service/kafka/api_op_ListKafkaVersions.go +++ b/service/kafka/api_op_ListKafkaVersions.go @@ -57,6 +57,9 @@ func addOperationListKafkaVersionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListKafkaVersionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListNodes.go b/service/kafka/api_op_ListNodes.go index d64cfd020e4..516c7130f31 100644 --- a/service/kafka/api_op_ListNodes.go +++ b/service/kafka/api_op_ListNodes.go @@ -67,6 +67,9 @@ func addOperationListNodesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListNodesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListScramSecrets.go b/service/kafka/api_op_ListScramSecrets.go index 3ebf515cf9a..396cdd5b3c4 100644 --- a/service/kafka/api_op_ListScramSecrets.go +++ b/service/kafka/api_op_ListScramSecrets.go @@ -61,6 +61,9 @@ func addOperationListScramSecretsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListScramSecretsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_ListTagsForResource.go b/service/kafka/api_op_ListTagsForResource.go index 77440efe99f..42bdf82af0f 100644 --- a/service/kafka/api_op_ListTagsForResource.go +++ b/service/kafka/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_RebootBroker.go b/service/kafka/api_op_RebootBroker.go index 7e52348170c..1d048de9b38 100644 --- a/service/kafka/api_op_RebootBroker.go +++ b/service/kafka/api_op_RebootBroker.go @@ -62,6 +62,9 @@ func addOperationRebootBrokerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationRebootBrokerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_TagResource.go b/service/kafka/api_op_TagResource.go index 53e3f4b44bf..e8f8778374e 100644 --- a/service/kafka/api_op_TagResource.go +++ b/service/kafka/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UntagResource.go b/service/kafka/api_op_UntagResource.go index 3521122c233..3f3734c9095 100644 --- a/service/kafka/api_op_UntagResource.go +++ b/service/kafka/api_op_UntagResource.go @@ -69,6 +69,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UpdateBrokerCount.go b/service/kafka/api_op_UpdateBrokerCount.go index 4270c4eb336..4b7baeabb03 100644 --- a/service/kafka/api_op_UpdateBrokerCount.go +++ b/service/kafka/api_op_UpdateBrokerCount.go @@ -67,6 +67,9 @@ func addOperationUpdateBrokerCountMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateBrokerCountMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UpdateBrokerStorage.go b/service/kafka/api_op_UpdateBrokerStorage.go index 2c8580741ed..280ec5e7c61 100644 --- a/service/kafka/api_op_UpdateBrokerStorage.go +++ b/service/kafka/api_op_UpdateBrokerStorage.go @@ -68,6 +68,9 @@ func addOperationUpdateBrokerStorageMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateBrokerStorageMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UpdateClusterConfiguration.go b/service/kafka/api_op_UpdateClusterConfiguration.go index 1addcae64f6..0af1036c50f 100644 --- a/service/kafka/api_op_UpdateClusterConfiguration.go +++ b/service/kafka/api_op_UpdateClusterConfiguration.go @@ -68,6 +68,9 @@ func addOperationUpdateClusterConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateClusterConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UpdateClusterKafkaVersion.go b/service/kafka/api_op_UpdateClusterKafkaVersion.go index b3abda4cc0b..0d514c6a3aa 100644 --- a/service/kafka/api_op_UpdateClusterKafkaVersion.go +++ b/service/kafka/api_op_UpdateClusterKafkaVersion.go @@ -69,6 +69,9 @@ func addOperationUpdateClusterKafkaVersionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateClusterKafkaVersionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UpdateConfiguration.go b/service/kafka/api_op_UpdateConfiguration.go index a8d69aada8a..64e08516981 100644 --- a/service/kafka/api_op_UpdateConfiguration.go +++ b/service/kafka/api_op_UpdateConfiguration.go @@ -67,6 +67,9 @@ func addOperationUpdateConfigurationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateConfigurationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/api_op_UpdateMonitoring.go b/service/kafka/api_op_UpdateMonitoring.go index add0c651cc4..7b9b70e2c8c 100644 --- a/service/kafka/api_op_UpdateMonitoring.go +++ b/service/kafka/api_op_UpdateMonitoring.go @@ -75,6 +75,9 @@ func addOperationUpdateMonitoringMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateMonitoringMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kafka/go.mod b/service/kafka/go.mod index e0a9c15f2c6..1cb4ab3b8a1 100644 --- a/service/kafka/go.mod +++ b/service/kafka/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kafka go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kafka/go.sum b/service/kafka/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kafka/go.sum +++ b/service/kafka/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kendra/api_client.go b/service/kendra/api_client.go index f0f0245ac65..0e476194d21 100644 --- a/service/kendra/api_client.go +++ b/service/kendra/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kendra/api_op_BatchDeleteDocument.go b/service/kendra/api_op_BatchDeleteDocument.go index 6ec6859e0c7..c31af9ad6f9 100644 --- a/service/kendra/api_op_BatchDeleteDocument.go +++ b/service/kendra/api_op_BatchDeleteDocument.go @@ -66,6 +66,9 @@ func addOperationBatchDeleteDocumentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationBatchDeleteDocumentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_BatchPutDocument.go b/service/kendra/api_op_BatchPutDocument.go index 22291a80423..253e4b72af1 100644 --- a/service/kendra/api_op_BatchPutDocument.go +++ b/service/kendra/api_op_BatchPutDocument.go @@ -88,6 +88,9 @@ func addOperationBatchPutDocumentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationBatchPutDocumentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_CreateDataSource.go b/service/kendra/api_op_CreateDataSource.go index 827bf3c8e46..146410e3911 100644 --- a/service/kendra/api_op_CreateDataSource.go +++ b/service/kendra/api_op_CreateDataSource.go @@ -106,6 +106,9 @@ func addOperationCreateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_CreateFaq.go b/service/kendra/api_op_CreateFaq.go index 96da05159eb..8c76cb3d976 100644 --- a/service/kendra/api_op_CreateFaq.go +++ b/service/kendra/api_op_CreateFaq.go @@ -91,6 +91,9 @@ func addOperationCreateFaqMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateFaqMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_CreateIndex.go b/service/kendra/api_op_CreateIndex.go index 503e76456bb..0b4bd897433 100644 --- a/service/kendra/api_op_CreateIndex.go +++ b/service/kendra/api_op_CreateIndex.go @@ -90,6 +90,9 @@ func addOperationCreateIndexMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateIndexMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_DeleteDataSource.go b/service/kendra/api_op_DeleteDataSource.go index 58378d1a2f3..3ed30c30738 100644 --- a/service/kendra/api_op_DeleteDataSource.go +++ b/service/kendra/api_op_DeleteDataSource.go @@ -57,6 +57,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_DeleteFaq.go b/service/kendra/api_op_DeleteFaq.go index 70c3c8f06cf..1d78853a078 100644 --- a/service/kendra/api_op_DeleteFaq.go +++ b/service/kendra/api_op_DeleteFaq.go @@ -53,6 +53,9 @@ func addOperationDeleteFaqMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteFaqMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_DeleteIndex.go b/service/kendra/api_op_DeleteIndex.go index 6d9d4816b0c..6ce74dabb9f 100644 --- a/service/kendra/api_op_DeleteIndex.go +++ b/service/kendra/api_op_DeleteIndex.go @@ -50,6 +50,9 @@ func addOperationDeleteIndexMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteIndexMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_DescribeDataSource.go b/service/kendra/api_op_DescribeDataSource.go index 6ba2574ae21..8f2757c1dc1 100644 --- a/service/kendra/api_op_DescribeDataSource.go +++ b/service/kendra/api_op_DescribeDataSource.go @@ -98,6 +98,9 @@ func addOperationDescribeDataSourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeDataSourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_DescribeFaq.go b/service/kendra/api_op_DescribeFaq.go index ae10b36f907..60615b59f0b 100644 --- a/service/kendra/api_op_DescribeFaq.go +++ b/service/kendra/api_op_DescribeFaq.go @@ -91,6 +91,9 @@ func addOperationDescribeFaqMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeFaqMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_DescribeIndex.go b/service/kendra/api_op_DescribeIndex.go index 4d3726b6e97..f963cc7e2c0 100644 --- a/service/kendra/api_op_DescribeIndex.go +++ b/service/kendra/api_op_DescribeIndex.go @@ -100,6 +100,9 @@ func addOperationDescribeIndexMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationDescribeIndexMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_ListDataSourceSyncJobs.go b/service/kendra/api_op_ListDataSourceSyncJobs.go index 8b28b5024d9..cef63ea0c57 100644 --- a/service/kendra/api_op_ListDataSourceSyncJobs.go +++ b/service/kendra/api_op_ListDataSourceSyncJobs.go @@ -81,6 +81,9 @@ func addOperationListDataSourceSyncJobsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListDataSourceSyncJobsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_ListDataSources.go b/service/kendra/api_op_ListDataSources.go index aa5a985ab9a..6f16fedff7b 100644 --- a/service/kendra/api_op_ListDataSources.go +++ b/service/kendra/api_op_ListDataSources.go @@ -66,6 +66,9 @@ func addOperationListDataSourcesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListDataSourcesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_ListFaqs.go b/service/kendra/api_op_ListFaqs.go index 263d2c2bca3..787c68c477a 100644 --- a/service/kendra/api_op_ListFaqs.go +++ b/service/kendra/api_op_ListFaqs.go @@ -67,6 +67,9 @@ func addOperationListFaqsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListFaqsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_ListIndices.go b/service/kendra/api_op_ListIndices.go index 5de4df98865..6826dad6c79 100644 --- a/service/kendra/api_op_ListIndices.go +++ b/service/kendra/api_op_ListIndices.go @@ -61,6 +61,9 @@ func addOperationListIndicesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListIndicesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_ListTagsForResource.go b/service/kendra/api_op_ListTagsForResource.go index 0b6b2c03121..30a53bf7d1d 100644 --- a/service/kendra/api_op_ListTagsForResource.go +++ b/service/kendra/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_Query.go b/service/kendra/api_op_Query.go index 197fd051c94..a3b4840c66f 100644 --- a/service/kendra/api_op_Query.go +++ b/service/kendra/api_op_Query.go @@ -126,6 +126,9 @@ func addOperationQueryMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationQueryMiddlewares(stack *middleware.Stack, options Options) (err if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_StartDataSourceSyncJob.go b/service/kendra/api_op_StartDataSourceSyncJob.go index 17f106c5515..0a0267bf55e 100644 --- a/service/kendra/api_op_StartDataSourceSyncJob.go +++ b/service/kendra/api_op_StartDataSourceSyncJob.go @@ -58,6 +58,9 @@ func addOperationStartDataSourceSyncJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationStartDataSourceSyncJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_StopDataSourceSyncJob.go b/service/kendra/api_op_StopDataSourceSyncJob.go index 984b120694b..0b5532e688a 100644 --- a/service/kendra/api_op_StopDataSourceSyncJob.go +++ b/service/kendra/api_op_StopDataSourceSyncJob.go @@ -54,6 +54,9 @@ func addOperationStopDataSourceSyncJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStopDataSourceSyncJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_SubmitFeedback.go b/service/kendra/api_op_SubmitFeedback.go index b379b14df9c..bd7b3f8732c 100644 --- a/service/kendra/api_op_SubmitFeedback.go +++ b/service/kendra/api_op_SubmitFeedback.go @@ -63,6 +63,9 @@ func addOperationSubmitFeedbackMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationSubmitFeedbackMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_TagResource.go b/service/kendra/api_op_TagResource.go index 3d15bcaf5d6..5339e8f9256 100644 --- a/service/kendra/api_op_TagResource.go +++ b/service/kendra/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_UntagResource.go b/service/kendra/api_op_UntagResource.go index 0d424dc3cf5..5b26b4e5525 100644 --- a/service/kendra/api_op_UntagResource.go +++ b/service/kendra/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_UpdateDataSource.go b/service/kendra/api_op_UpdateDataSource.go index 77b48964a65..c633489039a 100644 --- a/service/kendra/api_op_UpdateDataSource.go +++ b/service/kendra/api_op_UpdateDataSource.go @@ -72,6 +72,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/api_op_UpdateIndex.go b/service/kendra/api_op_UpdateIndex.go index 44e16f03bac..5fe97be9b47 100644 --- a/service/kendra/api_op_UpdateIndex.go +++ b/service/kendra/api_op_UpdateIndex.go @@ -68,6 +68,9 @@ func addOperationUpdateIndexMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateIndexMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kendra/go.mod b/service/kendra/go.mod index a3f9839be3f..dec2d0b8ab6 100644 --- a/service/kendra/go.mod +++ b/service/kendra/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kendra go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kendra/go.sum b/service/kendra/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kendra/go.sum +++ b/service/kendra/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesis/api_client.go b/service/kinesis/api_client.go index a014104156b..c0211e6c77f 100644 --- a/service/kinesis/api_client.go +++ b/service/kinesis/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesis/api_op_AddTagsToStream.go b/service/kinesis/api_op_AddTagsToStream.go index 4c8b66d7263..1ea864ea2fc 100644 --- a/service/kinesis/api_op_AddTagsToStream.go +++ b/service/kinesis/api_op_AddTagsToStream.go @@ -60,6 +60,9 @@ func addOperationAddTagsToStreamMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAddTagsToStreamMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_CreateStream.go b/service/kinesis/api_op_CreateStream.go index 1963f84cd4a..7892cee0971 100644 --- a/service/kinesis/api_op_CreateStream.go +++ b/service/kinesis/api_op_CreateStream.go @@ -93,6 +93,9 @@ func addOperationCreateStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go b/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go index 1e07e35290c..593d4865c60 100644 --- a/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go +++ b/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go @@ -60,6 +60,9 @@ func addOperationDecreaseStreamRetentionPeriodMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDecreaseStreamRetentionPeriodMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DeleteStream.go b/service/kinesis/api_op_DeleteStream.go index af1e74c7c5b..3cf5d67e6d9 100644 --- a/service/kinesis/api_op_DeleteStream.go +++ b/service/kinesis/api_op_DeleteStream.go @@ -66,6 +66,9 @@ func addOperationDeleteStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DeregisterStreamConsumer.go b/service/kinesis/api_op_DeregisterStreamConsumer.go index 4092e5729fc..3c0a37ca95e 100644 --- a/service/kinesis/api_op_DeregisterStreamConsumer.go +++ b/service/kinesis/api_op_DeregisterStreamConsumer.go @@ -65,6 +65,9 @@ func addOperationDeregisterStreamConsumerMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeregisterStreamConsumerMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DescribeLimits.go b/service/kinesis/api_op_DescribeLimits.go index 706b8ded6dd..82e0118ef1a 100644 --- a/service/kinesis/api_op_DescribeLimits.go +++ b/service/kinesis/api_op_DescribeLimits.go @@ -56,6 +56,9 @@ func addOperationDescribeLimitsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeLimitsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DescribeStream.go b/service/kinesis/api_op_DescribeStream.go index 358e5153f18..124cc39b471 100644 --- a/service/kinesis/api_op_DescribeStream.go +++ b/service/kinesis/api_op_DescribeStream.go @@ -80,6 +80,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DescribeStreamConsumer.go b/service/kinesis/api_op_DescribeStreamConsumer.go index ce1b49c91ad..c4f732c125c 100644 --- a/service/kinesis/api_op_DescribeStreamConsumer.go +++ b/service/kinesis/api_op_DescribeStreamConsumer.go @@ -68,6 +68,9 @@ func addOperationDescribeStreamConsumerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeStreamConsumerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DescribeStreamSummary.go b/service/kinesis/api_op_DescribeStreamSummary.go index 7dc0b2a2d91..c8e67d70d44 100644 --- a/service/kinesis/api_op_DescribeStreamSummary.go +++ b/service/kinesis/api_op_DescribeStreamSummary.go @@ -59,6 +59,9 @@ func addOperationDescribeStreamSummaryMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeStreamSummaryMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_DisableEnhancedMonitoring.go b/service/kinesis/api_op_DisableEnhancedMonitoring.go index 94d1474291e..71a0eb52fa1 100644 --- a/service/kinesis/api_op_DisableEnhancedMonitoring.go +++ b/service/kinesis/api_op_DisableEnhancedMonitoring.go @@ -94,6 +94,9 @@ func addOperationDisableEnhancedMonitoringMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDisableEnhancedMonitoringMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_EnableEnhancedMonitoring.go b/service/kinesis/api_op_EnableEnhancedMonitoring.go index 35218fbbce9..0ac90bdb530 100644 --- a/service/kinesis/api_op_EnableEnhancedMonitoring.go +++ b/service/kinesis/api_op_EnableEnhancedMonitoring.go @@ -94,6 +94,9 @@ func addOperationEnableEnhancedMonitoringMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationEnableEnhancedMonitoringMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_GetRecords.go b/service/kinesis/api_op_GetRecords.go index 36ae3237380..d50a894ab0b 100644 --- a/service/kinesis/api_op_GetRecords.go +++ b/service/kinesis/api_op_GetRecords.go @@ -125,6 +125,9 @@ func addOperationGetRecordsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationGetRecordsMiddlewares(stack *middleware.Stack, options Options) if err = awshttp.AddResponseReadTimeoutMiddleware(stack, kinesiscust.ReadTimeoutDuration); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_GetShardIterator.go b/service/kinesis/api_op_GetShardIterator.go index de894167759..38595a58af7 100644 --- a/service/kinesis/api_op_GetShardIterator.go +++ b/service/kinesis/api_op_GetShardIterator.go @@ -130,6 +130,9 @@ func addOperationGetShardIteratorMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationGetShardIteratorMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go b/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go index 52583fbe60f..79217319d22 100644 --- a/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go +++ b/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go @@ -63,6 +63,9 @@ func addOperationIncreaseStreamRetentionPeriodMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationIncreaseStreamRetentionPeriodMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_ListShards.go b/service/kinesis/api_op_ListShards.go index f2b11404261..6f22a70eb16 100644 --- a/service/kinesis/api_op_ListShards.go +++ b/service/kinesis/api_op_ListShards.go @@ -115,6 +115,9 @@ func addOperationListShardsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationListShardsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_ListStreamConsumers.go b/service/kinesis/api_op_ListStreamConsumers.go index 1dfa14ea66b..4b730e42d04 100644 --- a/service/kinesis/api_op_ListStreamConsumers.go +++ b/service/kinesis/api_op_ListStreamConsumers.go @@ -102,6 +102,9 @@ func addOperationListStreamConsumersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationListStreamConsumersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_ListStreams.go b/service/kinesis/api_op_ListStreams.go index e249c474201..eddd0447431 100644 --- a/service/kinesis/api_op_ListStreams.go +++ b/service/kinesis/api_op_ListStreams.go @@ -74,6 +74,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_ListTagsForStream.go b/service/kinesis/api_op_ListTagsForStream.go index 8821ae54426..c2e8307ba4e 100644 --- a/service/kinesis/api_op_ListTagsForStream.go +++ b/service/kinesis/api_op_ListTagsForStream.go @@ -74,6 +74,9 @@ func addOperationListTagsForStreamMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListTagsForStreamMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_MergeShards.go b/service/kinesis/api_op_MergeShards.go index 3db8c6f61f4..1fbf80394b5 100644 --- a/service/kinesis/api_op_MergeShards.go +++ b/service/kinesis/api_op_MergeShards.go @@ -86,6 +86,9 @@ func addOperationMergeShardsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationMergeShardsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_PutRecord.go b/service/kinesis/api_op_PutRecord.go index 11f98a3f96f..73aff0d499a 100644 --- a/service/kinesis/api_op_PutRecord.go +++ b/service/kinesis/api_op_PutRecord.go @@ -139,6 +139,9 @@ func addOperationPutRecordMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationPutRecordMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_PutRecords.go b/service/kinesis/api_op_PutRecords.go index 47c4171184a..cd7d68413d6 100644 --- a/service/kinesis/api_op_PutRecords.go +++ b/service/kinesis/api_op_PutRecords.go @@ -129,6 +129,9 @@ func addOperationPutRecordsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationPutRecordsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_RegisterStreamConsumer.go b/service/kinesis/api_op_RegisterStreamConsumer.go index a00eb8a91ab..e92a7f023c0 100644 --- a/service/kinesis/api_op_RegisterStreamConsumer.go +++ b/service/kinesis/api_op_RegisterStreamConsumer.go @@ -75,6 +75,9 @@ func addOperationRegisterStreamConsumerMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRegisterStreamConsumerMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_RemoveTagsFromStream.go b/service/kinesis/api_op_RemoveTagsFromStream.go index b4b6896d433..f5913f680f5 100644 --- a/service/kinesis/api_op_RemoveTagsFromStream.go +++ b/service/kinesis/api_op_RemoveTagsFromStream.go @@ -57,6 +57,9 @@ func addOperationRemoveTagsFromStreamMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationRemoveTagsFromStreamMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_SplitShard.go b/service/kinesis/api_op_SplitShard.go index 68094c5c44b..13f5734f49d 100644 --- a/service/kinesis/api_op_SplitShard.go +++ b/service/kinesis/api_op_SplitShard.go @@ -102,6 +102,9 @@ func addOperationSplitShardMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationSplitShardMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_StartStreamEncryption.go b/service/kinesis/api_op_StartStreamEncryption.go index 31ef66a38c0..39caa10e989 100644 --- a/service/kinesis/api_op_StartStreamEncryption.go +++ b/service/kinesis/api_op_StartStreamEncryption.go @@ -91,6 +91,9 @@ func addOperationStartStreamEncryptionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationStartStreamEncryptionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_StopStreamEncryption.go b/service/kinesis/api_op_StopStreamEncryption.go index 50ff458204b..6053a409e37 100644 --- a/service/kinesis/api_op_StopStreamEncryption.go +++ b/service/kinesis/api_op_StopStreamEncryption.go @@ -90,6 +90,9 @@ func addOperationStopStreamEncryptionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationStopStreamEncryptionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/api_op_UpdateShardCount.go b/service/kinesis/api_op_UpdateShardCount.go index 39ff7538277..2d049b1ae0c 100644 --- a/service/kinesis/api_op_UpdateShardCount.go +++ b/service/kinesis/api_op_UpdateShardCount.go @@ -122,6 +122,9 @@ func addOperationUpdateShardCountMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationUpdateShardCountMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesis/go.mod b/service/kinesis/go.mod index c87ed91cec9..2ab6af87371 100644 --- a/service/kinesis/go.mod +++ b/service/kinesis/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesis go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesis/go.sum b/service/kinesis/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesis/go.sum +++ b/service/kinesis/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisanalytics/api_client.go b/service/kinesisanalytics/api_client.go index 9ceaaceb0f6..29f8304b96c 100644 --- a/service/kinesisanalytics/api_client.go +++ b/service/kinesisanalytics/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go b/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go index 0df267dbf8c..0aa21c4185d 100644 --- a/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go @@ -68,6 +68,9 @@ func addOperationAddApplicationCloudWatchLoggingOptionMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAddApplicationCloudWatchLoggingOptionMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_AddApplicationInput.go b/service/kinesisanalytics/api_op_AddApplicationInput.go index e7577fc2216..228e542e9ae 100644 --- a/service/kinesisanalytics/api_op_AddApplicationInput.go +++ b/service/kinesisanalytics/api_op_AddApplicationInput.go @@ -81,6 +81,9 @@ func addOperationAddApplicationInputMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationAddApplicationInputMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go b/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go index 6938990efbd..abc70715373 100644 --- a/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go @@ -82,6 +82,9 @@ func addOperationAddApplicationInputProcessingConfigurationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationAddApplicationInputProcessingConfigurationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_AddApplicationOutput.go b/service/kinesisanalytics/api_op_AddApplicationOutput.go index 682743bce5c..44dcec1cb8f 100644 --- a/service/kinesisanalytics/api_op_AddApplicationOutput.go +++ b/service/kinesisanalytics/api_op_AddApplicationOutput.go @@ -92,6 +92,9 @@ func addOperationAddApplicationOutputMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationAddApplicationOutputMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go b/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go index 988c52f68ec..d7ee8fa2fde 100644 --- a/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go +++ b/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go @@ -85,6 +85,9 @@ func addOperationAddApplicationReferenceDataSourceMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationAddApplicationReferenceDataSourceMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_CreateApplication.go b/service/kinesisanalytics/api_op_CreateApplication.go index 188c2fe603e..18ad39cf292 100644 --- a/service/kinesisanalytics/api_op_CreateApplication.go +++ b/service/kinesisanalytics/api_op_CreateApplication.go @@ -141,6 +141,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DeleteApplication.go b/service/kinesisanalytics/api_op_DeleteApplication.go index 8ec3cb1a5f3..7e9dd3efee0 100644 --- a/service/kinesisanalytics/api_op_DeleteApplication.go +++ b/service/kinesisanalytics/api_op_DeleteApplication.go @@ -63,6 +63,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go b/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go index 3940027361b..42c65c326ed 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go @@ -67,6 +67,9 @@ func addOperationDeleteApplicationCloudWatchLoggingOptionMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteApplicationCloudWatchLoggingOptionMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go b/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go index c56660882b2..bc8899266a4 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go @@ -67,6 +67,9 @@ func addOperationDeleteApplicationInputProcessingConfigurationMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteApplicationInputProcessingConfigurationMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DeleteApplicationOutput.go b/service/kinesisanalytics/api_op_DeleteApplicationOutput.go index 7b8bb8705af..98e5fbcc701 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationOutput.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationOutput.go @@ -79,6 +79,9 @@ func addOperationDeleteApplicationOutputMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteApplicationOutputMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go b/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go index f7e72675bf9..871cccf5c64 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go @@ -75,6 +75,9 @@ func addOperationDeleteApplicationReferenceDataSourceMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteApplicationReferenceDataSourceMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DescribeApplication.go b/service/kinesisanalytics/api_op_DescribeApplication.go index 77e7e9a4179..134e2c190e8 100644 --- a/service/kinesisanalytics/api_op_DescribeApplication.go +++ b/service/kinesisanalytics/api_op_DescribeApplication.go @@ -69,6 +69,9 @@ func addOperationDescribeApplicationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeApplicationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_DiscoverInputSchema.go b/service/kinesisanalytics/api_op_DiscoverInputSchema.go index df30eccf65c..6970edec11a 100644 --- a/service/kinesisanalytics/api_op_DiscoverInputSchema.go +++ b/service/kinesisanalytics/api_op_DiscoverInputSchema.go @@ -94,6 +94,9 @@ func addOperationDiscoverInputSchemaMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDiscoverInputSchemaMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_ListApplications.go b/service/kinesisanalytics/api_op_ListApplications.go index 7524bcf1728..d78dc837cfe 100644 --- a/service/kinesisanalytics/api_op_ListApplications.go +++ b/service/kinesisanalytics/api_op_ListApplications.go @@ -80,6 +80,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_ListTagsForResource.go b/service/kinesisanalytics/api_op_ListTagsForResource.go index 1d7ccc2a649..32628fb0f81 100644 --- a/service/kinesisanalytics/api_op_ListTagsForResource.go +++ b/service/kinesisanalytics/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_StartApplication.go b/service/kinesisanalytics/api_op_StartApplication.go index f0b02994c4d..ca44e99a9b1 100644 --- a/service/kinesisanalytics/api_op_StartApplication.go +++ b/service/kinesisanalytics/api_op_StartApplication.go @@ -74,6 +74,9 @@ func addOperationStartApplicationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationStartApplicationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_StopApplication.go b/service/kinesisanalytics/api_op_StopApplication.go index aff840b78d8..8e0b7b047dd 100644 --- a/service/kinesisanalytics/api_op_StopApplication.go +++ b/service/kinesisanalytics/api_op_StopApplication.go @@ -61,6 +61,9 @@ func addOperationStopApplicationMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationStopApplicationMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_TagResource.go b/service/kinesisanalytics/api_op_TagResource.go index eaefff72003..841af8710eb 100644 --- a/service/kinesisanalytics/api_op_TagResource.go +++ b/service/kinesisanalytics/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_UntagResource.go b/service/kinesisanalytics/api_op_UntagResource.go index 2e6e41a20cb..8a632cae241 100644 --- a/service/kinesisanalytics/api_op_UntagResource.go +++ b/service/kinesisanalytics/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/api_op_UpdateApplication.go b/service/kinesisanalytics/api_op_UpdateApplication.go index ae371ef44bc..3a18aa5cc48 100644 --- a/service/kinesisanalytics/api_op_UpdateApplication.go +++ b/service/kinesisanalytics/api_op_UpdateApplication.go @@ -69,6 +69,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalytics/go.mod b/service/kinesisanalytics/go.mod index 0ddb4d49ac5..d42d0fde131 100644 --- a/service/kinesisanalytics/go.mod +++ b/service/kinesisanalytics/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisanalytics go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisanalytics/go.sum b/service/kinesisanalytics/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesisanalytics/go.sum +++ b/service/kinesisanalytics/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisanalyticsv2/api_client.go b/service/kinesisanalyticsv2/api_client.go index 3c0c0f78557..c3ac69a6440 100644 --- a/service/kinesisanalyticsv2/api_client.go +++ b/service/kinesisanalyticsv2/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go b/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go index fafcea8ec81..b867f7730ab 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go @@ -74,6 +74,9 @@ func addOperationAddApplicationCloudWatchLoggingOptionMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationAddApplicationCloudWatchLoggingOptionMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationInput.go b/service/kinesisanalyticsv2/api_op_AddApplicationInput.go index 041b8e7cb6d..0caf38ad26c 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationInput.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationInput.go @@ -77,6 +77,9 @@ func addOperationAddApplicationInputMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAddApplicationInputMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go b/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go index 9979faf0f57..122e5acd60c 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go @@ -89,6 +89,9 @@ func addOperationAddApplicationInputProcessingConfigurationMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationAddApplicationInputProcessingConfigurationMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go b/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go index 31b449ac839..1238f700fca 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go @@ -90,6 +90,9 @@ func addOperationAddApplicationOutputMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationAddApplicationOutputMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go b/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go index 8a5e1b0beb0..334faaf63a2 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go @@ -82,6 +82,9 @@ func addOperationAddApplicationReferenceDataSourceMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationAddApplicationReferenceDataSourceMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go b/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go index 27197263b31..0fc4a56f8de 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go @@ -83,6 +83,9 @@ func addOperationAddApplicationVpcConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationAddApplicationVpcConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_CreateApplication.go b/service/kinesisanalyticsv2/api_op_CreateApplication.go index f79f34d5624..0bd60b09fdd 100644 --- a/service/kinesisanalyticsv2/api_op_CreateApplication.go +++ b/service/kinesisanalyticsv2/api_op_CreateApplication.go @@ -86,6 +86,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go b/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go index e7f507f367e..8c2dd02da7e 100644 --- a/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go +++ b/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go @@ -53,6 +53,9 @@ func addOperationCreateApplicationSnapshotMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCreateApplicationSnapshotMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplication.go b/service/kinesisanalyticsv2/api_op_DeleteApplication.go index 9266ea518bb..e2208c42db1 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplication.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplication.go @@ -55,6 +55,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go index 87dd45a9df6..82004703c9f 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go @@ -75,6 +75,9 @@ func addOperationDeleteApplicationCloudWatchLoggingOptionMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteApplicationCloudWatchLoggingOptionMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go index f9d404785a8..7769261016f 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go @@ -69,6 +69,9 @@ func addOperationDeleteApplicationInputProcessingConfigurationMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteApplicationInputProcessingConfigurationMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go index 6e4d996e676..78da2e5d99b 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go @@ -75,6 +75,9 @@ func addOperationDeleteApplicationOutputMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteApplicationOutputMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go index 5517e743d46..56feb4c0908 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go @@ -73,6 +73,9 @@ func addOperationDeleteApplicationReferenceDataSourceMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteApplicationReferenceDataSourceMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go index 2abf2881299..47eddefa0f4 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go @@ -60,6 +60,9 @@ func addOperationDeleteApplicationSnapshotMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteApplicationSnapshotMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go index 28c605331f8..ad2d945c821 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go @@ -66,6 +66,9 @@ func addOperationDeleteApplicationVpcConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteApplicationVpcConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DescribeApplication.go b/service/kinesisanalyticsv2/api_op_DescribeApplication.go index 633600cb925..c219d9d8fc1 100644 --- a/service/kinesisanalyticsv2/api_op_DescribeApplication.go +++ b/service/kinesisanalyticsv2/api_op_DescribeApplication.go @@ -62,6 +62,9 @@ func addOperationDescribeApplicationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeApplicationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go b/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go index edc2a7c8328..cbcd4fa74a4 100644 --- a/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go +++ b/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go @@ -60,6 +60,9 @@ func addOperationDescribeApplicationSnapshotMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeApplicationSnapshotMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go b/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go index d4ec38dfbc4..30ca120537c 100644 --- a/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go +++ b/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go @@ -87,6 +87,9 @@ func addOperationDiscoverInputSchemaMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDiscoverInputSchemaMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go b/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go index 18147c60556..a89b4d729c3 100644 --- a/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go +++ b/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go @@ -66,6 +66,9 @@ func addOperationListApplicationSnapshotsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListApplicationSnapshotsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_ListApplications.go b/service/kinesisanalyticsv2/api_op_ListApplications.go index f77194e71a1..aa30748a88c 100644 --- a/service/kinesisanalyticsv2/api_op_ListApplications.go +++ b/service/kinesisanalyticsv2/api_op_ListApplications.go @@ -69,6 +69,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_ListTagsForResource.go b/service/kinesisanalyticsv2/api_op_ListTagsForResource.go index 69661716f82..bd8655da40b 100644 --- a/service/kinesisanalyticsv2/api_op_ListTagsForResource.go +++ b/service/kinesisanalyticsv2/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_StartApplication.go b/service/kinesisanalyticsv2/api_op_StartApplication.go index dc20d77b101..d3e62a50890 100644 --- a/service/kinesisanalyticsv2/api_op_StartApplication.go +++ b/service/kinesisanalyticsv2/api_op_StartApplication.go @@ -56,6 +56,9 @@ func addOperationStartApplicationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartApplicationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_StopApplication.go b/service/kinesisanalyticsv2/api_op_StopApplication.go index dc59ea9594a..835b232a7de 100644 --- a/service/kinesisanalyticsv2/api_op_StopApplication.go +++ b/service/kinesisanalyticsv2/api_op_StopApplication.go @@ -57,6 +57,9 @@ func addOperationStopApplicationMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationStopApplicationMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_TagResource.go b/service/kinesisanalyticsv2/api_op_TagResource.go index 2ad47b6c94d..6d3e6a63f1b 100644 --- a/service/kinesisanalyticsv2/api_op_TagResource.go +++ b/service/kinesisanalyticsv2/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_UntagResource.go b/service/kinesisanalyticsv2/api_op_UntagResource.go index 78cd7f20865..63cfe6b7807 100644 --- a/service/kinesisanalyticsv2/api_op_UntagResource.go +++ b/service/kinesisanalyticsv2/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/api_op_UpdateApplication.go b/service/kinesisanalyticsv2/api_op_UpdateApplication.go index e8f9967fb6b..5f80bf0fdcb 100644 --- a/service/kinesisanalyticsv2/api_op_UpdateApplication.go +++ b/service/kinesisanalyticsv2/api_op_UpdateApplication.go @@ -80,6 +80,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisanalyticsv2/go.mod b/service/kinesisanalyticsv2/go.mod index 7609b05036d..0390a0552fa 100644 --- a/service/kinesisanalyticsv2/go.mod +++ b/service/kinesisanalyticsv2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisanalyticsv2/go.sum b/service/kinesisanalyticsv2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesisanalyticsv2/go.sum +++ b/service/kinesisanalyticsv2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideo/api_client.go b/service/kinesisvideo/api_client.go index 40807ab094d..a90501d3132 100644 --- a/service/kinesisvideo/api_client.go +++ b/service/kinesisvideo/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesisvideo/api_op_CreateSignalingChannel.go b/service/kinesisvideo/api_op_CreateSignalingChannel.go index e32d987ce35..c0503870297 100644 --- a/service/kinesisvideo/api_op_CreateSignalingChannel.go +++ b/service/kinesisvideo/api_op_CreateSignalingChannel.go @@ -65,6 +65,9 @@ func addOperationCreateSignalingChannelMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateSignalingChannelMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_CreateStream.go b/service/kinesisvideo/api_op_CreateStream.go index 6363edd9d01..6c526fa3fa8 100644 --- a/service/kinesisvideo/api_op_CreateStream.go +++ b/service/kinesisvideo/api_op_CreateStream.go @@ -91,6 +91,9 @@ func addOperationCreateStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_DeleteSignalingChannel.go b/service/kinesisvideo/api_op_DeleteSignalingChannel.go index 44a3da8c48a..c92dc27079d 100644 --- a/service/kinesisvideo/api_op_DeleteSignalingChannel.go +++ b/service/kinesisvideo/api_op_DeleteSignalingChannel.go @@ -55,6 +55,9 @@ func addOperationDeleteSignalingChannelMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteSignalingChannelMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_DeleteStream.go b/service/kinesisvideo/api_op_DeleteStream.go index 88271c96787..abc67ea3ad5 100644 --- a/service/kinesisvideo/api_op_DeleteStream.go +++ b/service/kinesisvideo/api_op_DeleteStream.go @@ -61,6 +61,9 @@ func addOperationDeleteStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_DescribeSignalingChannel.go b/service/kinesisvideo/api_op_DescribeSignalingChannel.go index d2ff21c331e..81ff4c7284f 100644 --- a/service/kinesisvideo/api_op_DescribeSignalingChannel.go +++ b/service/kinesisvideo/api_op_DescribeSignalingChannel.go @@ -57,6 +57,9 @@ func addOperationDescribeSignalingChannelMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeSignalingChannelMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_DescribeStream.go b/service/kinesisvideo/api_op_DescribeStream.go index 30727174266..edaa819c764 100644 --- a/service/kinesisvideo/api_op_DescribeStream.go +++ b/service/kinesisvideo/api_op_DescribeStream.go @@ -55,6 +55,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribeStreamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_GetDataEndpoint.go b/service/kinesisvideo/api_op_GetDataEndpoint.go index 68c85743d50..aaf9742f99b 100644 --- a/service/kinesisvideo/api_op_GetDataEndpoint.go +++ b/service/kinesisvideo/api_op_GetDataEndpoint.go @@ -67,6 +67,9 @@ func addOperationGetDataEndpointMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetDataEndpointMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go b/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go index 49f10f605f0..594a1f98249 100644 --- a/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go +++ b/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go @@ -67,6 +67,9 @@ func addOperationGetSignalingChannelEndpointMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetSignalingChannelEndpointMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_ListSignalingChannels.go b/service/kinesisvideo/api_op_ListSignalingChannels.go index c37ec903765..1c13d12d5d1 100644 --- a/service/kinesisvideo/api_op_ListSignalingChannels.go +++ b/service/kinesisvideo/api_op_ListSignalingChannels.go @@ -65,6 +65,9 @@ func addOperationListSignalingChannelsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListSignalingChannelsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_ListStreams.go b/service/kinesisvideo/api_op_ListStreams.go index 9d2b87d1ff9..8c66f9b7b3e 100644 --- a/service/kinesisvideo/api_op_ListStreams.go +++ b/service/kinesisvideo/api_op_ListStreams.go @@ -66,6 +66,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListStreamsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_ListTagsForResource.go b/service/kinesisvideo/api_op_ListTagsForResource.go index 1ccd97540a8..c342c87a0c2 100644 --- a/service/kinesisvideo/api_op_ListTagsForResource.go +++ b/service/kinesisvideo/api_op_ListTagsForResource.go @@ -63,6 +63,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_ListTagsForStream.go b/service/kinesisvideo/api_op_ListTagsForStream.go index 5a2ef3dacd7..ecbc2879701 100644 --- a/service/kinesisvideo/api_op_ListTagsForStream.go +++ b/service/kinesisvideo/api_op_ListTagsForStream.go @@ -64,6 +64,9 @@ func addOperationListTagsForStreamMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTagsForStreamMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_TagResource.go b/service/kinesisvideo/api_op_TagResource.go index 69407b85709..e8c8ccae01b 100644 --- a/service/kinesisvideo/api_op_TagResource.go +++ b/service/kinesisvideo/api_op_TagResource.go @@ -61,6 +61,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_TagStream.go b/service/kinesisvideo/api_op_TagStream.go index 39dab2bd074..a925f001614 100644 --- a/service/kinesisvideo/api_op_TagStream.go +++ b/service/kinesisvideo/api_op_TagStream.go @@ -63,6 +63,9 @@ func addOperationTagStreamMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTagStreamMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_UntagResource.go b/service/kinesisvideo/api_op_UntagResource.go index 4082f6bf6af..92df00e10d1 100644 --- a/service/kinesisvideo/api_op_UntagResource.go +++ b/service/kinesisvideo/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_UntagStream.go b/service/kinesisvideo/api_op_UntagStream.go index 929a87b7142..4fca566582e 100644 --- a/service/kinesisvideo/api_op_UntagStream.go +++ b/service/kinesisvideo/api_op_UntagStream.go @@ -56,6 +56,9 @@ func addOperationUntagStreamMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagStreamMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_UpdateDataRetention.go b/service/kinesisvideo/api_op_UpdateDataRetention.go index 94df0bec2f1..96f7d7767cd 100644 --- a/service/kinesisvideo/api_op_UpdateDataRetention.go +++ b/service/kinesisvideo/api_op_UpdateDataRetention.go @@ -85,6 +85,9 @@ func addOperationUpdateDataRetentionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationUpdateDataRetentionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_UpdateSignalingChannel.go b/service/kinesisvideo/api_op_UpdateSignalingChannel.go index 146d2daa77f..31873095ce3 100644 --- a/service/kinesisvideo/api_op_UpdateSignalingChannel.go +++ b/service/kinesisvideo/api_op_UpdateSignalingChannel.go @@ -62,6 +62,9 @@ func addOperationUpdateSignalingChannelMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateSignalingChannelMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/api_op_UpdateStream.go b/service/kinesisvideo/api_op_UpdateStream.go index 9af5c300d7d..1800c7afd93 100644 --- a/service/kinesisvideo/api_op_UpdateStream.go +++ b/service/kinesisvideo/api_op_UpdateStream.go @@ -75,6 +75,9 @@ func addOperationUpdateStreamMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateStreamMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideo/go.mod b/service/kinesisvideo/go.mod index 7ef74463354..5c0990288d6 100644 --- a/service/kinesisvideo/go.mod +++ b/service/kinesisvideo/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideo go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideo/go.sum b/service/kinesisvideo/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesisvideo/go.sum +++ b/service/kinesisvideo/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideoarchivedmedia/api_client.go b/service/kinesisvideoarchivedmedia/api_client.go index 53bc0d23d38..905458eae9c 100644 --- a/service/kinesisvideoarchivedmedia/api_client.go +++ b/service/kinesisvideoarchivedmedia/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesisvideoarchivedmedia/api_op_GetClip.go b/service/kinesisvideoarchivedmedia/api_op_GetClip.go index 8d280bc5e11..7dd7c56330a 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetClip.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetClip.go @@ -105,6 +105,9 @@ func addOperationGetClipMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationGetClipMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go b/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go index 7fef0c147f0..cb57a9667c7 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go @@ -290,6 +290,9 @@ func addOperationGetDASHStreamingSessionURLMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -329,6 +332,9 @@ func addOperationGetDASHStreamingSessionURLMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go b/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go index 88732e5d3d5..56fa0956d24 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go @@ -340,6 +340,9 @@ func addOperationGetHLSStreamingSessionURLMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -379,6 +382,9 @@ func addOperationGetHLSStreamingSessionURLMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go b/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go index f441c1796e2..00a4a9ae55c 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go @@ -120,6 +120,9 @@ func addOperationGetMediaForFragmentListMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationGetMediaForFragmentListMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideoarchivedmedia/api_op_ListFragments.go b/service/kinesisvideoarchivedmedia/api_op_ListFragments.go index 8597eb6af21..8ed166603d2 100644 --- a/service/kinesisvideoarchivedmedia/api_op_ListFragments.go +++ b/service/kinesisvideoarchivedmedia/api_op_ListFragments.go @@ -98,6 +98,9 @@ func addOperationListFragmentsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationListFragmentsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideoarchivedmedia/go.mod b/service/kinesisvideoarchivedmedia/go.mod index 57fad16344a..813c84d16c0 100644 --- a/service/kinesisvideoarchivedmedia/go.mod +++ b/service/kinesisvideoarchivedmedia/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideoarchivedmedia go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideoarchivedmedia/go.sum b/service/kinesisvideoarchivedmedia/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesisvideoarchivedmedia/go.sum +++ b/service/kinesisvideoarchivedmedia/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideomedia/api_client.go b/service/kinesisvideomedia/api_client.go index 46163261efa..c4be3448136 100644 --- a/service/kinesisvideomedia/api_client.go +++ b/service/kinesisvideomedia/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesisvideomedia/api_op_GetMedia.go b/service/kinesisvideomedia/api_op_GetMedia.go index c633cccb90b..52e455f8ebd 100644 --- a/service/kinesisvideomedia/api_op_GetMedia.go +++ b/service/kinesisvideomedia/api_op_GetMedia.go @@ -162,6 +162,9 @@ func addOperationGetMediaMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -201,6 +204,9 @@ func addOperationGetMediaMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideomedia/go.mod b/service/kinesisvideomedia/go.mod index 51c7cc53482..8573111193c 100644 --- a/service/kinesisvideomedia/go.mod +++ b/service/kinesisvideomedia/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideomedia go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideomedia/go.sum b/service/kinesisvideomedia/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesisvideomedia/go.sum +++ b/service/kinesisvideomedia/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideosignaling/api_client.go b/service/kinesisvideosignaling/api_client.go index 50e4d97d3de..c5bc225a424 100644 --- a/service/kinesisvideosignaling/api_client.go +++ b/service/kinesisvideosignaling/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kinesisvideosignaling/api_op_GetIceServerConfig.go b/service/kinesisvideosignaling/api_op_GetIceServerConfig.go index 9c185a455d4..818b55ee38b 100644 --- a/service/kinesisvideosignaling/api_op_GetIceServerConfig.go +++ b/service/kinesisvideosignaling/api_op_GetIceServerConfig.go @@ -76,6 +76,9 @@ func addOperationGetIceServerConfigMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetIceServerConfigMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go b/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go index ae054d935d0..b51dfe4d2aa 100644 --- a/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go +++ b/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go @@ -67,6 +67,9 @@ func addOperationSendAlexaOfferToMasterMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationSendAlexaOfferToMasterMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kinesisvideosignaling/go.mod b/service/kinesisvideosignaling/go.mod index b869b4269cd..15756e3c7d3 100644 --- a/service/kinesisvideosignaling/go.mod +++ b/service/kinesisvideosignaling/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideosignaling go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideosignaling/go.sum b/service/kinesisvideosignaling/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kinesisvideosignaling/go.sum +++ b/service/kinesisvideosignaling/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kms/api_client.go b/service/kms/api_client.go index de238d2f176..bef159242dd 100644 --- a/service/kms/api_client.go +++ b/service/kms/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/kms/api_op_CancelKeyDeletion.go b/service/kms/api_op_CancelKeyDeletion.go index c66bb36db92..65d69b78230 100644 --- a/service/kms/api_op_CancelKeyDeletion.go +++ b/service/kms/api_op_CancelKeyDeletion.go @@ -74,6 +74,9 @@ func addOperationCancelKeyDeletionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCancelKeyDeletionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ConnectCustomKeyStore.go b/service/kms/api_op_ConnectCustomKeyStore.go index a227f8da9e9..959b81b6353 100644 --- a/service/kms/api_op_ConnectCustomKeyStore.go +++ b/service/kms/api_op_ConnectCustomKeyStore.go @@ -82,6 +82,9 @@ func addOperationConnectCustomKeyStoreMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationConnectCustomKeyStoreMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_CreateAlias.go b/service/kms/api_op_CreateAlias.go index b9d7337ad1e..e8e90b6b30d 100644 --- a/service/kms/api_op_CreateAlias.go +++ b/service/kms/api_op_CreateAlias.go @@ -125,6 +125,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_CreateCustomKeyStore.go b/service/kms/api_op_CreateCustomKeyStore.go index de71f286c97..73c17a77560 100644 --- a/service/kms/api_op_CreateCustomKeyStore.go +++ b/service/kms/api_op_CreateCustomKeyStore.go @@ -101,6 +101,9 @@ func addOperationCreateCustomKeyStoreMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationCreateCustomKeyStoreMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_CreateGrant.go b/service/kms/api_op_CreateGrant.go index 610991dbe40..be887b0769e 100644 --- a/service/kms/api_op_CreateGrant.go +++ b/service/kms/api_op_CreateGrant.go @@ -174,6 +174,9 @@ func addOperationCreateGrantMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -216,6 +219,9 @@ func addOperationCreateGrantMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_CreateKey.go b/service/kms/api_op_CreateKey.go index d1617091463..896a42d9d64 100644 --- a/service/kms/api_op_CreateKey.go +++ b/service/kms/api_op_CreateKey.go @@ -257,6 +257,9 @@ func addOperationCreateKeyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -299,6 +302,9 @@ func addOperationCreateKeyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_Decrypt.go b/service/kms/api_op_Decrypt.go index d8856bd9ee6..396554973aa 100644 --- a/service/kms/api_op_Decrypt.go +++ b/service/kms/api_op_Decrypt.go @@ -161,6 +161,9 @@ func addOperationDecryptMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -203,6 +206,9 @@ func addOperationDecryptMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DeleteAlias.go b/service/kms/api_op_DeleteAlias.go index 5489fcaf855..36df7810743 100644 --- a/service/kms/api_op_DeleteAlias.go +++ b/service/kms/api_op_DeleteAlias.go @@ -56,6 +56,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DeleteCustomKeyStore.go b/service/kms/api_op_DeleteCustomKeyStore.go index 1dfb58723a2..48f66f787a7 100644 --- a/service/kms/api_op_DeleteCustomKeyStore.go +++ b/service/kms/api_op_DeleteCustomKeyStore.go @@ -74,6 +74,9 @@ func addOperationDeleteCustomKeyStoreMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDeleteCustomKeyStoreMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DeleteImportedKeyMaterial.go b/service/kms/api_op_DeleteImportedKeyMaterial.go index 08a0a9722c8..a6d0cb9d29e 100644 --- a/service/kms/api_op_DeleteImportedKeyMaterial.go +++ b/service/kms/api_op_DeleteImportedKeyMaterial.go @@ -71,6 +71,9 @@ func addOperationDeleteImportedKeyMaterialMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteImportedKeyMaterialMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DescribeCustomKeyStores.go b/service/kms/api_op_DescribeCustomKeyStores.go index 020d3cb7ed8..ecef16f644c 100644 --- a/service/kms/api_op_DescribeCustomKeyStores.go +++ b/service/kms/api_op_DescribeCustomKeyStores.go @@ -104,6 +104,9 @@ func addOperationDescribeCustomKeyStoresMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeCustomKeyStoresMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DescribeKey.go b/service/kms/api_op_DescribeKey.go index d8772450131..7d97e8f7ed7 100644 --- a/service/kms/api_op_DescribeKey.go +++ b/service/kms/api_op_DescribeKey.go @@ -119,6 +119,9 @@ func addOperationDescribeKeyMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationDescribeKeyMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DisableKey.go b/service/kms/api_op_DisableKey.go index 00b68e28c41..11f46e77cbd 100644 --- a/service/kms/api_op_DisableKey.go +++ b/service/kms/api_op_DisableKey.go @@ -69,6 +69,9 @@ func addOperationDisableKeyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDisableKeyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DisableKeyRotation.go b/service/kms/api_op_DisableKeyRotation.go index 59a7bcc4d8d..0e4b5af31c6 100644 --- a/service/kms/api_op_DisableKeyRotation.go +++ b/service/kms/api_op_DisableKeyRotation.go @@ -74,6 +74,9 @@ func addOperationDisableKeyRotationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDisableKeyRotationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_DisconnectCustomKeyStore.go b/service/kms/api_op_DisconnectCustomKeyStore.go index 2b0570542c3..17d07161306 100644 --- a/service/kms/api_op_DisconnectCustomKeyStore.go +++ b/service/kms/api_op_DisconnectCustomKeyStore.go @@ -66,6 +66,9 @@ func addOperationDisconnectCustomKeyStoreMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDisconnectCustomKeyStoreMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_EnableKey.go b/service/kms/api_op_EnableKey.go index bf5baeae02e..bb5b4147e29 100644 --- a/service/kms/api_op_EnableKey.go +++ b/service/kms/api_op_EnableKey.go @@ -65,6 +65,9 @@ func addOperationEnableKeyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationEnableKeyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_EnableKeyRotation.go b/service/kms/api_op_EnableKeyRotation.go index 5f7f7dac357..f4da8df928b 100644 --- a/service/kms/api_op_EnableKeyRotation.go +++ b/service/kms/api_op_EnableKeyRotation.go @@ -70,6 +70,9 @@ func addOperationEnableKeyRotationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationEnableKeyRotationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_Encrypt.go b/service/kms/api_op_Encrypt.go index cfb2989c1fd..d2c2c3f5493 100644 --- a/service/kms/api_op_Encrypt.go +++ b/service/kms/api_op_Encrypt.go @@ -184,6 +184,9 @@ func addOperationEncryptMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -226,6 +229,9 @@ func addOperationEncryptMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GenerateDataKey.go b/service/kms/api_op_GenerateDataKey.go index b9f9f24ce41..55ff7a53e7c 100644 --- a/service/kms/api_op_GenerateDataKey.go +++ b/service/kms/api_op_GenerateDataKey.go @@ -167,6 +167,9 @@ func addOperationGenerateDataKeyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -209,6 +212,9 @@ func addOperationGenerateDataKeyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GenerateDataKeyPair.go b/service/kms/api_op_GenerateDataKeyPair.go index 7a88c1af637..b56f7c0c3ef 100644 --- a/service/kms/api_op_GenerateDataKeyPair.go +++ b/service/kms/api_op_GenerateDataKeyPair.go @@ -145,6 +145,9 @@ func addOperationGenerateDataKeyPairMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -187,6 +190,9 @@ func addOperationGenerateDataKeyPairMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go b/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go index b5aec51d05b..90dc293b06d 100644 --- a/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go +++ b/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go @@ -134,6 +134,9 @@ func addOperationGenerateDataKeyPairWithoutPlaintextMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationGenerateDataKeyPairWithoutPlaintextMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go b/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go index 94ffd671a50..340ae039c39 100644 --- a/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go +++ b/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go @@ -136,6 +136,9 @@ func addOperationGenerateDataKeyWithoutPlaintextMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationGenerateDataKeyWithoutPlaintextMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GenerateRandom.go b/service/kms/api_op_GenerateRandom.go index 36f10eede81..8355807c926 100644 --- a/service/kms/api_op_GenerateRandom.go +++ b/service/kms/api_op_GenerateRandom.go @@ -63,6 +63,9 @@ func addOperationGenerateRandomMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGenerateRandomMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GetKeyPolicy.go b/service/kms/api_op_GetKeyPolicy.go index 08469651a06..af48cb80050 100644 --- a/service/kms/api_op_GetKeyPolicy.go +++ b/service/kms/api_op_GetKeyPolicy.go @@ -69,6 +69,9 @@ func addOperationGetKeyPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetKeyPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GetKeyRotationStatus.go b/service/kms/api_op_GetKeyRotationStatus.go index 28dbc93bfa3..228bfc0ac44 100644 --- a/service/kms/api_op_GetKeyRotationStatus.go +++ b/service/kms/api_op_GetKeyRotationStatus.go @@ -86,6 +86,9 @@ func addOperationGetKeyRotationStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetKeyRotationStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GetParametersForImport.go b/service/kms/api_op_GetParametersForImport.go index f63eb09cafd..616bb177d92 100644 --- a/service/kms/api_op_GetParametersForImport.go +++ b/service/kms/api_op_GetParametersForImport.go @@ -114,6 +114,9 @@ func addOperationGetParametersForImportMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationGetParametersForImportMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_GetPublicKey.go b/service/kms/api_op_GetPublicKey.go index e29776a3d8b..01a3c598ea0 100644 --- a/service/kms/api_op_GetPublicKey.go +++ b/service/kms/api_op_GetPublicKey.go @@ -149,6 +149,9 @@ func addOperationGetPublicKeyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationGetPublicKeyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ImportKeyMaterial.go b/service/kms/api_op_ImportKeyMaterial.go index fae48a4e8b1..4110ef475d3 100644 --- a/service/kms/api_op_ImportKeyMaterial.go +++ b/service/kms/api_op_ImportKeyMaterial.go @@ -133,6 +133,9 @@ func addOperationImportKeyMaterialMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationImportKeyMaterialMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ListAliases.go b/service/kms/api_op_ListAliases.go index 6de3d7dc3a6..03998f7d869 100644 --- a/service/kms/api_op_ListAliases.go +++ b/service/kms/api_op_ListAliases.go @@ -89,6 +89,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ListGrants.go b/service/kms/api_op_ListGrants.go index 74691c0935f..49722367671 100644 --- a/service/kms/api_op_ListGrants.go +++ b/service/kms/api_op_ListGrants.go @@ -93,6 +93,9 @@ func addOperationListGrantsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationListGrantsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ListKeyPolicies.go b/service/kms/api_op_ListKeyPolicies.go index b8788164863..d34db82b00d 100644 --- a/service/kms/api_op_ListKeyPolicies.go +++ b/service/kms/api_op_ListKeyPolicies.go @@ -87,6 +87,9 @@ func addOperationListKeyPoliciesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListKeyPoliciesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ListKeys.go b/service/kms/api_op_ListKeys.go index c990ec2e47f..309c9883eee 100644 --- a/service/kms/api_op_ListKeys.go +++ b/service/kms/api_op_ListKeys.go @@ -71,6 +71,9 @@ func addOperationListKeysMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListKeysMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ListResourceTags.go b/service/kms/api_op_ListResourceTags.go index 5d16e312374..926b1e45142 100644 --- a/service/kms/api_op_ListResourceTags.go +++ b/service/kms/api_op_ListResourceTags.go @@ -88,6 +88,9 @@ func addOperationListResourceTagsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListResourceTagsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ListRetirableGrants.go b/service/kms/api_op_ListRetirableGrants.go index 03561b8d181..5ebfaf3f08f 100644 --- a/service/kms/api_op_ListRetirableGrants.go +++ b/service/kms/api_op_ListRetirableGrants.go @@ -84,6 +84,9 @@ func addOperationListRetirableGrantsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListRetirableGrantsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_PutKeyPolicy.go b/service/kms/api_op_PutKeyPolicy.go index 4c7be56c813..884ac9d381e 100644 --- a/service/kms/api_op_PutKeyPolicy.go +++ b/service/kms/api_op_PutKeyPolicy.go @@ -106,6 +106,9 @@ func addOperationPutKeyPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationPutKeyPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ReEncrypt.go b/service/kms/api_op_ReEncrypt.go index 57ce2335c6e..25bfb96027b 100644 --- a/service/kms/api_op_ReEncrypt.go +++ b/service/kms/api_op_ReEncrypt.go @@ -231,6 +231,9 @@ func addOperationReEncryptMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -273,6 +276,9 @@ func addOperationReEncryptMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_RetireGrant.go b/service/kms/api_op_RetireGrant.go index 7458f72d6fc..5cbab659487 100644 --- a/service/kms/api_op_RetireGrant.go +++ b/service/kms/api_op_RetireGrant.go @@ -75,6 +75,9 @@ func addOperationRetireGrantMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationRetireGrantMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_RevokeGrant.go b/service/kms/api_op_RevokeGrant.go index 34e4add563f..9be695ded0b 100644 --- a/service/kms/api_op_RevokeGrant.go +++ b/service/kms/api_op_RevokeGrant.go @@ -67,6 +67,9 @@ func addOperationRevokeGrantMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRevokeGrantMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_ScheduleKeyDeletion.go b/service/kms/api_op_ScheduleKeyDeletion.go index f30c17ad714..4a89b878143 100644 --- a/service/kms/api_op_ScheduleKeyDeletion.go +++ b/service/kms/api_op_ScheduleKeyDeletion.go @@ -99,6 +99,9 @@ func addOperationScheduleKeyDeletionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationScheduleKeyDeletionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_Sign.go b/service/kms/api_op_Sign.go index d32f4690b60..ac4ea053252 100644 --- a/service/kms/api_op_Sign.go +++ b/service/kms/api_op_Sign.go @@ -156,6 +156,9 @@ func addOperationSignMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -198,6 +201,9 @@ func addOperationSignMiddlewares(stack *middleware.Stack, options Options) (err if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_TagResource.go b/service/kms/api_op_TagResource.go index 60235c4936d..5f6a70c48c8 100644 --- a/service/kms/api_op_TagResource.go +++ b/service/kms/api_op_TagResource.go @@ -76,6 +76,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_UntagResource.go b/service/kms/api_op_UntagResource.go index 87396b0fea5..8c4344d9f56 100644 --- a/service/kms/api_op_UntagResource.go +++ b/service/kms/api_op_UntagResource.go @@ -69,6 +69,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_UpdateAlias.go b/service/kms/api_op_UpdateAlias.go index 680980cd6f3..358b614b52e 100644 --- a/service/kms/api_op_UpdateAlias.go +++ b/service/kms/api_op_UpdateAlias.go @@ -87,6 +87,9 @@ func addOperationUpdateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationUpdateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_UpdateCustomKeyStore.go b/service/kms/api_op_UpdateCustomKeyStore.go index 85325faf678..6ba9c8e7fa9 100644 --- a/service/kms/api_op_UpdateCustomKeyStore.go +++ b/service/kms/api_op_UpdateCustomKeyStore.go @@ -106,6 +106,9 @@ func addOperationUpdateCustomKeyStoreMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationUpdateCustomKeyStoreMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_UpdateKeyDescription.go b/service/kms/api_op_UpdateKeyDescription.go index d97c817b720..95b6b6c466b 100644 --- a/service/kms/api_op_UpdateKeyDescription.go +++ b/service/kms/api_op_UpdateKeyDescription.go @@ -69,6 +69,9 @@ func addOperationUpdateKeyDescriptionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateKeyDescriptionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/api_op_Verify.go b/service/kms/api_op_Verify.go index 940685daf07..f4662d9e4aa 100644 --- a/service/kms/api_op_Verify.go +++ b/service/kms/api_op_Verify.go @@ -140,6 +140,9 @@ func addOperationVerifyMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationVerifyMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/kms/go.mod b/service/kms/go.mod index df82682534c..7a5a21c71d2 100644 --- a/service/kms/go.mod +++ b/service/kms/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/kms go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kms/go.sum b/service/kms/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/kms/go.sum +++ b/service/kms/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lakeformation/api_client.go b/service/lakeformation/api_client.go index 1ae57818c53..57f5bfa265b 100644 --- a/service/lakeformation/api_client.go +++ b/service/lakeformation/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/lakeformation/api_op_BatchGrantPermissions.go b/service/lakeformation/api_op_BatchGrantPermissions.go index 7a98334e652..53c2e0b3a09 100644 --- a/service/lakeformation/api_op_BatchGrantPermissions.go +++ b/service/lakeformation/api_op_BatchGrantPermissions.go @@ -60,6 +60,9 @@ func addOperationBatchGrantPermissionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchGrantPermissionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_BatchRevokePermissions.go b/service/lakeformation/api_op_BatchRevokePermissions.go index 61be5704504..a7fe81cda1c 100644 --- a/service/lakeformation/api_op_BatchRevokePermissions.go +++ b/service/lakeformation/api_op_BatchRevokePermissions.go @@ -60,6 +60,9 @@ func addOperationBatchRevokePermissionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationBatchRevokePermissionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_DeregisterResource.go b/service/lakeformation/api_op_DeregisterResource.go index eec72bf40c3..7a3897a1223 100644 --- a/service/lakeformation/api_op_DeregisterResource.go +++ b/service/lakeformation/api_op_DeregisterResource.go @@ -50,6 +50,9 @@ func addOperationDeregisterResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeregisterResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_DescribeResource.go b/service/lakeformation/api_op_DescribeResource.go index 722ffce5ea2..840b6878faf 100644 --- a/service/lakeformation/api_op_DescribeResource.go +++ b/service/lakeformation/api_op_DescribeResource.go @@ -54,6 +54,9 @@ func addOperationDescribeResourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeResourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_GetDataLakeSettings.go b/service/lakeformation/api_op_GetDataLakeSettings.go index 39e194e49d7..57638836769 100644 --- a/service/lakeformation/api_op_GetDataLakeSettings.go +++ b/service/lakeformation/api_op_GetDataLakeSettings.go @@ -56,6 +56,9 @@ func addOperationGetDataLakeSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetDataLakeSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_GetEffectivePermissionsForPath.go b/service/lakeformation/api_op_GetEffectivePermissionsForPath.go index f9951de6899..e7a4a76c02e 100644 --- a/service/lakeformation/api_op_GetEffectivePermissionsForPath.go +++ b/service/lakeformation/api_op_GetEffectivePermissionsForPath.go @@ -72,6 +72,9 @@ func addOperationGetEffectivePermissionsForPathMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetEffectivePermissionsForPathMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_GrantPermissions.go b/service/lakeformation/api_op_GrantPermissions.go index 75749718b50..a352417be78 100644 --- a/service/lakeformation/api_op_GrantPermissions.go +++ b/service/lakeformation/api_op_GrantPermissions.go @@ -82,6 +82,9 @@ func addOperationGrantPermissionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGrantPermissionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_ListPermissions.go b/service/lakeformation/api_op_ListPermissions.go index 3be083731a9..01242943211 100644 --- a/service/lakeformation/api_op_ListPermissions.go +++ b/service/lakeformation/api_op_ListPermissions.go @@ -82,6 +82,9 @@ func addOperationListPermissionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListPermissionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_ListResources.go b/service/lakeformation/api_op_ListResources.go index 9a6d318ee21..3ca9ae71015 100644 --- a/service/lakeformation/api_op_ListResources.go +++ b/service/lakeformation/api_op_ListResources.go @@ -61,6 +61,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_PutDataLakeSettings.go b/service/lakeformation/api_op_PutDataLakeSettings.go index 981de49732b..9f941159559 100644 --- a/service/lakeformation/api_op_PutDataLakeSettings.go +++ b/service/lakeformation/api_op_PutDataLakeSettings.go @@ -62,6 +62,9 @@ func addOperationPutDataLakeSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationPutDataLakeSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_RegisterResource.go b/service/lakeformation/api_op_RegisterResource.go index e9d7cb32e14..7ef70ec4106 100644 --- a/service/lakeformation/api_op_RegisterResource.go +++ b/service/lakeformation/api_op_RegisterResource.go @@ -70,6 +70,9 @@ func addOperationRegisterResourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationRegisterResourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_RevokePermissions.go b/service/lakeformation/api_op_RevokePermissions.go index 4fceecfd297..19cbb850249 100644 --- a/service/lakeformation/api_op_RevokePermissions.go +++ b/service/lakeformation/api_op_RevokePermissions.go @@ -72,6 +72,9 @@ func addOperationRevokePermissionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationRevokePermissionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/api_op_UpdateResource.go b/service/lakeformation/api_op_UpdateResource.go index e9fcdc3188c..d507a73020a 100644 --- a/service/lakeformation/api_op_UpdateResource.go +++ b/service/lakeformation/api_op_UpdateResource.go @@ -54,6 +54,9 @@ func addOperationUpdateResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateResourceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lakeformation/go.mod b/service/lakeformation/go.mod index b9bbd5eea2b..3bd9029a6e4 100644 --- a/service/lakeformation/go.mod +++ b/service/lakeformation/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/lakeformation go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lakeformation/go.sum b/service/lakeformation/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/lakeformation/go.sum +++ b/service/lakeformation/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lambda/api_client.go b/service/lambda/api_client.go index 2977e14ddb4..21d0a38e4e9 100644 --- a/service/lambda/api_client.go +++ b/service/lambda/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/lambda/api_op_AddLayerVersionPermission.go b/service/lambda/api_op_AddLayerVersionPermission.go index 3c125e514bc..a12f9f73c7b 100644 --- a/service/lambda/api_op_AddLayerVersionPermission.go +++ b/service/lambda/api_op_AddLayerVersionPermission.go @@ -90,6 +90,9 @@ func addOperationAddLayerVersionPermissionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationAddLayerVersionPermissionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_AddPermission.go b/service/lambda/api_op_AddPermission.go index f59fcb85428..6282cf58be3 100644 --- a/service/lambda/api_op_AddPermission.go +++ b/service/lambda/api_op_AddPermission.go @@ -118,6 +118,9 @@ func addOperationAddPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationAddPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_CreateAlias.go b/service/lambda/api_op_CreateAlias.go index 2d551d864f2..129942710df 100644 --- a/service/lambda/api_op_CreateAlias.go +++ b/service/lambda/api_op_CreateAlias.go @@ -108,6 +108,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_CreateEventSourceMapping.go b/service/lambda/api_op_CreateEventSourceMapping.go index a4638607fca..4956e1e056f 100644 --- a/service/lambda/api_op_CreateEventSourceMapping.go +++ b/service/lambda/api_op_CreateEventSourceMapping.go @@ -226,6 +226,9 @@ func addOperationCreateEventSourceMappingMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -268,6 +271,9 @@ func addOperationCreateEventSourceMappingMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_CreateFunction.go b/service/lambda/api_op_CreateFunction.go index bdb53a3fb60..8e418f3bf78 100644 --- a/service/lambda/api_op_CreateFunction.go +++ b/service/lambda/api_op_CreateFunction.go @@ -260,6 +260,9 @@ func addOperationCreateFunctionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -302,6 +305,9 @@ func addOperationCreateFunctionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteAlias.go b/service/lambda/api_op_DeleteAlias.go index cc2d0566425..3abc30b0801 100644 --- a/service/lambda/api_op_DeleteAlias.go +++ b/service/lambda/api_op_DeleteAlias.go @@ -66,6 +66,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteEventSourceMapping.go b/service/lambda/api_op_DeleteEventSourceMapping.go index 72a4c5d39ed..d4902e1742d 100644 --- a/service/lambda/api_op_DeleteEventSourceMapping.go +++ b/service/lambda/api_op_DeleteEventSourceMapping.go @@ -108,6 +108,9 @@ func addOperationDeleteEventSourceMappingMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDeleteEventSourceMappingMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteFunction.go b/service/lambda/api_op_DeleteFunction.go index 927ddd0ddfe..c9208479c23 100644 --- a/service/lambda/api_op_DeleteFunction.go +++ b/service/lambda/api_op_DeleteFunction.go @@ -70,6 +70,9 @@ func addOperationDeleteFunctionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteFunctionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteFunctionConcurrency.go b/service/lambda/api_op_DeleteFunctionConcurrency.go index 5c150f01d45..b6015f18c25 100644 --- a/service/lambda/api_op_DeleteFunctionConcurrency.go +++ b/service/lambda/api_op_DeleteFunctionConcurrency.go @@ -60,6 +60,9 @@ func addOperationDeleteFunctionConcurrencyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteFunctionConcurrencyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go b/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go index 9aa93b17605..747aa1afdf3 100644 --- a/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go @@ -66,6 +66,9 @@ func addOperationDeleteFunctionEventInvokeConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteFunctionEventInvokeConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteLayerVersion.go b/service/lambda/api_op_DeleteLayerVersion.go index 02d942cd708..54258b9abd3 100644 --- a/service/lambda/api_op_DeleteLayerVersion.go +++ b/service/lambda/api_op_DeleteLayerVersion.go @@ -57,6 +57,9 @@ func addOperationDeleteLayerVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteLayerVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go b/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go index 3d425606a1a..4c64f0c5ac8 100644 --- a/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go +++ b/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go @@ -65,6 +65,9 @@ func addOperationDeleteProvisionedConcurrencyConfigMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteProvisionedConcurrencyConfigMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetAccountSettings.go b/service/lambda/api_op_GetAccountSettings.go index bcb443fcaf7..9f722a238b1 100644 --- a/service/lambda/api_op_GetAccountSettings.go +++ b/service/lambda/api_op_GetAccountSettings.go @@ -53,6 +53,9 @@ func addOperationGetAccountSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetAccountSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetAlias.go b/service/lambda/api_op_GetAlias.go index bc0d4042a55..32b45d68dcb 100644 --- a/service/lambda/api_op_GetAlias.go +++ b/service/lambda/api_op_GetAlias.go @@ -90,6 +90,9 @@ func addOperationGetAliasMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetAliasMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetEventSourceMapping.go b/service/lambda/api_op_GetEventSourceMapping.go index ce5c6175dc9..065e6911d3c 100644 --- a/service/lambda/api_op_GetEventSourceMapping.go +++ b/service/lambda/api_op_GetEventSourceMapping.go @@ -105,6 +105,9 @@ func addOperationGetEventSourceMappingMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationGetEventSourceMappingMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetFunction.go b/service/lambda/api_op_GetFunction.go index b2bbf1d7d80..7b6fc3547c2 100644 --- a/service/lambda/api_op_GetFunction.go +++ b/service/lambda/api_op_GetFunction.go @@ -82,6 +82,9 @@ func addOperationGetFunctionMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetFunctionMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetFunctionConcurrency.go b/service/lambda/api_op_GetFunctionConcurrency.go index 30383e4f25d..e109c91ac11 100644 --- a/service/lambda/api_op_GetFunctionConcurrency.go +++ b/service/lambda/api_op_GetFunctionConcurrency.go @@ -65,6 +65,9 @@ func addOperationGetFunctionConcurrencyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetFunctionConcurrencyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetFunctionConfiguration.go b/service/lambda/api_op_GetFunctionConfiguration.go index 150b5e79896..908c0a016be 100644 --- a/service/lambda/api_op_GetFunctionConfiguration.go +++ b/service/lambda/api_op_GetFunctionConfiguration.go @@ -159,6 +159,9 @@ func addOperationGetFunctionConfigurationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -201,6 +204,9 @@ func addOperationGetFunctionConfigurationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetFunctionEventInvokeConfig.go b/service/lambda/api_op_GetFunctionEventInvokeConfig.go index 554c5ce2c09..61894ae951d 100644 --- a/service/lambda/api_op_GetFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_GetFunctionEventInvokeConfig.go @@ -95,6 +95,9 @@ func addOperationGetFunctionEventInvokeConfigMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationGetFunctionEventInvokeConfigMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetLayerVersion.go b/service/lambda/api_op_GetLayerVersion.go index 51998e2f3cc..ee42875197d 100644 --- a/service/lambda/api_op_GetLayerVersion.go +++ b/service/lambda/api_op_GetLayerVersion.go @@ -82,6 +82,9 @@ func addOperationGetLayerVersionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetLayerVersionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetLayerVersionByArn.go b/service/lambda/api_op_GetLayerVersionByArn.go index 4da5b1016b5..d9ee85156ab 100644 --- a/service/lambda/api_op_GetLayerVersionByArn.go +++ b/service/lambda/api_op_GetLayerVersionByArn.go @@ -77,6 +77,9 @@ func addOperationGetLayerVersionByArnMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetLayerVersionByArnMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetLayerVersionPolicy.go b/service/lambda/api_op_GetLayerVersionPolicy.go index a66f2ae0f44..94b98fdc229 100644 --- a/service/lambda/api_op_GetLayerVersionPolicy.go +++ b/service/lambda/api_op_GetLayerVersionPolicy.go @@ -62,6 +62,9 @@ func addOperationGetLayerVersionPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetLayerVersionPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetPolicy.go b/service/lambda/api_op_GetPolicy.go index 6a2f3b8740f..5d0faf0f6cf 100644 --- a/service/lambda/api_op_GetPolicy.go +++ b/service/lambda/api_op_GetPolicy.go @@ -73,6 +73,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetPolicyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_GetProvisionedConcurrencyConfig.go b/service/lambda/api_op_GetProvisionedConcurrencyConfig.go index 10c2188228a..5edda41d989 100644 --- a/service/lambda/api_op_GetProvisionedConcurrencyConfig.go +++ b/service/lambda/api_op_GetProvisionedConcurrencyConfig.go @@ -88,6 +88,9 @@ func addOperationGetProvisionedConcurrencyConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetProvisionedConcurrencyConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_Invoke.go b/service/lambda/api_op_Invoke.go index a32b83a9d8d..2a081e4242f 100644 --- a/service/lambda/api_op_Invoke.go +++ b/service/lambda/api_op_Invoke.go @@ -146,6 +146,9 @@ func addOperationInvokeMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationInvokeMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_InvokeAsync.go b/service/lambda/api_op_InvokeAsync.go index c177e19cbc4..206b53a0281 100644 --- a/service/lambda/api_op_InvokeAsync.go +++ b/service/lambda/api_op_InvokeAsync.go @@ -73,6 +73,9 @@ func addOperationInvokeAsyncMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationInvokeAsyncMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListAliases.go b/service/lambda/api_op_ListAliases.go index 2813b7b2f54..ad1e3a37d13 100644 --- a/service/lambda/api_op_ListAliases.go +++ b/service/lambda/api_op_ListAliases.go @@ -80,6 +80,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListEventSourceMappings.go b/service/lambda/api_op_ListEventSourceMappings.go index e405e8665bd..e9e356ccef3 100644 --- a/service/lambda/api_op_ListEventSourceMappings.go +++ b/service/lambda/api_op_ListEventSourceMappings.go @@ -92,6 +92,9 @@ func addOperationListEventSourceMappingsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListEventSourceMappingsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListFunctionEventInvokeConfigs.go b/service/lambda/api_op_ListFunctionEventInvokeConfigs.go index 6528aa39e70..85226c3a481 100644 --- a/service/lambda/api_op_ListFunctionEventInvokeConfigs.go +++ b/service/lambda/api_op_ListFunctionEventInvokeConfigs.go @@ -77,6 +77,9 @@ func addOperationListFunctionEventInvokeConfigsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListFunctionEventInvokeConfigsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListFunctions.go b/service/lambda/api_op_ListFunctions.go index 0c15d945d4a..a32f1759f09 100644 --- a/service/lambda/api_op_ListFunctions.go +++ b/service/lambda/api_op_ListFunctions.go @@ -71,6 +71,9 @@ func addOperationListFunctionsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListFunctionsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListLayerVersions.go b/service/lambda/api_op_ListLayerVersions.go index e4213d0315f..194abbf5d25 100644 --- a/service/lambda/api_op_ListLayerVersions.go +++ b/service/lambda/api_op_ListLayerVersions.go @@ -69,6 +69,9 @@ func addOperationListLayerVersionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListLayerVersionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListLayers.go b/service/lambda/api_op_ListLayers.go index e403cff92cc..32134e4c6e3 100644 --- a/service/lambda/api_op_ListLayers.go +++ b/service/lambda/api_op_ListLayers.go @@ -64,6 +64,9 @@ func addOperationListLayersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListLayersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go b/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go index aa541d07cd6..3b1fe542df7 100644 --- a/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go +++ b/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go @@ -75,6 +75,9 @@ func addOperationListProvisionedConcurrencyConfigsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListProvisionedConcurrencyConfigsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListTags.go b/service/lambda/api_op_ListTags.go index 058b4f17be2..a2a20346d35 100644 --- a/service/lambda/api_op_ListTags.go +++ b/service/lambda/api_op_ListTags.go @@ -54,6 +54,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_ListVersionsByFunction.go b/service/lambda/api_op_ListVersionsByFunction.go index bcb7046a135..4c4f1b51d03 100644 --- a/service/lambda/api_op_ListVersionsByFunction.go +++ b/service/lambda/api_op_ListVersionsByFunction.go @@ -78,6 +78,9 @@ func addOperationListVersionsByFunctionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListVersionsByFunctionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_PublishLayerVersion.go b/service/lambda/api_op_PublishLayerVersion.go index c703862d100..6d8fe28d049 100644 --- a/service/lambda/api_op_PublishLayerVersion.go +++ b/service/lambda/api_op_PublishLayerVersion.go @@ -104,6 +104,9 @@ func addOperationPublishLayerVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationPublishLayerVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_PublishVersion.go b/service/lambda/api_op_PublishVersion.go index 95e331cde44..762d4cfa53d 100644 --- a/service/lambda/api_op_PublishVersion.go +++ b/service/lambda/api_op_PublishVersion.go @@ -173,6 +173,9 @@ func addOperationPublishVersionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -215,6 +218,9 @@ func addOperationPublishVersionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_PutFunctionConcurrency.go b/service/lambda/api_op_PutFunctionConcurrency.go index 5585641bfa5..bdea87b2199 100644 --- a/service/lambda/api_op_PutFunctionConcurrency.go +++ b/service/lambda/api_op_PutFunctionConcurrency.go @@ -81,6 +81,9 @@ func addOperationPutFunctionConcurrencyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationPutFunctionConcurrencyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_PutFunctionEventInvokeConfig.go b/service/lambda/api_op_PutFunctionEventInvokeConfig.go index 5680b115e4d..6a456235e73 100644 --- a/service/lambda/api_op_PutFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_PutFunctionEventInvokeConfig.go @@ -128,6 +128,9 @@ func addOperationPutFunctionEventInvokeConfigMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationPutFunctionEventInvokeConfigMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_PutProvisionedConcurrencyConfig.go b/service/lambda/api_op_PutProvisionedConcurrencyConfig.go index 7ae6bd8e291..5b11ff7c707 100644 --- a/service/lambda/api_op_PutProvisionedConcurrencyConfig.go +++ b/service/lambda/api_op_PutProvisionedConcurrencyConfig.go @@ -92,6 +92,9 @@ func addOperationPutProvisionedConcurrencyConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationPutProvisionedConcurrencyConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_RemoveLayerVersionPermission.go b/service/lambda/api_op_RemoveLayerVersionPermission.go index 5fd423ce52a..e10b2fa4e73 100644 --- a/service/lambda/api_op_RemoveLayerVersionPermission.go +++ b/service/lambda/api_op_RemoveLayerVersionPermission.go @@ -64,6 +64,9 @@ func addOperationRemoveLayerVersionPermissionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationRemoveLayerVersionPermissionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_RemovePermission.go b/service/lambda/api_op_RemovePermission.go index 9878f4d114c..66404bbbf17 100644 --- a/service/lambda/api_op_RemovePermission.go +++ b/service/lambda/api_op_RemovePermission.go @@ -75,6 +75,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_TagResource.go b/service/lambda/api_op_TagResource.go index ff961339894..99d32f02689 100644 --- a/service/lambda/api_op_TagResource.go +++ b/service/lambda/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_UntagResource.go b/service/lambda/api_op_UntagResource.go index da63dbeb20a..1d8ef31fa0b 100644 --- a/service/lambda/api_op_UntagResource.go +++ b/service/lambda/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_UpdateAlias.go b/service/lambda/api_op_UpdateAlias.go index 7cf261a2d84..ce889f5c0d7 100644 --- a/service/lambda/api_op_UpdateAlias.go +++ b/service/lambda/api_op_UpdateAlias.go @@ -105,6 +105,9 @@ func addOperationUpdateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationUpdateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_UpdateEventSourceMapping.go b/service/lambda/api_op_UpdateEventSourceMapping.go index 3be4943ab7d..f55f847ffc3 100644 --- a/service/lambda/api_op_UpdateEventSourceMapping.go +++ b/service/lambda/api_op_UpdateEventSourceMapping.go @@ -184,6 +184,9 @@ func addOperationUpdateEventSourceMappingMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -226,6 +229,9 @@ func addOperationUpdateEventSourceMappingMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_UpdateFunctionCode.go b/service/lambda/api_op_UpdateFunctionCode.go index 345e14b7918..dfd0b4f3e99 100644 --- a/service/lambda/api_op_UpdateFunctionCode.go +++ b/service/lambda/api_op_UpdateFunctionCode.go @@ -180,6 +180,9 @@ func addOperationUpdateFunctionCodeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -222,6 +225,9 @@ func addOperationUpdateFunctionCodeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_UpdateFunctionConfiguration.go b/service/lambda/api_op_UpdateFunctionConfiguration.go index a69b3064068..74cf16fd45b 100644 --- a/service/lambda/api_op_UpdateFunctionConfiguration.go +++ b/service/lambda/api_op_UpdateFunctionConfiguration.go @@ -229,6 +229,9 @@ func addOperationUpdateFunctionConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -271,6 +274,9 @@ func addOperationUpdateFunctionConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go b/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go index 5297ae3fe04..78f3653e9f1 100644 --- a/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go @@ -115,6 +115,9 @@ func addOperationUpdateFunctionEventInvokeConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateFunctionEventInvokeConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lambda/go.mod b/service/lambda/go.mod index 9cc936fbd7e..97f9353e3fd 100644 --- a/service/lambda/go.mod +++ b/service/lambda/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/lambda go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lambda/go.sum b/service/lambda/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/lambda/go.sum +++ b/service/lambda/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lexmodelbuildingservice/api_client.go b/service/lexmodelbuildingservice/api_client.go index 458033e66f0..ac1c4ddb81d 100644 --- a/service/lexmodelbuildingservice/api_client.go +++ b/service/lexmodelbuildingservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/lexmodelbuildingservice/api_op_CreateBotVersion.go b/service/lexmodelbuildingservice/api_op_CreateBotVersion.go index 425b94ef419..e81e3430ac1 100644 --- a/service/lexmodelbuildingservice/api_op_CreateBotVersion.go +++ b/service/lexmodelbuildingservice/api_op_CreateBotVersion.go @@ -147,6 +147,9 @@ func addOperationCreateBotVersionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -189,6 +192,9 @@ func addOperationCreateBotVersionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go b/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go index d481938e0b2..636399dc5ff 100644 --- a/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go +++ b/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go @@ -121,6 +121,9 @@ func addOperationCreateIntentVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationCreateIntentVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go b/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go index 31069cda2ea..a0121a0254b 100644 --- a/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go +++ b/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go @@ -100,6 +100,9 @@ func addOperationCreateSlotTypeVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationCreateSlotTypeVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteBot.go b/service/lexmodelbuildingservice/api_op_DeleteBot.go index 58940ae6a9f..0f0fa2141ac 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBot.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBot.go @@ -59,6 +59,9 @@ func addOperationDeleteBotMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteBotMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go b/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go index 64d36acc7b8..5d6f48fba23 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go @@ -59,6 +59,9 @@ func addOperationDeleteBotAliasMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteBotAliasMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go b/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go index 77c831f7285..209a0323c37 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go @@ -60,6 +60,9 @@ func addOperationDeleteBotChannelAssociationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteBotChannelAssociationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go b/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go index 8d831716994..54756244ba1 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go @@ -56,6 +56,9 @@ func addOperationDeleteBotVersionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteBotVersionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteIntent.go b/service/lexmodelbuildingservice/api_op_DeleteIntent.go index 481e5998026..9e8460898c5 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteIntent.go +++ b/service/lexmodelbuildingservice/api_op_DeleteIntent.go @@ -57,6 +57,9 @@ func addOperationDeleteIntentMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteIntentMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go b/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go index 5e9d9c12ba6..7bff2d19247 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go +++ b/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go @@ -56,6 +56,9 @@ func addOperationDeleteIntentVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteIntentVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteSlotType.go b/service/lexmodelbuildingservice/api_op_DeleteSlotType.go index 6af5d8ed039..0955f028276 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteSlotType.go +++ b/service/lexmodelbuildingservice/api_op_DeleteSlotType.go @@ -58,6 +58,9 @@ func addOperationDeleteSlotTypeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteSlotTypeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go b/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go index b00553645fd..a9c67fe6dce 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go +++ b/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go @@ -56,6 +56,9 @@ func addOperationDeleteSlotTypeVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteSlotTypeVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_DeleteUtterances.go b/service/lexmodelbuildingservice/api_op_DeleteUtterances.go index f0ad9e89c83..37835458a13 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteUtterances.go +++ b/service/lexmodelbuildingservice/api_op_DeleteUtterances.go @@ -65,6 +65,9 @@ func addOperationDeleteUtterancesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteUtterancesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBot.go b/service/lexmodelbuildingservice/api_op_GetBot.go index 2592e7797b3..9bff3790e92 100644 --- a/service/lexmodelbuildingservice/api_op_GetBot.go +++ b/service/lexmodelbuildingservice/api_op_GetBot.go @@ -153,6 +153,9 @@ func addOperationGetBotMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -195,6 +198,9 @@ func addOperationGetBotMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBotAlias.go b/service/lexmodelbuildingservice/api_op_GetBotAlias.go index 001674096f7..2edb726679b 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotAlias.go +++ b/service/lexmodelbuildingservice/api_op_GetBotAlias.go @@ -83,6 +83,9 @@ func addOperationGetBotAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetBotAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBotAliases.go b/service/lexmodelbuildingservice/api_op_GetBotAliases.go index bc332eba1da..ac2c1c0e59b 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotAliases.go +++ b/service/lexmodelbuildingservice/api_op_GetBotAliases.go @@ -74,6 +74,9 @@ func addOperationGetBotAliasesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetBotAliasesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go index 330fe1632fb..078f80b6f86 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go +++ b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go @@ -104,6 +104,9 @@ func addOperationGetBotChannelAssociationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationGetBotChannelAssociationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go index 13cdc081f53..4bdcdf617c7 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go +++ b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go @@ -83,6 +83,9 @@ func addOperationGetBotChannelAssociationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetBotChannelAssociationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBotVersions.go b/service/lexmodelbuildingservice/api_op_GetBotVersions.go index 496b17193d2..4ce84dd7535 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotVersions.go +++ b/service/lexmodelbuildingservice/api_op_GetBotVersions.go @@ -75,6 +75,9 @@ func addOperationGetBotVersionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetBotVersionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBots.go b/service/lexmodelbuildingservice/api_op_GetBots.go index 673dfaf7abd..c10653f7135 100644 --- a/service/lexmodelbuildingservice/api_op_GetBots.go +++ b/service/lexmodelbuildingservice/api_op_GetBots.go @@ -75,6 +75,9 @@ func addOperationGetBotsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetBotsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go b/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go index deffa2a99a6..73f6f933115 100644 --- a/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go +++ b/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go @@ -64,6 +64,9 @@ func addOperationGetBuiltinIntentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetBuiltinIntentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go b/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go index 3a22e1bf746..aa0807605a7 100644 --- a/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go +++ b/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go @@ -74,6 +74,9 @@ func addOperationGetBuiltinIntentsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetBuiltinIntentsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go b/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go index 57e05497f7e..ee9339a5da5 100644 --- a/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go +++ b/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go @@ -74,6 +74,9 @@ func addOperationGetBuiltinSlotTypesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetBuiltinSlotTypesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetExport.go b/service/lexmodelbuildingservice/api_op_GetExport.go index 386174d1a09..13bd31b93f1 100644 --- a/service/lexmodelbuildingservice/api_op_GetExport.go +++ b/service/lexmodelbuildingservice/api_op_GetExport.go @@ -97,6 +97,9 @@ func addOperationGetExportMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetExportMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetImport.go b/service/lexmodelbuildingservice/api_op_GetImport.go index 07394c46673..32860f2d1c5 100644 --- a/service/lexmodelbuildingservice/api_op_GetImport.go +++ b/service/lexmodelbuildingservice/api_op_GetImport.go @@ -74,6 +74,9 @@ func addOperationGetImportMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetImportMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetIntent.go b/service/lexmodelbuildingservice/api_op_GetIntent.go index 4d507094f97..ea7c38c608e 100644 --- a/service/lexmodelbuildingservice/api_op_GetIntent.go +++ b/service/lexmodelbuildingservice/api_op_GetIntent.go @@ -113,6 +113,9 @@ func addOperationGetIntentMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationGetIntentMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetIntentVersions.go b/service/lexmodelbuildingservice/api_op_GetIntentVersions.go index f3194e37c5c..39c44ff1cc5 100644 --- a/service/lexmodelbuildingservice/api_op_GetIntentVersions.go +++ b/service/lexmodelbuildingservice/api_op_GetIntentVersions.go @@ -76,6 +76,9 @@ func addOperationGetIntentVersionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetIntentVersionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetIntents.go b/service/lexmodelbuildingservice/api_op_GetIntents.go index 730c361d0cb..5b4a1e7a236 100644 --- a/service/lexmodelbuildingservice/api_op_GetIntents.go +++ b/service/lexmodelbuildingservice/api_op_GetIntents.go @@ -76,6 +76,9 @@ func addOperationGetIntentsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetIntentsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetSlotType.go b/service/lexmodelbuildingservice/api_op_GetSlotType.go index 8760001f117..e951061c0e6 100644 --- a/service/lexmodelbuildingservice/api_op_GetSlotType.go +++ b/service/lexmodelbuildingservice/api_op_GetSlotType.go @@ -91,6 +91,9 @@ func addOperationGetSlotTypeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetSlotTypeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go b/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go index c638399b9f1..2cca801502c 100644 --- a/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go +++ b/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go @@ -76,6 +76,9 @@ func addOperationGetSlotTypeVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetSlotTypeVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetSlotTypes.go b/service/lexmodelbuildingservice/api_op_GetSlotTypes.go index bdb837e989d..8c5595d7f80 100644 --- a/service/lexmodelbuildingservice/api_op_GetSlotTypes.go +++ b/service/lexmodelbuildingservice/api_op_GetSlotTypes.go @@ -77,6 +77,9 @@ func addOperationGetSlotTypesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetSlotTypesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_GetUtterancesView.go b/service/lexmodelbuildingservice/api_op_GetUtterancesView.go index f6b71ff06ed..4483fb9fa92 100644 --- a/service/lexmodelbuildingservice/api_op_GetUtterancesView.go +++ b/service/lexmodelbuildingservice/api_op_GetUtterancesView.go @@ -88,6 +88,9 @@ func addOperationGetUtterancesViewMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetUtterancesViewMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_ListTagsForResource.go b/service/lexmodelbuildingservice/api_op_ListTagsForResource.go index d6b31f4b899..bbbaa82bd79 100644 --- a/service/lexmodelbuildingservice/api_op_ListTagsForResource.go +++ b/service/lexmodelbuildingservice/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_PutBot.go b/service/lexmodelbuildingservice/api_op_PutBot.go index e9e3ffc6e57..b16af2e8951 100644 --- a/service/lexmodelbuildingservice/api_op_PutBot.go +++ b/service/lexmodelbuildingservice/api_op_PutBot.go @@ -372,6 +372,9 @@ func addOperationPutBotMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -414,6 +417,9 @@ func addOperationPutBotMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_PutBotAlias.go b/service/lexmodelbuildingservice/api_op_PutBotAlias.go index 89254c727b5..856a2157d25 100644 --- a/service/lexmodelbuildingservice/api_op_PutBotAlias.go +++ b/service/lexmodelbuildingservice/api_op_PutBotAlias.go @@ -111,6 +111,9 @@ func addOperationPutBotAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationPutBotAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_PutIntent.go b/service/lexmodelbuildingservice/api_op_PutIntent.go index f189a923765..c8a32870c1f 100644 --- a/service/lexmodelbuildingservice/api_op_PutIntent.go +++ b/service/lexmodelbuildingservice/api_op_PutIntent.go @@ -262,6 +262,9 @@ func addOperationPutIntentMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -304,6 +307,9 @@ func addOperationPutIntentMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_PutSlotType.go b/service/lexmodelbuildingservice/api_op_PutSlotType.go index 04349a063fa..db3f6423bbe 100644 --- a/service/lexmodelbuildingservice/api_op_PutSlotType.go +++ b/service/lexmodelbuildingservice/api_op_PutSlotType.go @@ -158,6 +158,9 @@ func addOperationPutSlotTypeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationPutSlotTypeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_StartImport.go b/service/lexmodelbuildingservice/api_op_StartImport.go index 9aa673eb032..2c311ca1968 100644 --- a/service/lexmodelbuildingservice/api_op_StartImport.go +++ b/service/lexmodelbuildingservice/api_op_StartImport.go @@ -104,6 +104,9 @@ func addOperationStartImportMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationStartImportMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_TagResource.go b/service/lexmodelbuildingservice/api_op_TagResource.go index 62a4075032b..9975cc35383 100644 --- a/service/lexmodelbuildingservice/api_op_TagResource.go +++ b/service/lexmodelbuildingservice/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/api_op_UntagResource.go b/service/lexmodelbuildingservice/api_op_UntagResource.go index 35abee80320..268a3001a42 100644 --- a/service/lexmodelbuildingservice/api_op_UntagResource.go +++ b/service/lexmodelbuildingservice/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexmodelbuildingservice/go.mod b/service/lexmodelbuildingservice/go.mod index d63b6348225..68f59736d11 100644 --- a/service/lexmodelbuildingservice/go.mod +++ b/service/lexmodelbuildingservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexmodelbuildingservice/go.sum b/service/lexmodelbuildingservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/lexmodelbuildingservice/go.sum +++ b/service/lexmodelbuildingservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lexruntimeservice/api_client.go b/service/lexruntimeservice/api_client.go index 62e0cd7e9f9..49e15c24752 100644 --- a/service/lexruntimeservice/api_client.go +++ b/service/lexruntimeservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/lexruntimeservice/api_op_DeleteSession.go b/service/lexruntimeservice/api_op_DeleteSession.go index 7d368f02bee..4a5147a82e8 100644 --- a/service/lexruntimeservice/api_op_DeleteSession.go +++ b/service/lexruntimeservice/api_op_DeleteSession.go @@ -71,6 +71,9 @@ func addOperationDeleteSessionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteSessionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexruntimeservice/api_op_GetSession.go b/service/lexruntimeservice/api_op_GetSession.go index c3d37f370fa..3e6dcc3a958 100644 --- a/service/lexruntimeservice/api_op_GetSession.go +++ b/service/lexruntimeservice/api_op_GetSession.go @@ -84,6 +84,9 @@ func addOperationGetSessionMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetSessionMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexruntimeservice/api_op_PostContent.go b/service/lexruntimeservice/api_op_PostContent.go index 26f042620ce..508ed233901 100644 --- a/service/lexruntimeservice/api_op_PostContent.go +++ b/service/lexruntimeservice/api_op_PostContent.go @@ -369,6 +369,9 @@ func addOperationPostContentMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -411,6 +414,9 @@ func addOperationPostContentMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexruntimeservice/api_op_PostText.go b/service/lexruntimeservice/api_op_PostText.go index 38e4b6fa4a4..fcb76b3de1f 100644 --- a/service/lexruntimeservice/api_op_PostText.go +++ b/service/lexruntimeservice/api_op_PostText.go @@ -278,6 +278,9 @@ func addOperationPostTextMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -320,6 +323,9 @@ func addOperationPostTextMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexruntimeservice/api_op_PutSession.go b/service/lexruntimeservice/api_op_PutSession.go index 98d3d8b6167..a7db7b81440 100644 --- a/service/lexruntimeservice/api_op_PutSession.go +++ b/service/lexruntimeservice/api_op_PutSession.go @@ -195,6 +195,9 @@ func addOperationPutSessionMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -234,6 +237,9 @@ func addOperationPutSessionMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lexruntimeservice/go.mod b/service/lexruntimeservice/go.mod index 9b01c559ba6..e15464ca1ea 100644 --- a/service/lexruntimeservice/go.mod +++ b/service/lexruntimeservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/lexruntimeservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexruntimeservice/go.sum b/service/lexruntimeservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/lexruntimeservice/go.sum +++ b/service/lexruntimeservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/licensemanager/api_client.go b/service/licensemanager/api_client.go index 512eb1d94f2..5679b46605b 100644 --- a/service/licensemanager/api_client.go +++ b/service/licensemanager/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/licensemanager/api_op_CreateLicenseConfiguration.go b/service/licensemanager/api_op_CreateLicenseConfiguration.go index 9a1bd1b92f4..fc98d68ea13 100644 --- a/service/licensemanager/api_op_CreateLicenseConfiguration.go +++ b/service/licensemanager/api_op_CreateLicenseConfiguration.go @@ -102,6 +102,9 @@ func addOperationCreateLicenseConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateLicenseConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_DeleteLicenseConfiguration.go b/service/licensemanager/api_op_DeleteLicenseConfiguration.go index c47e64d7337..e5d8059f594 100644 --- a/service/licensemanager/api_op_DeleteLicenseConfiguration.go +++ b/service/licensemanager/api_op_DeleteLicenseConfiguration.go @@ -49,6 +49,9 @@ func addOperationDeleteLicenseConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteLicenseConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_GetLicenseConfiguration.go b/service/licensemanager/api_op_GetLicenseConfiguration.go index af9027b3fb3..8b52bb73243 100644 --- a/service/licensemanager/api_op_GetLicenseConfiguration.go +++ b/service/licensemanager/api_op_GetLicenseConfiguration.go @@ -98,6 +98,9 @@ func addOperationGetLicenseConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationGetLicenseConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_GetServiceSettings.go b/service/licensemanager/api_op_GetServiceSettings.go index 769f69b23b7..d8b3cac2b6e 100644 --- a/service/licensemanager/api_op_GetServiceSettings.go +++ b/service/licensemanager/api_op_GetServiceSettings.go @@ -63,6 +63,9 @@ func addOperationGetServiceSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetServiceSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go b/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go index 642fc632df6..ff5dd7164a2 100644 --- a/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go +++ b/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go @@ -65,6 +65,9 @@ func addOperationListAssociationsForLicenseConfigurationMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAssociationsForLicenseConfigurationMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go b/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go index 047d63c0639..a2ee495a4a9 100644 --- a/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go +++ b/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go @@ -62,6 +62,9 @@ func addOperationListFailuresForLicenseConfigurationOperationsMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListFailuresForLicenseConfigurationOperationsMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListLicenseConfigurations.go b/service/licensemanager/api_op_ListLicenseConfigurations.go index a3d72f130c1..331602c1b73 100644 --- a/service/licensemanager/api_op_ListLicenseConfigurations.go +++ b/service/licensemanager/api_op_ListLicenseConfigurations.go @@ -76,6 +76,9 @@ func addOperationListLicenseConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListLicenseConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go b/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go index 97fff6b6fb2..968a78296fe 100644 --- a/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go +++ b/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go @@ -63,6 +63,9 @@ func addOperationListLicenseSpecificationsForResourceMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListLicenseSpecificationsForResourceMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListResourceInventory.go b/service/licensemanager/api_op_ListResourceInventory.go index 4c24fc05e37..f749b27e042 100644 --- a/service/licensemanager/api_op_ListResourceInventory.go +++ b/service/licensemanager/api_op_ListResourceInventory.go @@ -78,6 +78,9 @@ func addOperationListResourceInventoryMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListResourceInventoryMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListTagsForResource.go b/service/licensemanager/api_op_ListTagsForResource.go index 7869094e9f5..9b1deddc687 100644 --- a/service/licensemanager/api_op_ListTagsForResource.go +++ b/service/licensemanager/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go b/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go index e0f6a92ead6..ae6b5e6d7b3 100644 --- a/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go +++ b/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go @@ -79,6 +79,9 @@ func addOperationListUsageForLicenseConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListUsageForLicenseConfigurationMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_TagResource.go b/service/licensemanager/api_op_TagResource.go index 315c5260bc8..81a785b4c6a 100644 --- a/service/licensemanager/api_op_TagResource.go +++ b/service/licensemanager/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_UntagResource.go b/service/licensemanager/api_op_UntagResource.go index 2a78ea3430d..832e6e1c978 100644 --- a/service/licensemanager/api_op_UntagResource.go +++ b/service/licensemanager/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_UpdateLicenseConfiguration.go b/service/licensemanager/api_op_UpdateLicenseConfiguration.go index a30feb601f2..317c896c264 100644 --- a/service/licensemanager/api_op_UpdateLicenseConfiguration.go +++ b/service/licensemanager/api_op_UpdateLicenseConfiguration.go @@ -71,6 +71,9 @@ func addOperationUpdateLicenseConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateLicenseConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go b/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go index 91e11649703..ed7ec168636 100644 --- a/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go +++ b/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go @@ -59,6 +59,9 @@ func addOperationUpdateLicenseSpecificationsForResourceMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateLicenseSpecificationsForResourceMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/api_op_UpdateServiceSettings.go b/service/licensemanager/api_op_UpdateServiceSettings.go index 286d8bca077..d8cec620736 100644 --- a/service/licensemanager/api_op_UpdateServiceSettings.go +++ b/service/licensemanager/api_op_UpdateServiceSettings.go @@ -58,6 +58,9 @@ func addOperationUpdateServiceSettingsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateServiceSettingsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/licensemanager/go.mod b/service/licensemanager/go.mod index 2a1f302a54a..f95ae99926d 100644 --- a/service/licensemanager/go.mod +++ b/service/licensemanager/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/licensemanager go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/licensemanager/go.sum b/service/licensemanager/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/licensemanager/go.sum +++ b/service/licensemanager/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lightsail/api_client.go b/service/lightsail/api_client.go index e49a6016536..5ae247a69e5 100644 --- a/service/lightsail/api_client.go +++ b/service/lightsail/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/lightsail/api_op_AllocateStaticIp.go b/service/lightsail/api_op_AllocateStaticIp.go index a829167c78d..549629b0765 100644 --- a/service/lightsail/api_op_AllocateStaticIp.go +++ b/service/lightsail/api_op_AllocateStaticIp.go @@ -55,6 +55,9 @@ func addOperationAllocateStaticIpMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationAllocateStaticIpMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_AttachCertificateToDistribution.go b/service/lightsail/api_op_AttachCertificateToDistribution.go index 8fb21081906..14ce8b16455 100644 --- a/service/lightsail/api_op_AttachCertificateToDistribution.go +++ b/service/lightsail/api_op_AttachCertificateToDistribution.go @@ -77,6 +77,9 @@ func addOperationAttachCertificateToDistributionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAttachCertificateToDistributionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_AttachDisk.go b/service/lightsail/api_op_AttachDisk.go index 9628d2c10b8..dbbffd9c3bd 100644 --- a/service/lightsail/api_op_AttachDisk.go +++ b/service/lightsail/api_op_AttachDisk.go @@ -70,6 +70,9 @@ func addOperationAttachDiskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAttachDiskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_AttachInstancesToLoadBalancer.go b/service/lightsail/api_op_AttachInstancesToLoadBalancer.go index 608e20abac4..b48af6d6c35 100644 --- a/service/lightsail/api_op_AttachInstancesToLoadBalancer.go +++ b/service/lightsail/api_op_AttachInstancesToLoadBalancer.go @@ -69,6 +69,9 @@ func addOperationAttachInstancesToLoadBalancerMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAttachInstancesToLoadBalancerMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go b/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go index f48f9e1937d..1f6ac66eeb4 100644 --- a/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go +++ b/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go @@ -71,6 +71,9 @@ func addOperationAttachLoadBalancerTlsCertificateMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationAttachLoadBalancerTlsCertificateMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_AttachStaticIp.go b/service/lightsail/api_op_AttachStaticIp.go index be0ce17caad..7a104837b1e 100644 --- a/service/lightsail/api_op_AttachStaticIp.go +++ b/service/lightsail/api_op_AttachStaticIp.go @@ -60,6 +60,9 @@ func addOperationAttachStaticIpMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAttachStaticIpMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CloseInstancePublicPorts.go b/service/lightsail/api_op_CloseInstancePublicPorts.go index b3273ddb1d6..e5527220ffe 100644 --- a/service/lightsail/api_op_CloseInstancePublicPorts.go +++ b/service/lightsail/api_op_CloseInstancePublicPorts.go @@ -64,6 +64,9 @@ func addOperationCloseInstancePublicPortsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCloseInstancePublicPortsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CopySnapshot.go b/service/lightsail/api_op_CopySnapshot.go index 183593b0f2e..b5444f86817 100644 --- a/service/lightsail/api_op_CopySnapshot.go +++ b/service/lightsail/api_op_CopySnapshot.go @@ -110,6 +110,9 @@ func addOperationCopySnapshotMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationCopySnapshotMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateCertificate.go b/service/lightsail/api_op_CreateCertificate.go index 8d446cb2c0a..bc891c72f57 100644 --- a/service/lightsail/api_op_CreateCertificate.go +++ b/service/lightsail/api_op_CreateCertificate.go @@ -80,6 +80,9 @@ func addOperationCreateCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateCloudFormationStack.go b/service/lightsail/api_op_CreateCloudFormationStack.go index 99afce9d4fb..2e4663e2727 100644 --- a/service/lightsail/api_op_CreateCloudFormationStack.go +++ b/service/lightsail/api_op_CreateCloudFormationStack.go @@ -63,6 +63,9 @@ func addOperationCreateCloudFormationStackMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateCloudFormationStackMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateContactMethod.go b/service/lightsail/api_op_CreateContactMethod.go index a1b513985b4..db7f8dc7b99 100644 --- a/service/lightsail/api_op_CreateContactMethod.go +++ b/service/lightsail/api_op_CreateContactMethod.go @@ -98,6 +98,9 @@ func addOperationCreateContactMethodMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateContactMethodMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateDisk.go b/service/lightsail/api_op_CreateDisk.go index 395a1125f8a..e2ebfcabdca 100644 --- a/service/lightsail/api_op_CreateDisk.go +++ b/service/lightsail/api_op_CreateDisk.go @@ -79,6 +79,9 @@ func addOperationCreateDiskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateDiskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateDiskFromSnapshot.go b/service/lightsail/api_op_CreateDiskFromSnapshot.go index a5a01223e53..68d7b6245af 100644 --- a/service/lightsail/api_op_CreateDiskFromSnapshot.go +++ b/service/lightsail/api_op_CreateDiskFromSnapshot.go @@ -130,6 +130,9 @@ func addOperationCreateDiskFromSnapshotMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationCreateDiskFromSnapshotMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateDiskSnapshot.go b/service/lightsail/api_op_CreateDiskSnapshot.go index 54122e18d74..adeedbf9acf 100644 --- a/service/lightsail/api_op_CreateDiskSnapshot.go +++ b/service/lightsail/api_op_CreateDiskSnapshot.go @@ -92,6 +92,9 @@ func addOperationCreateDiskSnapshotMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreateDiskSnapshotMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateDistribution.go b/service/lightsail/api_op_CreateDistribution.go index 716a48e594f..d8386f89e12 100644 --- a/service/lightsail/api_op_CreateDistribution.go +++ b/service/lightsail/api_op_CreateDistribution.go @@ -94,6 +94,9 @@ func addOperationCreateDistributionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateDistributionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateDomain.go b/service/lightsail/api_op_CreateDomain.go index 323ebcc6773..ae4c4caf0a6 100644 --- a/service/lightsail/api_op_CreateDomain.go +++ b/service/lightsail/api_op_CreateDomain.go @@ -65,6 +65,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateDomainEntry.go b/service/lightsail/api_op_CreateDomainEntry.go index e0490771e2e..f21647ccf77 100644 --- a/service/lightsail/api_op_CreateDomainEntry.go +++ b/service/lightsail/api_op_CreateDomainEntry.go @@ -68,6 +68,9 @@ func addOperationCreateDomainEntryMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateDomainEntryMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateInstanceSnapshot.go b/service/lightsail/api_op_CreateInstanceSnapshot.go index 06c5271abce..1f675d095c7 100644 --- a/service/lightsail/api_op_CreateInstanceSnapshot.go +++ b/service/lightsail/api_op_CreateInstanceSnapshot.go @@ -68,6 +68,9 @@ func addOperationCreateInstanceSnapshotMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateInstanceSnapshotMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateInstances.go b/service/lightsail/api_op_CreateInstances.go index 165f2276229..52148eef3f4 100644 --- a/service/lightsail/api_op_CreateInstances.go +++ b/service/lightsail/api_op_CreateInstances.go @@ -109,6 +109,9 @@ func addOperationCreateInstancesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationCreateInstancesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateInstancesFromSnapshot.go b/service/lightsail/api_op_CreateInstancesFromSnapshot.go index 7acc882f4a8..18759acd991 100644 --- a/service/lightsail/api_op_CreateInstancesFromSnapshot.go +++ b/service/lightsail/api_op_CreateInstancesFromSnapshot.go @@ -147,6 +147,9 @@ func addOperationCreateInstancesFromSnapshotMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -189,6 +192,9 @@ func addOperationCreateInstancesFromSnapshotMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateKeyPair.go b/service/lightsail/api_op_CreateKeyPair.go index eb125c44c34..f258e0bd0dd 100644 --- a/service/lightsail/api_op_CreateKeyPair.go +++ b/service/lightsail/api_op_CreateKeyPair.go @@ -71,6 +71,9 @@ func addOperationCreateKeyPairMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateKeyPairMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateLoadBalancer.go b/service/lightsail/api_op_CreateLoadBalancer.go index a44990f4aa9..d6f2c321427 100644 --- a/service/lightsail/api_op_CreateLoadBalancer.go +++ b/service/lightsail/api_op_CreateLoadBalancer.go @@ -94,6 +94,9 @@ func addOperationCreateLoadBalancerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateLoadBalancerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go b/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go index d2d8b16b908..464bfdcfab7 100644 --- a/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go +++ b/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go @@ -84,6 +84,9 @@ func addOperationCreateLoadBalancerTlsCertificateMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateLoadBalancerTlsCertificateMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateRelationalDatabase.go b/service/lightsail/api_op_CreateRelationalDatabase.go index f169ca57e48..d42c3e93267 100644 --- a/service/lightsail/api_op_CreateRelationalDatabase.go +++ b/service/lightsail/api_op_CreateRelationalDatabase.go @@ -167,6 +167,9 @@ func addOperationCreateRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -209,6 +212,9 @@ func addOperationCreateRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go b/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go index 19541aaa7ec..cb17b4fa1a1 100644 --- a/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go +++ b/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go @@ -119,6 +119,9 @@ func addOperationCreateRelationalDatabaseFromSnapshotMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationCreateRelationalDatabaseFromSnapshotMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go b/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go index b0a9c9527fc..e57a2c7c808 100644 --- a/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go +++ b/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go @@ -75,6 +75,9 @@ func addOperationCreateRelationalDatabaseSnapshotMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateRelationalDatabaseSnapshotMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteAlarm.go b/service/lightsail/api_op_DeleteAlarm.go index 906c95202a4..7885b9bfb32 100644 --- a/service/lightsail/api_op_DeleteAlarm.go +++ b/service/lightsail/api_op_DeleteAlarm.go @@ -59,6 +59,9 @@ func addOperationDeleteAlarmMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteAlarmMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteAutoSnapshot.go b/service/lightsail/api_op_DeleteAutoSnapshot.go index a6830e7c253..d1fa6e5530d 100644 --- a/service/lightsail/api_op_DeleteAutoSnapshot.go +++ b/service/lightsail/api_op_DeleteAutoSnapshot.go @@ -65,6 +65,9 @@ func addOperationDeleteAutoSnapshotMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteAutoSnapshotMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteCertificate.go b/service/lightsail/api_op_DeleteCertificate.go index e86e3a406b2..1a5ad18c98f 100644 --- a/service/lightsail/api_op_DeleteCertificate.go +++ b/service/lightsail/api_op_DeleteCertificate.go @@ -59,6 +59,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteCertificateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteContactMethod.go b/service/lightsail/api_op_DeleteContactMethod.go index de8f9e80da9..ab1f58735bf 100644 --- a/service/lightsail/api_op_DeleteContactMethod.go +++ b/service/lightsail/api_op_DeleteContactMethod.go @@ -63,6 +63,9 @@ func addOperationDeleteContactMethodMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteContactMethodMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteDisk.go b/service/lightsail/api_op_DeleteDisk.go index 50b562e6777..d5776bac3a4 100644 --- a/service/lightsail/api_op_DeleteDisk.go +++ b/service/lightsail/api_op_DeleteDisk.go @@ -63,6 +63,9 @@ func addOperationDeleteDiskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteDiskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteDiskSnapshot.go b/service/lightsail/api_op_DeleteDiskSnapshot.go index 03128b5b25b..b41bb17350f 100644 --- a/service/lightsail/api_op_DeleteDiskSnapshot.go +++ b/service/lightsail/api_op_DeleteDiskSnapshot.go @@ -64,6 +64,9 @@ func addOperationDeleteDiskSnapshotMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteDiskSnapshotMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteDistribution.go b/service/lightsail/api_op_DeleteDistribution.go index 571cff707b5..f52a59be902 100644 --- a/service/lightsail/api_op_DeleteDistribution.go +++ b/service/lightsail/api_op_DeleteDistribution.go @@ -54,6 +54,9 @@ func addOperationDeleteDistributionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDistributionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteDomain.go b/service/lightsail/api_op_DeleteDomain.go index 1a0b63ecdcd..686f5163083 100644 --- a/service/lightsail/api_op_DeleteDomain.go +++ b/service/lightsail/api_op_DeleteDomain.go @@ -59,6 +59,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteDomainEntry.go b/service/lightsail/api_op_DeleteDomainEntry.go index 02a784da2bd..085b91605f5 100644 --- a/service/lightsail/api_op_DeleteDomainEntry.go +++ b/service/lightsail/api_op_DeleteDomainEntry.go @@ -63,6 +63,9 @@ func addOperationDeleteDomainEntryMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteDomainEntryMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteInstance.go b/service/lightsail/api_op_DeleteInstance.go index ec284087f6d..4e06fb71b65 100644 --- a/service/lightsail/api_op_DeleteInstance.go +++ b/service/lightsail/api_op_DeleteInstance.go @@ -61,6 +61,9 @@ func addOperationDeleteInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteInstanceSnapshot.go b/service/lightsail/api_op_DeleteInstanceSnapshot.go index 4efbfb0c5e2..b202d605d2a 100644 --- a/service/lightsail/api_op_DeleteInstanceSnapshot.go +++ b/service/lightsail/api_op_DeleteInstanceSnapshot.go @@ -59,6 +59,9 @@ func addOperationDeleteInstanceSnapshotMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteInstanceSnapshotMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteKeyPair.go b/service/lightsail/api_op_DeleteKeyPair.go index 4be6e748ecd..e892c2ab9c8 100644 --- a/service/lightsail/api_op_DeleteKeyPair.go +++ b/service/lightsail/api_op_DeleteKeyPair.go @@ -58,6 +58,9 @@ func addOperationDeleteKeyPairMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteKeyPairMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteKnownHostKeys.go b/service/lightsail/api_op_DeleteKnownHostKeys.go index c94cb81bcd7..fdb199d02ec 100644 --- a/service/lightsail/api_op_DeleteKnownHostKeys.go +++ b/service/lightsail/api_op_DeleteKnownHostKeys.go @@ -64,6 +64,9 @@ func addOperationDeleteKnownHostKeysMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteKnownHostKeysMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteLoadBalancer.go b/service/lightsail/api_op_DeleteLoadBalancer.go index 88fa656de62..20d8d262e65 100644 --- a/service/lightsail/api_op_DeleteLoadBalancer.go +++ b/service/lightsail/api_op_DeleteLoadBalancer.go @@ -61,6 +61,9 @@ func addOperationDeleteLoadBalancerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteLoadBalancerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go b/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go index bb5489cf8a6..1757d049cb4 100644 --- a/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go +++ b/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go @@ -70,6 +70,9 @@ func addOperationDeleteLoadBalancerTlsCertificateMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteLoadBalancerTlsCertificateMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteRelationalDatabase.go b/service/lightsail/api_op_DeleteRelationalDatabase.go index 7548f019ab8..11b5d692224 100644 --- a/service/lightsail/api_op_DeleteRelationalDatabase.go +++ b/service/lightsail/api_op_DeleteRelationalDatabase.go @@ -77,6 +77,9 @@ func addOperationDeleteRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDeleteRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go b/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go index ea67221b981..f15d320c86e 100644 --- a/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go +++ b/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go @@ -59,6 +59,9 @@ func addOperationDeleteRelationalDatabaseSnapshotMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteRelationalDatabaseSnapshotMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DetachCertificateFromDistribution.go b/service/lightsail/api_op_DetachCertificateFromDistribution.go index 00b55d6b8c9..042a911f319 100644 --- a/service/lightsail/api_op_DetachCertificateFromDistribution.go +++ b/service/lightsail/api_op_DetachCertificateFromDistribution.go @@ -60,6 +60,9 @@ func addOperationDetachCertificateFromDistributionMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDetachCertificateFromDistributionMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DetachDisk.go b/service/lightsail/api_op_DetachDisk.go index 86108510188..cb8923546b1 100644 --- a/service/lightsail/api_op_DetachDisk.go +++ b/service/lightsail/api_op_DetachDisk.go @@ -61,6 +61,9 @@ func addOperationDetachDiskMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDetachDiskMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go b/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go index db634d9dc40..887a1110e9f 100644 --- a/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go +++ b/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go @@ -66,6 +66,9 @@ func addOperationDetachInstancesFromLoadBalancerMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDetachInstancesFromLoadBalancerMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DetachStaticIp.go b/service/lightsail/api_op_DetachStaticIp.go index a00f8987031..ac2de6c14cd 100644 --- a/service/lightsail/api_op_DetachStaticIp.go +++ b/service/lightsail/api_op_DetachStaticIp.go @@ -55,6 +55,9 @@ func addOperationDetachStaticIpMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDetachStaticIpMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DisableAddOn.go b/service/lightsail/api_op_DisableAddOn.go index e19e1c8fea0..ee60124ad7c 100644 --- a/service/lightsail/api_op_DisableAddOn.go +++ b/service/lightsail/api_op_DisableAddOn.go @@ -62,6 +62,9 @@ func addOperationDisableAddOnMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDisableAddOnMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_DownloadDefaultKeyPair.go b/service/lightsail/api_op_DownloadDefaultKeyPair.go index d1931d6b99a..42b6da5f707 100644 --- a/service/lightsail/api_op_DownloadDefaultKeyPair.go +++ b/service/lightsail/api_op_DownloadDefaultKeyPair.go @@ -50,6 +50,9 @@ func addOperationDownloadDefaultKeyPairMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDownloadDefaultKeyPairMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_EnableAddOn.go b/service/lightsail/api_op_EnableAddOn.go index bf70fa0918d..3496615f8e2 100644 --- a/service/lightsail/api_op_EnableAddOn.go +++ b/service/lightsail/api_op_EnableAddOn.go @@ -62,6 +62,9 @@ func addOperationEnableAddOnMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationEnableAddOnMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_ExportSnapshot.go b/service/lightsail/api_op_ExportSnapshot.go index e7074f476b5..600fffd5888 100644 --- a/service/lightsail/api_op_ExportSnapshot.go +++ b/service/lightsail/api_op_ExportSnapshot.go @@ -68,6 +68,9 @@ func addOperationExportSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationExportSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetActiveNames.go b/service/lightsail/api_op_GetActiveNames.go index 99569a3d087..aa8449cd32e 100644 --- a/service/lightsail/api_op_GetActiveNames.go +++ b/service/lightsail/api_op_GetActiveNames.go @@ -59,6 +59,9 @@ func addOperationGetActiveNamesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetActiveNamesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetAlarms.go b/service/lightsail/api_op_GetAlarms.go index 95edd347ed5..2ecead0b868 100644 --- a/service/lightsail/api_op_GetAlarms.go +++ b/service/lightsail/api_op_GetAlarms.go @@ -76,6 +76,9 @@ func addOperationGetAlarmsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetAlarmsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetAutoSnapshots.go b/service/lightsail/api_op_GetAutoSnapshots.go index 7a7deb0aba1..aa58d5c6a8c 100644 --- a/service/lightsail/api_op_GetAutoSnapshots.go +++ b/service/lightsail/api_op_GetAutoSnapshots.go @@ -63,6 +63,9 @@ func addOperationGetAutoSnapshotsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetAutoSnapshotsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetBlueprints.go b/service/lightsail/api_op_GetBlueprints.go index 0b68bffd878..fb46f0100ce 100644 --- a/service/lightsail/api_op_GetBlueprints.go +++ b/service/lightsail/api_op_GetBlueprints.go @@ -71,6 +71,9 @@ func addOperationGetBlueprintsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetBlueprintsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetBundles.go b/service/lightsail/api_op_GetBundles.go index f4a7607d820..4e383c34722 100644 --- a/service/lightsail/api_op_GetBundles.go +++ b/service/lightsail/api_op_GetBundles.go @@ -66,6 +66,9 @@ func addOperationGetBundlesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetBundlesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetCertificates.go b/service/lightsail/api_op_GetCertificates.go index 0284fb6c7fb..3e97f8f8e2c 100644 --- a/service/lightsail/api_op_GetCertificates.go +++ b/service/lightsail/api_op_GetCertificates.go @@ -67,6 +67,9 @@ func addOperationGetCertificatesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetCertificatesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetCloudFormationStackRecords.go b/service/lightsail/api_op_GetCloudFormationStackRecords.go index a43859e7f50..29aab9926a5 100644 --- a/service/lightsail/api_op_GetCloudFormationStackRecords.go +++ b/service/lightsail/api_op_GetCloudFormationStackRecords.go @@ -62,6 +62,9 @@ func addOperationGetCloudFormationStackRecordsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetCloudFormationStackRecordsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetContactMethods.go b/service/lightsail/api_op_GetContactMethods.go index b38d4a360a3..1f3a65d569f 100644 --- a/service/lightsail/api_op_GetContactMethods.go +++ b/service/lightsail/api_op_GetContactMethods.go @@ -60,6 +60,9 @@ func addOperationGetContactMethodsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetContactMethodsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDisk.go b/service/lightsail/api_op_GetDisk.go index 073131b2a33..b058f2c35bb 100644 --- a/service/lightsail/api_op_GetDisk.go +++ b/service/lightsail/api_op_GetDisk.go @@ -53,6 +53,9 @@ func addOperationGetDiskMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetDiskMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDiskSnapshot.go b/service/lightsail/api_op_GetDiskSnapshot.go index 97f77bc7376..a58f0e1f994 100644 --- a/service/lightsail/api_op_GetDiskSnapshot.go +++ b/service/lightsail/api_op_GetDiskSnapshot.go @@ -53,6 +53,9 @@ func addOperationGetDiskSnapshotMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetDiskSnapshotMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDiskSnapshots.go b/service/lightsail/api_op_GetDiskSnapshots.go index fa02fa4bd7b..e70b96df1d5 100644 --- a/service/lightsail/api_op_GetDiskSnapshots.go +++ b/service/lightsail/api_op_GetDiskSnapshots.go @@ -62,6 +62,9 @@ func addOperationGetDiskSnapshotsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetDiskSnapshotsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDisks.go b/service/lightsail/api_op_GetDisks.go index 88bc53e25f7..8921a7928fe 100644 --- a/service/lightsail/api_op_GetDisks.go +++ b/service/lightsail/api_op_GetDisks.go @@ -61,6 +61,9 @@ func addOperationGetDisksMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDisksMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDistributionBundles.go b/service/lightsail/api_op_GetDistributionBundles.go index 473a62518f0..c92bbd0ae91 100644 --- a/service/lightsail/api_op_GetDistributionBundles.go +++ b/service/lightsail/api_op_GetDistributionBundles.go @@ -50,6 +50,9 @@ func addOperationGetDistributionBundlesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationGetDistributionBundlesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDistributionLatestCacheReset.go b/service/lightsail/api_op_GetDistributionLatestCacheReset.go index 257144b731f..817900d7b78 100644 --- a/service/lightsail/api_op_GetDistributionLatestCacheReset.go +++ b/service/lightsail/api_op_GetDistributionLatestCacheReset.go @@ -58,6 +58,9 @@ func addOperationGetDistributionLatestCacheResetMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetDistributionLatestCacheResetMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDistributionMetricData.go b/service/lightsail/api_op_GetDistributionMetricData.go index 74c5ff8419d..b1a07299968 100644 --- a/service/lightsail/api_op_GetDistributionMetricData.go +++ b/service/lightsail/api_op_GetDistributionMetricData.go @@ -172,6 +172,9 @@ func addOperationGetDistributionMetricDataMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -214,6 +217,9 @@ func addOperationGetDistributionMetricDataMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDistributions.go b/service/lightsail/api_op_GetDistributions.go index 73c046efa98..aec4063a42c 100644 --- a/service/lightsail/api_op_GetDistributions.go +++ b/service/lightsail/api_op_GetDistributions.go @@ -67,6 +67,9 @@ func addOperationGetDistributionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetDistributionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDomain.go b/service/lightsail/api_op_GetDomain.go index 536bbfc0740..68944201bac 100644 --- a/service/lightsail/api_op_GetDomain.go +++ b/service/lightsail/api_op_GetDomain.go @@ -54,6 +54,9 @@ func addOperationGetDomainMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetDomainMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetDomains.go b/service/lightsail/api_op_GetDomains.go index fa7a1c3357e..5774e7b6973 100644 --- a/service/lightsail/api_op_GetDomains.go +++ b/service/lightsail/api_op_GetDomains.go @@ -61,6 +61,9 @@ func addOperationGetDomainsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetDomainsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetExportSnapshotRecords.go b/service/lightsail/api_op_GetExportSnapshotRecords.go index 2f703cccda7..2c2163c681d 100644 --- a/service/lightsail/api_op_GetExportSnapshotRecords.go +++ b/service/lightsail/api_op_GetExportSnapshotRecords.go @@ -63,6 +63,9 @@ func addOperationGetExportSnapshotRecordsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetExportSnapshotRecordsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstance.go b/service/lightsail/api_op_GetInstance.go index db379aabb85..2daa5247eea 100644 --- a/service/lightsail/api_op_GetInstance.go +++ b/service/lightsail/api_op_GetInstance.go @@ -54,6 +54,9 @@ func addOperationGetInstanceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetInstanceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstanceAccessDetails.go b/service/lightsail/api_op_GetInstanceAccessDetails.go index ecb5f4a174a..94d98a2104b 100644 --- a/service/lightsail/api_op_GetInstanceAccessDetails.go +++ b/service/lightsail/api_op_GetInstanceAccessDetails.go @@ -61,6 +61,9 @@ func addOperationGetInstanceAccessDetailsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetInstanceAccessDetailsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstanceMetricData.go b/service/lightsail/api_op_GetInstanceMetricData.go index 1bd30956ef0..17d9bd5ceeb 100644 --- a/service/lightsail/api_op_GetInstanceMetricData.go +++ b/service/lightsail/api_op_GetInstanceMetricData.go @@ -182,6 +182,9 @@ func addOperationGetInstanceMetricDataMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -224,6 +227,9 @@ func addOperationGetInstanceMetricDataMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstancePortStates.go b/service/lightsail/api_op_GetInstancePortStates.go index 79722132fd3..67c6fa94a34 100644 --- a/service/lightsail/api_op_GetInstancePortStates.go +++ b/service/lightsail/api_op_GetInstancePortStates.go @@ -56,6 +56,9 @@ func addOperationGetInstancePortStatesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetInstancePortStatesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstanceSnapshot.go b/service/lightsail/api_op_GetInstanceSnapshot.go index 9ff978eac44..886724b3a54 100644 --- a/service/lightsail/api_op_GetInstanceSnapshot.go +++ b/service/lightsail/api_op_GetInstanceSnapshot.go @@ -54,6 +54,9 @@ func addOperationGetInstanceSnapshotMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetInstanceSnapshotMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstanceSnapshots.go b/service/lightsail/api_op_GetInstanceSnapshots.go index f3b1c4099b2..9a86d0e1651 100644 --- a/service/lightsail/api_op_GetInstanceSnapshots.go +++ b/service/lightsail/api_op_GetInstanceSnapshots.go @@ -61,6 +61,9 @@ func addOperationGetInstanceSnapshotsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetInstanceSnapshotsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstanceState.go b/service/lightsail/api_op_GetInstanceState.go index 59ecca7203c..9ae4f06462c 100644 --- a/service/lightsail/api_op_GetInstanceState.go +++ b/service/lightsail/api_op_GetInstanceState.go @@ -53,6 +53,9 @@ func addOperationGetInstanceStateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetInstanceStateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetInstances.go b/service/lightsail/api_op_GetInstances.go index 5768cc1e2cd..247f40d4ffa 100644 --- a/service/lightsail/api_op_GetInstances.go +++ b/service/lightsail/api_op_GetInstances.go @@ -61,6 +61,9 @@ func addOperationGetInstancesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetInstancesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetKeyPair.go b/service/lightsail/api_op_GetKeyPair.go index c299f747f82..381199a748f 100644 --- a/service/lightsail/api_op_GetKeyPair.go +++ b/service/lightsail/api_op_GetKeyPair.go @@ -53,6 +53,9 @@ func addOperationGetKeyPairMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetKeyPairMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetKeyPairs.go b/service/lightsail/api_op_GetKeyPairs.go index 7eed1e99eca..2a7706a8c0e 100644 --- a/service/lightsail/api_op_GetKeyPairs.go +++ b/service/lightsail/api_op_GetKeyPairs.go @@ -60,6 +60,9 @@ func addOperationGetKeyPairsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetKeyPairsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetLoadBalancer.go b/service/lightsail/api_op_GetLoadBalancer.go index b7c23ad0ad6..517f1de25f0 100644 --- a/service/lightsail/api_op_GetLoadBalancer.go +++ b/service/lightsail/api_op_GetLoadBalancer.go @@ -53,6 +53,9 @@ func addOperationGetLoadBalancerMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetLoadBalancerMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetLoadBalancerMetricData.go b/service/lightsail/api_op_GetLoadBalancerMetricData.go index f6c1eb1af81..86e007d6847 100644 --- a/service/lightsail/api_op_GetLoadBalancerMetricData.go +++ b/service/lightsail/api_op_GetLoadBalancerMetricData.go @@ -187,6 +187,9 @@ func addOperationGetLoadBalancerMetricDataMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -229,6 +232,9 @@ func addOperationGetLoadBalancerMetricDataMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go b/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go index 45e2fa10afa..56d7489439d 100644 --- a/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go +++ b/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go @@ -58,6 +58,9 @@ func addOperationGetLoadBalancerTlsCertificatesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetLoadBalancerTlsCertificatesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetLoadBalancers.go b/service/lightsail/api_op_GetLoadBalancers.go index 2cbeab0f574..34af457f022 100644 --- a/service/lightsail/api_op_GetLoadBalancers.go +++ b/service/lightsail/api_op_GetLoadBalancers.go @@ -60,6 +60,9 @@ func addOperationGetLoadBalancersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetLoadBalancersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetOperation.go b/service/lightsail/api_op_GetOperation.go index a366e52aec7..0b5b3d02c72 100644 --- a/service/lightsail/api_op_GetOperation.go +++ b/service/lightsail/api_op_GetOperation.go @@ -57,6 +57,9 @@ func addOperationGetOperationMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetOperationMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetOperations.go b/service/lightsail/api_op_GetOperations.go index d79c9b570cb..122f698e38b 100644 --- a/service/lightsail/api_op_GetOperations.go +++ b/service/lightsail/api_op_GetOperations.go @@ -65,6 +65,9 @@ func addOperationGetOperationsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetOperationsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetOperationsForResource.go b/service/lightsail/api_op_GetOperationsForResource.go index eed773d5d46..cc9504860dd 100644 --- a/service/lightsail/api_op_GetOperationsForResource.go +++ b/service/lightsail/api_op_GetOperationsForResource.go @@ -72,6 +72,9 @@ func addOperationGetOperationsForResourceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetOperationsForResourceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRegions.go b/service/lightsail/api_op_GetRegions.go index c470ab8b806..f8a86c19649 100644 --- a/service/lightsail/api_op_GetRegions.go +++ b/service/lightsail/api_op_GetRegions.go @@ -60,6 +60,9 @@ func addOperationGetRegionsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetRegionsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabase.go b/service/lightsail/api_op_GetRelationalDatabase.go index ded951ae6bc..d9941ff5071 100644 --- a/service/lightsail/api_op_GetRelationalDatabase.go +++ b/service/lightsail/api_op_GetRelationalDatabase.go @@ -53,6 +53,9 @@ func addOperationGetRelationalDatabaseMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetRelationalDatabaseMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go b/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go index b84c4e30128..a3806a8cebf 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go +++ b/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go @@ -63,6 +63,9 @@ func addOperationGetRelationalDatabaseBlueprintsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetRelationalDatabaseBlueprintsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseBundles.go b/service/lightsail/api_op_GetRelationalDatabaseBundles.go index b55600dd468..1069f6e2231 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseBundles.go +++ b/service/lightsail/api_op_GetRelationalDatabaseBundles.go @@ -62,6 +62,9 @@ func addOperationGetRelationalDatabaseBundlesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetRelationalDatabaseBundlesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseEvents.go b/service/lightsail/api_op_GetRelationalDatabaseEvents.go index b59c48e95d1..14959524920 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseEvents.go +++ b/service/lightsail/api_op_GetRelationalDatabaseEvents.go @@ -70,6 +70,9 @@ func addOperationGetRelationalDatabaseEventsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetRelationalDatabaseEventsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go b/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go index 5dfed623cf2..2aac22fb7c8 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go +++ b/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go @@ -102,6 +102,9 @@ func addOperationGetRelationalDatabaseLogEventsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationGetRelationalDatabaseLogEventsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go b/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go index 4f0ab9699ec..15814ad6d36 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go +++ b/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go @@ -54,6 +54,9 @@ func addOperationGetRelationalDatabaseLogStreamsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetRelationalDatabaseLogStreamsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go b/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go index a467516c9cc..a18e8ff97ef 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go +++ b/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go @@ -68,6 +68,9 @@ func addOperationGetRelationalDatabaseMasterUserPasswordMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetRelationalDatabaseMasterUserPasswordMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseMetricData.go b/service/lightsail/api_op_GetRelationalDatabaseMetricData.go index 759770cbcef..ba0208da77e 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseMetricData.go +++ b/service/lightsail/api_op_GetRelationalDatabaseMetricData.go @@ -159,6 +159,9 @@ func addOperationGetRelationalDatabaseMetricDataMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -201,6 +204,9 @@ func addOperationGetRelationalDatabaseMetricDataMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseParameters.go b/service/lightsail/api_op_GetRelationalDatabaseParameters.go index 1dc0da69432..21d22f6ad68 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseParameters.go +++ b/service/lightsail/api_op_GetRelationalDatabaseParameters.go @@ -70,6 +70,9 @@ func addOperationGetRelationalDatabaseParametersMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetRelationalDatabaseParametersMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go b/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go index 1033171472f..7ee8e456ee5 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go +++ b/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go @@ -53,6 +53,9 @@ func addOperationGetRelationalDatabaseSnapshotMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetRelationalDatabaseSnapshotMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go b/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go index 92378ca6929..a59e543c64a 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go +++ b/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go @@ -61,6 +61,9 @@ func addOperationGetRelationalDatabaseSnapshotsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetRelationalDatabaseSnapshotsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetRelationalDatabases.go b/service/lightsail/api_op_GetRelationalDatabases.go index 4b2af72a7ef..1e4a6aba455 100644 --- a/service/lightsail/api_op_GetRelationalDatabases.go +++ b/service/lightsail/api_op_GetRelationalDatabases.go @@ -60,6 +60,9 @@ func addOperationGetRelationalDatabasesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetRelationalDatabasesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetStaticIp.go b/service/lightsail/api_op_GetStaticIp.go index cbad01638a6..46d95d91c2f 100644 --- a/service/lightsail/api_op_GetStaticIp.go +++ b/service/lightsail/api_op_GetStaticIp.go @@ -54,6 +54,9 @@ func addOperationGetStaticIpMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetStaticIpMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_GetStaticIps.go b/service/lightsail/api_op_GetStaticIps.go index 37608c7cbcb..6253c4a0aab 100644 --- a/service/lightsail/api_op_GetStaticIps.go +++ b/service/lightsail/api_op_GetStaticIps.go @@ -61,6 +61,9 @@ func addOperationGetStaticIpsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetStaticIpsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_ImportKeyPair.go b/service/lightsail/api_op_ImportKeyPair.go index 1a6fe642d5e..2d7ec51e3a7 100644 --- a/service/lightsail/api_op_ImportKeyPair.go +++ b/service/lightsail/api_op_ImportKeyPair.go @@ -60,6 +60,9 @@ func addOperationImportKeyPairMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationImportKeyPairMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_IsVpcPeered.go b/service/lightsail/api_op_IsVpcPeered.go index 2a79728aaf9..aac72478c8d 100644 --- a/service/lightsail/api_op_IsVpcPeered.go +++ b/service/lightsail/api_op_IsVpcPeered.go @@ -47,6 +47,9 @@ func addOperationIsVpcPeeredMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationIsVpcPeeredMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_OpenInstancePublicPorts.go b/service/lightsail/api_op_OpenInstancePublicPorts.go index 7e39a1a8212..94b9527724f 100644 --- a/service/lightsail/api_op_OpenInstancePublicPorts.go +++ b/service/lightsail/api_op_OpenInstancePublicPorts.go @@ -65,6 +65,9 @@ func addOperationOpenInstancePublicPortsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationOpenInstancePublicPortsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_PeerVpc.go b/service/lightsail/api_op_PeerVpc.go index ade896f5498..c20be6de904 100644 --- a/service/lightsail/api_op_PeerVpc.go +++ b/service/lightsail/api_op_PeerVpc.go @@ -50,6 +50,9 @@ func addOperationPeerVpcMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationPeerVpcMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_PutAlarm.go b/service/lightsail/api_op_PutAlarm.go index 9fd04f46595..8b49073aa46 100644 --- a/service/lightsail/api_op_PutAlarm.go +++ b/service/lightsail/api_op_PutAlarm.go @@ -191,6 +191,9 @@ func addOperationPutAlarmMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -233,6 +236,9 @@ func addOperationPutAlarmMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_PutInstancePublicPorts.go b/service/lightsail/api_op_PutInstancePublicPorts.go index 83e5d76ad86..3d2dd4f4ec6 100644 --- a/service/lightsail/api_op_PutInstancePublicPorts.go +++ b/service/lightsail/api_op_PutInstancePublicPorts.go @@ -69,6 +69,9 @@ func addOperationPutInstancePublicPortsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationPutInstancePublicPortsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_RebootInstance.go b/service/lightsail/api_op_RebootInstance.go index 2ddafdcfaa2..52db5b8933a 100644 --- a/service/lightsail/api_op_RebootInstance.go +++ b/service/lightsail/api_op_RebootInstance.go @@ -58,6 +58,9 @@ func addOperationRebootInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRebootInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_RebootRelationalDatabase.go b/service/lightsail/api_op_RebootRelationalDatabase.go index 91470729769..96b61efd394 100644 --- a/service/lightsail/api_op_RebootRelationalDatabase.go +++ b/service/lightsail/api_op_RebootRelationalDatabase.go @@ -59,6 +59,9 @@ func addOperationRebootRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRebootRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_ReleaseStaticIp.go b/service/lightsail/api_op_ReleaseStaticIp.go index 48000aa9911..ff975f31103 100644 --- a/service/lightsail/api_op_ReleaseStaticIp.go +++ b/service/lightsail/api_op_ReleaseStaticIp.go @@ -55,6 +55,9 @@ func addOperationReleaseStaticIpMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationReleaseStaticIpMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_ResetDistributionCache.go b/service/lightsail/api_op_ResetDistributionCache.go index 2adb20aac3f..4d5b874b023 100644 --- a/service/lightsail/api_op_ResetDistributionCache.go +++ b/service/lightsail/api_op_ResetDistributionCache.go @@ -64,6 +64,9 @@ func addOperationResetDistributionCacheMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationResetDistributionCacheMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_SendContactMethodVerification.go b/service/lightsail/api_op_SendContactMethodVerification.go index 16144a4f579..b67e775a271 100644 --- a/service/lightsail/api_op_SendContactMethodVerification.go +++ b/service/lightsail/api_op_SendContactMethodVerification.go @@ -66,6 +66,9 @@ func addOperationSendContactMethodVerificationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationSendContactMethodVerificationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_StartInstance.go b/service/lightsail/api_op_StartInstance.go index 137f148ba1f..77a2b50a68e 100644 --- a/service/lightsail/api_op_StartInstance.go +++ b/service/lightsail/api_op_StartInstance.go @@ -64,6 +64,9 @@ func addOperationStartInstanceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationStartInstanceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_StartRelationalDatabase.go b/service/lightsail/api_op_StartRelationalDatabase.go index 55adc9f6e95..7bf06ee9ef1 100644 --- a/service/lightsail/api_op_StartRelationalDatabase.go +++ b/service/lightsail/api_op_StartRelationalDatabase.go @@ -60,6 +60,9 @@ func addOperationStartRelationalDatabaseMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationStartRelationalDatabaseMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_StopInstance.go b/service/lightsail/api_op_StopInstance.go index 0a05e9b1be1..565e6f75c30 100644 --- a/service/lightsail/api_op_StopInstance.go +++ b/service/lightsail/api_op_StopInstance.go @@ -70,6 +70,9 @@ func addOperationStopInstanceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationStopInstanceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_StopRelationalDatabase.go b/service/lightsail/api_op_StopRelationalDatabase.go index f1da8ccde9d..fa6cfb49ed6 100644 --- a/service/lightsail/api_op_StopRelationalDatabase.go +++ b/service/lightsail/api_op_StopRelationalDatabase.go @@ -63,6 +63,9 @@ func addOperationStopRelationalDatabaseMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopRelationalDatabaseMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_TagResource.go b/service/lightsail/api_op_TagResource.go index fd39ea663ff..bbbb0e53f6d 100644 --- a/service/lightsail/api_op_TagResource.go +++ b/service/lightsail/api_op_TagResource.go @@ -71,6 +71,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_TestAlarm.go b/service/lightsail/api_op_TestAlarm.go index 206841ad92d..3a6c19aab81 100644 --- a/service/lightsail/api_op_TestAlarm.go +++ b/service/lightsail/api_op_TestAlarm.go @@ -77,6 +77,9 @@ func addOperationTestAlarmMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationTestAlarmMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UnpeerVpc.go b/service/lightsail/api_op_UnpeerVpc.go index 6dc4e46f6e7..848e199e48b 100644 --- a/service/lightsail/api_op_UnpeerVpc.go +++ b/service/lightsail/api_op_UnpeerVpc.go @@ -50,6 +50,9 @@ func addOperationUnpeerVpcMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationUnpeerVpcMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UntagResource.go b/service/lightsail/api_op_UntagResource.go index 4414350e1ef..c8d72610c99 100644 --- a/service/lightsail/api_op_UntagResource.go +++ b/service/lightsail/api_op_UntagResource.go @@ -68,6 +68,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UpdateDistribution.go b/service/lightsail/api_op_UpdateDistribution.go index ff05d816e81..e4a46434c88 100644 --- a/service/lightsail/api_op_UpdateDistribution.go +++ b/service/lightsail/api_op_UpdateDistribution.go @@ -78,6 +78,9 @@ func addOperationUpdateDistributionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateDistributionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UpdateDistributionBundle.go b/service/lightsail/api_op_UpdateDistributionBundle.go index 369d850ef66..6798abd3ad8 100644 --- a/service/lightsail/api_op_UpdateDistributionBundle.go +++ b/service/lightsail/api_op_UpdateDistributionBundle.go @@ -66,6 +66,9 @@ func addOperationUpdateDistributionBundleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateDistributionBundleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UpdateDomainEntry.go b/service/lightsail/api_op_UpdateDomainEntry.go index 7d2ed257939..828dd086810 100644 --- a/service/lightsail/api_op_UpdateDomainEntry.go +++ b/service/lightsail/api_op_UpdateDomainEntry.go @@ -64,6 +64,9 @@ func addOperationUpdateDomainEntryMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateDomainEntryMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UpdateLoadBalancerAttribute.go b/service/lightsail/api_op_UpdateLoadBalancerAttribute.go index 6cfe61f6d28..99098cbc68a 100644 --- a/service/lightsail/api_op_UpdateLoadBalancerAttribute.go +++ b/service/lightsail/api_op_UpdateLoadBalancerAttribute.go @@ -69,6 +69,9 @@ func addOperationUpdateLoadBalancerAttributeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateLoadBalancerAttributeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UpdateRelationalDatabase.go b/service/lightsail/api_op_UpdateRelationalDatabase.go index c6aa73423bc..484e14e8a4a 100644 --- a/service/lightsail/api_op_UpdateRelationalDatabase.go +++ b/service/lightsail/api_op_UpdateRelationalDatabase.go @@ -128,6 +128,9 @@ func addOperationUpdateRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationUpdateRelationalDatabaseMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go b/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go index 8c2bbed5eee..265269f16d9 100644 --- a/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go +++ b/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go @@ -70,6 +70,9 @@ func addOperationUpdateRelationalDatabaseParametersMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateRelationalDatabaseParametersMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/lightsail/go.mod b/service/lightsail/go.mod index 40be3b45fd2..6c94f850ef5 100644 --- a/service/lightsail/go.mod +++ b/service/lightsail/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/lightsail go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lightsail/go.sum b/service/lightsail/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/lightsail/go.sum +++ b/service/lightsail/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/machinelearning/api_client.go b/service/machinelearning/api_client.go index 7ad4329299f..301c923c9a1 100644 --- a/service/machinelearning/api_client.go +++ b/service/machinelearning/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/machinelearning/api_op_AddTags.go b/service/machinelearning/api_op_AddTags.go index 6a81cca1bfe..251b9efb700 100644 --- a/service/machinelearning/api_op_AddTags.go +++ b/service/machinelearning/api_op_AddTags.go @@ -71,6 +71,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateBatchPrediction.go b/service/machinelearning/api_op_CreateBatchPrediction.go index 4edc1906b9b..b903e6d8f81 100644 --- a/service/machinelearning/api_op_CreateBatchPrediction.go +++ b/service/machinelearning/api_op_CreateBatchPrediction.go @@ -92,6 +92,9 @@ func addOperationCreateBatchPredictionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreateBatchPredictionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateDataSourceFromRDS.go b/service/machinelearning/api_op_CreateDataSourceFromRDS.go index 9fbd90a9760..937f6f27984 100644 --- a/service/machinelearning/api_op_CreateDataSourceFromRDS.go +++ b/service/machinelearning/api_op_CreateDataSourceFromRDS.go @@ -141,6 +141,9 @@ func addOperationCreateDataSourceFromRDSMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationCreateDataSourceFromRDSMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateDataSourceFromRedshift.go b/service/machinelearning/api_op_CreateDataSourceFromRedshift.go index 2b6a3058cb6..26a1c0cc2f7 100644 --- a/service/machinelearning/api_op_CreateDataSourceFromRedshift.go +++ b/service/machinelearning/api_op_CreateDataSourceFromRedshift.go @@ -141,6 +141,9 @@ func addOperationCreateDataSourceFromRedshiftMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationCreateDataSourceFromRedshiftMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateDataSourceFromS3.go b/service/machinelearning/api_op_CreateDataSourceFromS3.go index 6c9dddc0cbc..ebb35e22544 100644 --- a/service/machinelearning/api_op_CreateDataSourceFromS3.go +++ b/service/machinelearning/api_op_CreateDataSourceFromS3.go @@ -108,6 +108,9 @@ func addOperationCreateDataSourceFromS3Middlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateDataSourceFromS3Middlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateEvaluation.go b/service/machinelearning/api_op_CreateEvaluation.go index cb65a86191f..aea706d6714 100644 --- a/service/machinelearning/api_op_CreateEvaluation.go +++ b/service/machinelearning/api_op_CreateEvaluation.go @@ -84,6 +84,9 @@ func addOperationCreateEvaluationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateEvaluationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateMLModel.go b/service/machinelearning/api_op_CreateMLModel.go index 27c8483c451..7e91582a3a9 100644 --- a/service/machinelearning/api_op_CreateMLModel.go +++ b/service/machinelearning/api_op_CreateMLModel.go @@ -139,6 +139,9 @@ func addOperationCreateMLModelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationCreateMLModelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_CreateRealtimeEndpoint.go b/service/machinelearning/api_op_CreateRealtimeEndpoint.go index 6218622632a..fe4469dbaeb 100644 --- a/service/machinelearning/api_op_CreateRealtimeEndpoint.go +++ b/service/machinelearning/api_op_CreateRealtimeEndpoint.go @@ -63,6 +63,9 @@ func addOperationCreateRealtimeEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateRealtimeEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DeleteBatchPrediction.go b/service/machinelearning/api_op_DeleteBatchPrediction.go index 1907ba6f32b..ad34a858aec 100644 --- a/service/machinelearning/api_op_DeleteBatchPrediction.go +++ b/service/machinelearning/api_op_DeleteBatchPrediction.go @@ -59,6 +59,9 @@ func addOperationDeleteBatchPredictionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteBatchPredictionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DeleteDataSource.go b/service/machinelearning/api_op_DeleteDataSource.go index aa5294abf79..affb231ab3c 100644 --- a/service/machinelearning/api_op_DeleteDataSource.go +++ b/service/machinelearning/api_op_DeleteDataSource.go @@ -57,6 +57,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DeleteEvaluation.go b/service/machinelearning/api_op_DeleteEvaluation.go index 061e3d1b232..b1caf4d21cd 100644 --- a/service/machinelearning/api_op_DeleteEvaluation.go +++ b/service/machinelearning/api_op_DeleteEvaluation.go @@ -60,6 +60,9 @@ func addOperationDeleteEvaluationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteEvaluationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DeleteMLModel.go b/service/machinelearning/api_op_DeleteMLModel.go index fd26c9279b1..d526a586c06 100644 --- a/service/machinelearning/api_op_DeleteMLModel.go +++ b/service/machinelearning/api_op_DeleteMLModel.go @@ -59,6 +59,9 @@ func addOperationDeleteMLModelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteMLModelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DeleteRealtimeEndpoint.go b/service/machinelearning/api_op_DeleteRealtimeEndpoint.go index d0c3f092e33..21769a066b4 100644 --- a/service/machinelearning/api_op_DeleteRealtimeEndpoint.go +++ b/service/machinelearning/api_op_DeleteRealtimeEndpoint.go @@ -59,6 +59,9 @@ func addOperationDeleteRealtimeEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteRealtimeEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DeleteTags.go b/service/machinelearning/api_op_DeleteTags.go index ec1f3a5bfd1..37c87d19be8 100644 --- a/service/machinelearning/api_op_DeleteTags.go +++ b/service/machinelearning/api_op_DeleteTags.go @@ -69,6 +69,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DescribeBatchPredictions.go b/service/machinelearning/api_op_DescribeBatchPredictions.go index b8f11c57c5c..c9072f2f9f0 100644 --- a/service/machinelearning/api_op_DescribeBatchPredictions.go +++ b/service/machinelearning/api_op_DescribeBatchPredictions.go @@ -139,6 +139,9 @@ func addOperationDescribeBatchPredictionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationDescribeBatchPredictionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DescribeDataSources.go b/service/machinelearning/api_op_DescribeDataSources.go index 6023fb9ff84..0762e50f2b3 100644 --- a/service/machinelearning/api_op_DescribeDataSources.go +++ b/service/machinelearning/api_op_DescribeDataSources.go @@ -130,6 +130,9 @@ func addOperationDescribeDataSourcesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationDescribeDataSourcesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DescribeEvaluations.go b/service/machinelearning/api_op_DescribeEvaluations.go index 8b2d5a4d217..69141724e50 100644 --- a/service/machinelearning/api_op_DescribeEvaluations.go +++ b/service/machinelearning/api_op_DescribeEvaluations.go @@ -137,6 +137,9 @@ func addOperationDescribeEvaluationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationDescribeEvaluationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DescribeMLModels.go b/service/machinelearning/api_op_DescribeMLModels.go index ccb329f9580..6934ecd7439 100644 --- a/service/machinelearning/api_op_DescribeMLModels.go +++ b/service/machinelearning/api_op_DescribeMLModels.go @@ -142,6 +142,9 @@ func addOperationDescribeMLModelsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationDescribeMLModelsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_DescribeTags.go b/service/machinelearning/api_op_DescribeTags.go index 68aec31064d..f01868f296e 100644 --- a/service/machinelearning/api_op_DescribeTags.go +++ b/service/machinelearning/api_op_DescribeTags.go @@ -65,6 +65,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_GetBatchPrediction.go b/service/machinelearning/api_op_GetBatchPrediction.go index 464dbb1778f..5c6607d716a 100644 --- a/service/machinelearning/api_op_GetBatchPrediction.go +++ b/service/machinelearning/api_op_GetBatchPrediction.go @@ -138,6 +138,9 @@ func addOperationGetBatchPredictionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationGetBatchPredictionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_GetDataSource.go b/service/machinelearning/api_op_GetDataSource.go index c1b1b3f7617..af3bacbf3d9 100644 --- a/service/machinelearning/api_op_GetDataSource.go +++ b/service/machinelearning/api_op_GetDataSource.go @@ -151,6 +151,9 @@ func addOperationGetDataSourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -193,6 +196,9 @@ func addOperationGetDataSourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_GetEvaluation.go b/service/machinelearning/api_op_GetEvaluation.go index f0d577200cd..aa223cf94a1 100644 --- a/service/machinelearning/api_op_GetEvaluation.go +++ b/service/machinelearning/api_op_GetEvaluation.go @@ -139,6 +139,9 @@ func addOperationGetEvaluationMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationGetEvaluationMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_GetMLModel.go b/service/machinelearning/api_op_GetMLModel.go index 0b5afa784c3..b32a89e5776 100644 --- a/service/machinelearning/api_op_GetMLModel.go +++ b/service/machinelearning/api_op_GetMLModel.go @@ -198,6 +198,9 @@ func addOperationGetMLModelMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -240,6 +243,9 @@ func addOperationGetMLModelMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_Predict.go b/service/machinelearning/api_op_Predict.go index db30d7de2fc..80c91cf4d0d 100644 --- a/service/machinelearning/api_op_Predict.go +++ b/service/machinelearning/api_op_Predict.go @@ -81,6 +81,9 @@ func addOperationPredictMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationPredictMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_UpdateBatchPrediction.go b/service/machinelearning/api_op_UpdateBatchPrediction.go index 98a1e6de1e5..56a6ea77a70 100644 --- a/service/machinelearning/api_op_UpdateBatchPrediction.go +++ b/service/machinelearning/api_op_UpdateBatchPrediction.go @@ -61,6 +61,9 @@ func addOperationUpdateBatchPredictionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateBatchPredictionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_UpdateDataSource.go b/service/machinelearning/api_op_UpdateDataSource.go index a52a14ef837..51c06210a5b 100644 --- a/service/machinelearning/api_op_UpdateDataSource.go +++ b/service/machinelearning/api_op_UpdateDataSource.go @@ -62,6 +62,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_UpdateEvaluation.go b/service/machinelearning/api_op_UpdateEvaluation.go index 4834eabaa94..1c26bf7b39d 100644 --- a/service/machinelearning/api_op_UpdateEvaluation.go +++ b/service/machinelearning/api_op_UpdateEvaluation.go @@ -62,6 +62,9 @@ func addOperationUpdateEvaluationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateEvaluationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/api_op_UpdateMLModel.go b/service/machinelearning/api_op_UpdateMLModel.go index 70426db93bb..dfade7b5eb7 100644 --- a/service/machinelearning/api_op_UpdateMLModel.go +++ b/service/machinelearning/api_op_UpdateMLModel.go @@ -66,6 +66,9 @@ func addOperationUpdateMLModelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateMLModelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/machinelearning/go.mod b/service/machinelearning/go.mod index 31de6e836d5..c0e224e2f35 100644 --- a/service/machinelearning/go.mod +++ b/service/machinelearning/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/machinelearning go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/machinelearning/go.sum b/service/machinelearning/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/machinelearning/go.sum +++ b/service/machinelearning/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/macie/api_client.go b/service/macie/api_client.go index 30190ba0c5b..4490c7ca175 100644 --- a/service/macie/api_client.go +++ b/service/macie/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/macie/api_op_AssociateMemberAccount.go b/service/macie/api_op_AssociateMemberAccount.go index 31e2a002504..c0d46131abd 100644 --- a/service/macie/api_op_AssociateMemberAccount.go +++ b/service/macie/api_op_AssociateMemberAccount.go @@ -50,6 +50,9 @@ func addOperationAssociateMemberAccountMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationAssociateMemberAccountMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/api_op_AssociateS3Resources.go b/service/macie/api_op_AssociateS3Resources.go index 364724fbd5c..b5d5b50bad7 100644 --- a/service/macie/api_op_AssociateS3Resources.go +++ b/service/macie/api_op_AssociateS3Resources.go @@ -63,6 +63,9 @@ func addOperationAssociateS3ResourcesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAssociateS3ResourcesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/api_op_DisassociateMemberAccount.go b/service/macie/api_op_DisassociateMemberAccount.go index c35e6f81909..fe21514deaf 100644 --- a/service/macie/api_op_DisassociateMemberAccount.go +++ b/service/macie/api_op_DisassociateMemberAccount.go @@ -48,6 +48,9 @@ func addOperationDisassociateMemberAccountMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDisassociateMemberAccountMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/api_op_DisassociateS3Resources.go b/service/macie/api_op_DisassociateS3Resources.go index b32c7381d07..d9eb62f6b92 100644 --- a/service/macie/api_op_DisassociateS3Resources.go +++ b/service/macie/api_op_DisassociateS3Resources.go @@ -64,6 +64,9 @@ func addOperationDisassociateS3ResourcesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDisassociateS3ResourcesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/api_op_ListMemberAccounts.go b/service/macie/api_op_ListMemberAccounts.go index 8daac8df38c..d10623b8a4e 100644 --- a/service/macie/api_op_ListMemberAccounts.go +++ b/service/macie/api_op_ListMemberAccounts.go @@ -66,6 +66,9 @@ func addOperationListMemberAccountsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListMemberAccountsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/api_op_ListS3Resources.go b/service/macie/api_op_ListS3Resources.go index 526cbdf2c3e..66f054476c5 100644 --- a/service/macie/api_op_ListS3Resources.go +++ b/service/macie/api_op_ListS3Resources.go @@ -72,6 +72,9 @@ func addOperationListS3ResourcesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListS3ResourcesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/api_op_UpdateS3Resources.go b/service/macie/api_op_UpdateS3Resources.go index 7a4ceff91ea..027793abf01 100644 --- a/service/macie/api_op_UpdateS3Resources.go +++ b/service/macie/api_op_UpdateS3Resources.go @@ -63,6 +63,9 @@ func addOperationUpdateS3ResourcesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateS3ResourcesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie/go.mod b/service/macie/go.mod index 158c832f8fa..bd83bc1d9cf 100644 --- a/service/macie/go.mod +++ b/service/macie/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/macie go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/macie/go.sum b/service/macie/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/macie/go.sum +++ b/service/macie/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/macie2/api_client.go b/service/macie2/api_client.go index b4c7bcc1e16..8332a29125b 100644 --- a/service/macie2/api_client.go +++ b/service/macie2/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/macie2/api_op_AcceptInvitation.go b/service/macie2/api_op_AcceptInvitation.go index ae79c7b1503..373fcecd559 100644 --- a/service/macie2/api_op_AcceptInvitation.go +++ b/service/macie2/api_op_AcceptInvitation.go @@ -54,6 +54,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_BatchGetCustomDataIdentifiers.go b/service/macie2/api_op_BatchGetCustomDataIdentifiers.go index 1da4bc4d37f..1fef9d4e666 100644 --- a/service/macie2/api_op_BatchGetCustomDataIdentifiers.go +++ b/service/macie2/api_op_BatchGetCustomDataIdentifiers.go @@ -57,6 +57,9 @@ func addOperationBatchGetCustomDataIdentifiersMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationBatchGetCustomDataIdentifiersMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_CreateClassificationJob.go b/service/macie2/api_op_CreateClassificationJob.go index 52fe756cb71..a5b99c5b827 100644 --- a/service/macie2/api_op_CreateClassificationJob.go +++ b/service/macie2/api_op_CreateClassificationJob.go @@ -111,6 +111,9 @@ func addOperationCreateClassificationJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationCreateClassificationJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_CreateCustomDataIdentifier.go b/service/macie2/api_op_CreateCustomDataIdentifier.go index 09bf7e4b697..14ca9f4b06a 100644 --- a/service/macie2/api_op_CreateCustomDataIdentifier.go +++ b/service/macie2/api_op_CreateCustomDataIdentifier.go @@ -97,6 +97,9 @@ func addOperationCreateCustomDataIdentifierMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateCustomDataIdentifierMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_CreateFindingsFilter.go b/service/macie2/api_op_CreateFindingsFilter.go index 9158d605160..3c7bb4e9387 100644 --- a/service/macie2/api_op_CreateFindingsFilter.go +++ b/service/macie2/api_op_CreateFindingsFilter.go @@ -95,6 +95,9 @@ func addOperationCreateFindingsFilterMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateFindingsFilterMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_CreateInvitations.go b/service/macie2/api_op_CreateInvitations.go index 85a42a018b7..5c7cba01846 100644 --- a/service/macie2/api_op_CreateInvitations.go +++ b/service/macie2/api_op_CreateInvitations.go @@ -66,6 +66,9 @@ func addOperationCreateInvitationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateInvitationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_CreateMember.go b/service/macie2/api_op_CreateMember.go index def401bc42d..0a3c4df5eae 100644 --- a/service/macie2/api_op_CreateMember.go +++ b/service/macie2/api_op_CreateMember.go @@ -60,6 +60,9 @@ func addOperationCreateMemberMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateMemberMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_CreateSampleFindings.go b/service/macie2/api_op_CreateSampleFindings.go index a69aa89766c..4c90940bde9 100644 --- a/service/macie2/api_op_CreateSampleFindings.go +++ b/service/macie2/api_op_CreateSampleFindings.go @@ -49,6 +49,9 @@ func addOperationCreateSampleFindingsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationCreateSampleFindingsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DeclineInvitations.go b/service/macie2/api_op_DeclineInvitations.go index 9071f6eb01b..b652a2f539a 100644 --- a/service/macie2/api_op_DeclineInvitations.go +++ b/service/macie2/api_op_DeclineInvitations.go @@ -57,6 +57,9 @@ func addOperationDeclineInvitationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeclineInvitationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DeleteCustomDataIdentifier.go b/service/macie2/api_op_DeleteCustomDataIdentifier.go index b2907fe307e..1b38103e9d1 100644 --- a/service/macie2/api_op_DeleteCustomDataIdentifier.go +++ b/service/macie2/api_op_DeleteCustomDataIdentifier.go @@ -49,6 +49,9 @@ func addOperationDeleteCustomDataIdentifierMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteCustomDataIdentifierMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DeleteFindingsFilter.go b/service/macie2/api_op_DeleteFindingsFilter.go index 038c98a7047..979d673ec87 100644 --- a/service/macie2/api_op_DeleteFindingsFilter.go +++ b/service/macie2/api_op_DeleteFindingsFilter.go @@ -49,6 +49,9 @@ func addOperationDeleteFindingsFilterMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteFindingsFilterMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DeleteInvitations.go b/service/macie2/api_op_DeleteInvitations.go index b3249b29c70..2e78957c1f9 100644 --- a/service/macie2/api_op_DeleteInvitations.go +++ b/service/macie2/api_op_DeleteInvitations.go @@ -57,6 +57,9 @@ func addOperationDeleteInvitationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteInvitationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DeleteMember.go b/service/macie2/api_op_DeleteMember.go index 40c3ea68ca0..d293ef8f1ac 100644 --- a/service/macie2/api_op_DeleteMember.go +++ b/service/macie2/api_op_DeleteMember.go @@ -49,6 +49,9 @@ func addOperationDeleteMemberMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteMemberMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DescribeBuckets.go b/service/macie2/api_op_DescribeBuckets.go index b377d524932..72288a9a026 100644 --- a/service/macie2/api_op_DescribeBuckets.go +++ b/service/macie2/api_op_DescribeBuckets.go @@ -68,6 +68,9 @@ func addOperationDescribeBucketsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeBucketsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DescribeClassificationJob.go b/service/macie2/api_op_DescribeClassificationJob.go index bcf76cd681c..b5ace808f58 100644 --- a/service/macie2/api_op_DescribeClassificationJob.go +++ b/service/macie2/api_op_DescribeClassificationJob.go @@ -141,6 +141,9 @@ func addOperationDescribeClassificationJobMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationDescribeClassificationJobMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DescribeOrganizationConfiguration.go b/service/macie2/api_op_DescribeOrganizationConfiguration.go index ea25b6ed9be..b3be8dd4dfb 100644 --- a/service/macie2/api_op_DescribeOrganizationConfiguration.go +++ b/service/macie2/api_op_DescribeOrganizationConfiguration.go @@ -52,6 +52,9 @@ func addOperationDescribeOrganizationConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDescribeOrganizationConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DisableMacie.go b/service/macie2/api_op_DisableMacie.go index c81c41e7ae2..29d17844228 100644 --- a/service/macie2/api_op_DisableMacie.go +++ b/service/macie2/api_op_DisableMacie.go @@ -43,6 +43,9 @@ func addOperationDisableMacieMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationDisableMacieMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DisableOrganizationAdminAccount.go b/service/macie2/api_op_DisableOrganizationAdminAccount.go index 9df0e529400..9a3607848c9 100644 --- a/service/macie2/api_op_DisableOrganizationAdminAccount.go +++ b/service/macie2/api_op_DisableOrganizationAdminAccount.go @@ -49,6 +49,9 @@ func addOperationDisableOrganizationAdminAccountMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisableOrganizationAdminAccountMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DisassociateFromMasterAccount.go b/service/macie2/api_op_DisassociateFromMasterAccount.go index 959e8996047..2397cde47b4 100644 --- a/service/macie2/api_op_DisassociateFromMasterAccount.go +++ b/service/macie2/api_op_DisassociateFromMasterAccount.go @@ -43,6 +43,9 @@ func addOperationDisassociateFromMasterAccountMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationDisassociateFromMasterAccountMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_DisassociateMember.go b/service/macie2/api_op_DisassociateMember.go index c091480c402..b654a41e504 100644 --- a/service/macie2/api_op_DisassociateMember.go +++ b/service/macie2/api_op_DisassociateMember.go @@ -49,6 +49,9 @@ func addOperationDisassociateMemberMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisassociateMemberMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_EnableMacie.go b/service/macie2/api_op_EnableMacie.go index f602f5b1eae..1081cfc4f24 100644 --- a/service/macie2/api_op_EnableMacie.go +++ b/service/macie2/api_op_EnableMacie.go @@ -59,6 +59,9 @@ func addOperationEnableMacieMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationEnableMacieMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_EnableOrganizationAdminAccount.go b/service/macie2/api_op_EnableOrganizationAdminAccount.go index 622f795a745..f59ab684938 100644 --- a/service/macie2/api_op_EnableOrganizationAdminAccount.go +++ b/service/macie2/api_op_EnableOrganizationAdminAccount.go @@ -55,6 +55,9 @@ func addOperationEnableOrganizationAdminAccountMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationEnableOrganizationAdminAccountMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetBucketStatistics.go b/service/macie2/api_op_GetBucketStatistics.go index 6ad2faa3469..e352f4632a3 100644 --- a/service/macie2/api_op_GetBucketStatistics.go +++ b/service/macie2/api_op_GetBucketStatistics.go @@ -97,6 +97,9 @@ func addOperationGetBucketStatisticsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationGetBucketStatisticsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetClassificationExportConfiguration.go b/service/macie2/api_op_GetClassificationExportConfiguration.go index 26bf0ec72e1..c6b38c500e1 100644 --- a/service/macie2/api_op_GetClassificationExportConfiguration.go +++ b/service/macie2/api_op_GetClassificationExportConfiguration.go @@ -49,6 +49,9 @@ func addOperationGetClassificationExportConfigurationMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGetClassificationExportConfigurationMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetCustomDataIdentifier.go b/service/macie2/api_op_GetCustomDataIdentifier.go index 7828fb831de..80fbd28e221 100644 --- a/service/macie2/api_op_GetCustomDataIdentifier.go +++ b/service/macie2/api_op_GetCustomDataIdentifier.go @@ -95,6 +95,9 @@ func addOperationGetCustomDataIdentifierMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationGetCustomDataIdentifierMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetFindingStatistics.go b/service/macie2/api_op_GetFindingStatistics.go index 6077435b599..e491e0128de 100644 --- a/service/macie2/api_op_GetFindingStatistics.go +++ b/service/macie2/api_op_GetFindingStatistics.go @@ -76,6 +76,9 @@ func addOperationGetFindingStatisticsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetFindingStatisticsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetFindings.go b/service/macie2/api_op_GetFindings.go index 2c77292be38..3265d27cf0f 100644 --- a/service/macie2/api_op_GetFindings.go +++ b/service/macie2/api_op_GetFindings.go @@ -58,6 +58,9 @@ func addOperationGetFindingsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetFindingsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetFindingsFilter.go b/service/macie2/api_op_GetFindingsFilter.go index c65fe971dc2..fd5aeca7208 100644 --- a/service/macie2/api_op_GetFindingsFilter.go +++ b/service/macie2/api_op_GetFindingsFilter.go @@ -80,6 +80,9 @@ func addOperationGetFindingsFilterMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetFindingsFilterMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetInvitationsCount.go b/service/macie2/api_op_GetInvitationsCount.go index 659df047b71..f213cf8eca5 100644 --- a/service/macie2/api_op_GetInvitationsCount.go +++ b/service/macie2/api_op_GetInvitationsCount.go @@ -49,6 +49,9 @@ func addOperationGetInvitationsCountMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGetInvitationsCountMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetMacieSession.go b/service/macie2/api_op_GetMacieSession.go index 46cac1a0c99..42175e42270 100644 --- a/service/macie2/api_op_GetMacieSession.go +++ b/service/macie2/api_op_GetMacieSession.go @@ -70,6 +70,9 @@ func addOperationGetMacieSessionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetMacieSessionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetMasterAccount.go b/service/macie2/api_op_GetMasterAccount.go index 918eef7d6f8..593f35a5dd3 100644 --- a/service/macie2/api_op_GetMasterAccount.go +++ b/service/macie2/api_op_GetMasterAccount.go @@ -51,6 +51,9 @@ func addOperationGetMasterAccountMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetMasterAccountMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetMember.go b/service/macie2/api_op_GetMember.go index 607c0e0be36..4b89167c6d5 100644 --- a/service/macie2/api_op_GetMember.go +++ b/service/macie2/api_op_GetMember.go @@ -83,6 +83,9 @@ func addOperationGetMemberMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetMemberMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetUsageStatistics.go b/service/macie2/api_op_GetUsageStatistics.go index 46212073009..9775ae5a8be 100644 --- a/service/macie2/api_op_GetUsageStatistics.go +++ b/service/macie2/api_op_GetUsageStatistics.go @@ -68,6 +68,9 @@ func addOperationGetUsageStatisticsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetUsageStatisticsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_GetUsageTotals.go b/service/macie2/api_op_GetUsageTotals.go index 625f0f73dd7..e508ba2b517 100644 --- a/service/macie2/api_op_GetUsageTotals.go +++ b/service/macie2/api_op_GetUsageTotals.go @@ -49,6 +49,9 @@ func addOperationGetUsageTotalsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGetUsageTotalsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListClassificationJobs.go b/service/macie2/api_op_ListClassificationJobs.go index 49d364178e7..f8883d7db96 100644 --- a/service/macie2/api_op_ListClassificationJobs.go +++ b/service/macie2/api_op_ListClassificationJobs.go @@ -66,6 +66,9 @@ func addOperationListClassificationJobsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListClassificationJobsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListCustomDataIdentifiers.go b/service/macie2/api_op_ListCustomDataIdentifiers.go index 76ca2910831..98b2e302333 100644 --- a/service/macie2/api_op_ListCustomDataIdentifiers.go +++ b/service/macie2/api_op_ListCustomDataIdentifiers.go @@ -60,6 +60,9 @@ func addOperationListCustomDataIdentifiersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListCustomDataIdentifiersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListFindings.go b/service/macie2/api_op_ListFindings.go index eaa5cd947b4..b7e0defbb21 100644 --- a/service/macie2/api_op_ListFindings.go +++ b/service/macie2/api_op_ListFindings.go @@ -66,6 +66,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListFindingsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListFindingsFilters.go b/service/macie2/api_op_ListFindingsFilters.go index 9e4c703e6e4..cc8e99fff8b 100644 --- a/service/macie2/api_op_ListFindingsFilters.go +++ b/service/macie2/api_op_ListFindingsFilters.go @@ -59,6 +59,9 @@ func addOperationListFindingsFiltersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListFindingsFiltersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListInvitations.go b/service/macie2/api_op_ListInvitations.go index 3b5e6a3c3d7..2ea02fe7f9e 100644 --- a/service/macie2/api_op_ListInvitations.go +++ b/service/macie2/api_op_ListInvitations.go @@ -60,6 +60,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListMembers.go b/service/macie2/api_op_ListMembers.go index ead5ff4e063..7cc3fc4599c 100644 --- a/service/macie2/api_op_ListMembers.go +++ b/service/macie2/api_op_ListMembers.go @@ -68,6 +68,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListOrganizationAdminAccounts.go b/service/macie2/api_op_ListOrganizationAdminAccounts.go index 790216d6a1d..4a3bb9abfad 100644 --- a/service/macie2/api_op_ListOrganizationAdminAccounts.go +++ b/service/macie2/api_op_ListOrganizationAdminAccounts.go @@ -61,6 +61,9 @@ func addOperationListOrganizationAdminAccountsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListOrganizationAdminAccountsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_ListTagsForResource.go b/service/macie2/api_op_ListTagsForResource.go index e399ab16d62..9d5c0c27e6b 100644 --- a/service/macie2/api_op_ListTagsForResource.go +++ b/service/macie2/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_PutClassificationExportConfiguration.go b/service/macie2/api_op_PutClassificationExportConfiguration.go index bb58f8f02d2..aabbc04464e 100644 --- a/service/macie2/api_op_PutClassificationExportConfiguration.go +++ b/service/macie2/api_op_PutClassificationExportConfiguration.go @@ -56,6 +56,9 @@ func addOperationPutClassificationExportConfigurationMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPutClassificationExportConfigurationMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_TagResource.go b/service/macie2/api_op_TagResource.go index 8a980a6cc9f..c984ea07ddd 100644 --- a/service/macie2/api_op_TagResource.go +++ b/service/macie2/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_TestCustomDataIdentifier.go b/service/macie2/api_op_TestCustomDataIdentifier.go index f4e5598acdb..3f7061bd9c6 100644 --- a/service/macie2/api_op_TestCustomDataIdentifier.go +++ b/service/macie2/api_op_TestCustomDataIdentifier.go @@ -80,6 +80,9 @@ func addOperationTestCustomDataIdentifierMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationTestCustomDataIdentifierMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_UntagResource.go b/service/macie2/api_op_UntagResource.go index cf2ccb1b873..2adfc57ac9e 100644 --- a/service/macie2/api_op_UntagResource.go +++ b/service/macie2/api_op_UntagResource.go @@ -57,6 +57,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_UpdateClassificationJob.go b/service/macie2/api_op_UpdateClassificationJob.go index 50656b2ad0a..4e511ae0bc3 100644 --- a/service/macie2/api_op_UpdateClassificationJob.go +++ b/service/macie2/api_op_UpdateClassificationJob.go @@ -70,6 +70,9 @@ func addOperationUpdateClassificationJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateClassificationJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_UpdateFindingsFilter.go b/service/macie2/api_op_UpdateFindingsFilter.go index 450234959fd..6d487c9cfc5 100644 --- a/service/macie2/api_op_UpdateFindingsFilter.go +++ b/service/macie2/api_op_UpdateFindingsFilter.go @@ -84,6 +84,9 @@ func addOperationUpdateFindingsFilterMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateFindingsFilterMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_UpdateMacieSession.go b/service/macie2/api_op_UpdateMacieSession.go index ce54167b728..27925f00aef 100644 --- a/service/macie2/api_op_UpdateMacieSession.go +++ b/service/macie2/api_op_UpdateMacieSession.go @@ -55,6 +55,9 @@ func addOperationUpdateMacieSessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUpdateMacieSessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_UpdateMemberSession.go b/service/macie2/api_op_UpdateMemberSession.go index fb2d204cb66..a5a4553e216 100644 --- a/service/macie2/api_op_UpdateMemberSession.go +++ b/service/macie2/api_op_UpdateMemberSession.go @@ -57,6 +57,9 @@ func addOperationUpdateMemberSessionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateMemberSessionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/api_op_UpdateOrganizationConfiguration.go b/service/macie2/api_op_UpdateOrganizationConfiguration.go index 06f980b12ec..4c3ca6e442f 100644 --- a/service/macie2/api_op_UpdateOrganizationConfiguration.go +++ b/service/macie2/api_op_UpdateOrganizationConfiguration.go @@ -49,6 +49,9 @@ func addOperationUpdateOrganizationConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationUpdateOrganizationConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/macie2/go.mod b/service/macie2/go.mod index 7e174ec02c3..af0c6ddcdbb 100644 --- a/service/macie2/go.mod +++ b/service/macie2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/macie2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/macie2/go.sum b/service/macie2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/macie2/go.sum +++ b/service/macie2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/managedblockchain/api_client.go b/service/managedblockchain/api_client.go index 76b60c63145..d9181519684 100644 --- a/service/managedblockchain/api_client.go +++ b/service/managedblockchain/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/managedblockchain/api_op_CreateMember.go b/service/managedblockchain/api_op_CreateMember.go index 3242bfb6ef9..68df8e72634 100644 --- a/service/managedblockchain/api_op_CreateMember.go +++ b/service/managedblockchain/api_op_CreateMember.go @@ -73,6 +73,9 @@ func addOperationCreateMemberMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateMemberMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_CreateNetwork.go b/service/managedblockchain/api_op_CreateNetwork.go index 6e24bc4acbb..1cd14e3cd73 100644 --- a/service/managedblockchain/api_op_CreateNetwork.go +++ b/service/managedblockchain/api_op_CreateNetwork.go @@ -92,6 +92,9 @@ func addOperationCreateNetworkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateNetworkMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_CreateNode.go b/service/managedblockchain/api_op_CreateNode.go index fd29448fc1e..668d89cbdfe 100644 --- a/service/managedblockchain/api_op_CreateNode.go +++ b/service/managedblockchain/api_op_CreateNode.go @@ -72,6 +72,9 @@ func addOperationCreateNodeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateNodeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_CreateProposal.go b/service/managedblockchain/api_op_CreateProposal.go index 6523fe9cd61..9bbb002d39b 100644 --- a/service/managedblockchain/api_op_CreateProposal.go +++ b/service/managedblockchain/api_op_CreateProposal.go @@ -82,6 +82,9 @@ func addOperationCreateProposalMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateProposalMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_DeleteMember.go b/service/managedblockchain/api_op_DeleteMember.go index 1fb2ee17cd8..828300eadfd 100644 --- a/service/managedblockchain/api_op_DeleteMember.go +++ b/service/managedblockchain/api_op_DeleteMember.go @@ -59,6 +59,9 @@ func addOperationDeleteMemberMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteMemberMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_DeleteNode.go b/service/managedblockchain/api_op_DeleteNode.go index 3c344dfddcb..13660bb9660 100644 --- a/service/managedblockchain/api_op_DeleteNode.go +++ b/service/managedblockchain/api_op_DeleteNode.go @@ -59,6 +59,9 @@ func addOperationDeleteNodeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteNodeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_GetMember.go b/service/managedblockchain/api_op_GetMember.go index 6ace5a701ed..c4782a647f2 100644 --- a/service/managedblockchain/api_op_GetMember.go +++ b/service/managedblockchain/api_op_GetMember.go @@ -58,6 +58,9 @@ func addOperationGetMemberMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetMemberMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_GetNetwork.go b/service/managedblockchain/api_op_GetNetwork.go index b9e7d7ac515..6a0f51f24ea 100644 --- a/service/managedblockchain/api_op_GetNetwork.go +++ b/service/managedblockchain/api_op_GetNetwork.go @@ -53,6 +53,9 @@ func addOperationGetNetworkMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetNetworkMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_GetNode.go b/service/managedblockchain/api_op_GetNode.go index 842e8d2a584..e2647be7960 100644 --- a/service/managedblockchain/api_op_GetNode.go +++ b/service/managedblockchain/api_op_GetNode.go @@ -63,6 +63,9 @@ func addOperationGetNodeMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetNodeMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_GetProposal.go b/service/managedblockchain/api_op_GetProposal.go index a3ebc109c53..7ceaf003274 100644 --- a/service/managedblockchain/api_op_GetProposal.go +++ b/service/managedblockchain/api_op_GetProposal.go @@ -58,6 +58,9 @@ func addOperationGetProposalMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetProposalMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_ListInvitations.go b/service/managedblockchain/api_op_ListInvitations.go index 7ed7b90d321..11568aa3ea5 100644 --- a/service/managedblockchain/api_op_ListInvitations.go +++ b/service/managedblockchain/api_op_ListInvitations.go @@ -57,6 +57,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_ListMembers.go b/service/managedblockchain/api_op_ListMembers.go index 97ea0c10c94..de34e600c91 100644 --- a/service/managedblockchain/api_op_ListMembers.go +++ b/service/managedblockchain/api_op_ListMembers.go @@ -76,6 +76,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_ListNetworks.go b/service/managedblockchain/api_op_ListNetworks.go index 2c8f375897e..2171195ed6b 100644 --- a/service/managedblockchain/api_op_ListNetworks.go +++ b/service/managedblockchain/api_op_ListNetworks.go @@ -70,6 +70,9 @@ func addOperationListNetworksMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListNetworksMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_ListNodes.go b/service/managedblockchain/api_op_ListNodes.go index 6823906a059..81b2f222406 100644 --- a/service/managedblockchain/api_op_ListNodes.go +++ b/service/managedblockchain/api_op_ListNodes.go @@ -72,6 +72,9 @@ func addOperationListNodesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListNodesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_ListProposalVotes.go b/service/managedblockchain/api_op_ListProposalVotes.go index 97a4574f975..5d19412740d 100644 --- a/service/managedblockchain/api_op_ListProposalVotes.go +++ b/service/managedblockchain/api_op_ListProposalVotes.go @@ -68,6 +68,9 @@ func addOperationListProposalVotesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListProposalVotesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_ListProposals.go b/service/managedblockchain/api_op_ListProposals.go index 53769619602..6fe6dd54b79 100644 --- a/service/managedblockchain/api_op_ListProposals.go +++ b/service/managedblockchain/api_op_ListProposals.go @@ -62,6 +62,9 @@ func addOperationListProposalsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListProposalsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_RejectInvitation.go b/service/managedblockchain/api_op_RejectInvitation.go index 0bf821bc01f..054944d140f 100644 --- a/service/managedblockchain/api_op_RejectInvitation.go +++ b/service/managedblockchain/api_op_RejectInvitation.go @@ -50,6 +50,9 @@ func addOperationRejectInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationRejectInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_UpdateMember.go b/service/managedblockchain/api_op_UpdateMember.go index 1a508862dd7..657fb78e10c 100644 --- a/service/managedblockchain/api_op_UpdateMember.go +++ b/service/managedblockchain/api_op_UpdateMember.go @@ -57,6 +57,9 @@ func addOperationUpdateMemberMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateMemberMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_UpdateNode.go b/service/managedblockchain/api_op_UpdateNode.go index fb33baabc91..7ebe0f884b3 100644 --- a/service/managedblockchain/api_op_UpdateNode.go +++ b/service/managedblockchain/api_op_UpdateNode.go @@ -62,6 +62,9 @@ func addOperationUpdateNodeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateNodeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/api_op_VoteOnProposal.go b/service/managedblockchain/api_op_VoteOnProposal.go index 09d46172181..00f31ded26f 100644 --- a/service/managedblockchain/api_op_VoteOnProposal.go +++ b/service/managedblockchain/api_op_VoteOnProposal.go @@ -66,6 +66,9 @@ func addOperationVoteOnProposalMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationVoteOnProposalMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/managedblockchain/go.mod b/service/managedblockchain/go.mod index be6fc9c4391..d4f6aded6d7 100644 --- a/service/managedblockchain/go.mod +++ b/service/managedblockchain/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/managedblockchain go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/managedblockchain/go.sum b/service/managedblockchain/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/managedblockchain/go.sum +++ b/service/managedblockchain/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/marketplacecatalog/api_client.go b/service/marketplacecatalog/api_client.go index b868ac1af8e..196ffc54c98 100644 --- a/service/marketplacecatalog/api_client.go +++ b/service/marketplacecatalog/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/marketplacecatalog/api_op_CancelChangeSet.go b/service/marketplacecatalog/api_op_CancelChangeSet.go index 677305d88cd..1e5c088c756 100644 --- a/service/marketplacecatalog/api_op_CancelChangeSet.go +++ b/service/marketplacecatalog/api_op_CancelChangeSet.go @@ -64,6 +64,9 @@ func addOperationCancelChangeSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCancelChangeSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecatalog/api_op_DescribeChangeSet.go b/service/marketplacecatalog/api_op_DescribeChangeSet.go index 1e3f1925af1..beb738a2053 100644 --- a/service/marketplacecatalog/api_op_DescribeChangeSet.go +++ b/service/marketplacecatalog/api_op_DescribeChangeSet.go @@ -92,6 +92,9 @@ func addOperationDescribeChangeSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeChangeSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecatalog/api_op_DescribeEntity.go b/service/marketplacecatalog/api_op_DescribeEntity.go index 8cfa481de8e..f1f7a561ad7 100644 --- a/service/marketplacecatalog/api_op_DescribeEntity.go +++ b/service/marketplacecatalog/api_op_DescribeEntity.go @@ -70,6 +70,9 @@ func addOperationDescribeEntityMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeEntityMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecatalog/api_op_ListChangeSets.go b/service/marketplacecatalog/api_op_ListChangeSets.go index 2c438322749..419610184d6 100644 --- a/service/marketplacecatalog/api_op_ListChangeSets.go +++ b/service/marketplacecatalog/api_op_ListChangeSets.go @@ -75,6 +75,9 @@ func addOperationListChangeSetsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListChangeSetsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecatalog/api_op_ListEntities.go b/service/marketplacecatalog/api_op_ListEntities.go index 14e0112b481..b9d5385c995 100644 --- a/service/marketplacecatalog/api_op_ListEntities.go +++ b/service/marketplacecatalog/api_op_ListEntities.go @@ -75,6 +75,9 @@ func addOperationListEntitiesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListEntitiesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecatalog/api_op_StartChangeSet.go b/service/marketplacecatalog/api_op_StartChangeSet.go index c5b5757d8ae..ec37d7d7351 100644 --- a/service/marketplacecatalog/api_op_StartChangeSet.go +++ b/service/marketplacecatalog/api_op_StartChangeSet.go @@ -78,6 +78,9 @@ func addOperationStartChangeSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationStartChangeSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecatalog/go.mod b/service/marketplacecatalog/go.mod index b355580351c..da1ea95a36e 100644 --- a/service/marketplacecatalog/go.mod +++ b/service/marketplacecatalog/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacecatalog go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacecatalog/go.sum b/service/marketplacecatalog/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/marketplacecatalog/go.sum +++ b/service/marketplacecatalog/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/marketplacecommerceanalytics/api_client.go b/service/marketplacecommerceanalytics/api_client.go index 725fb436365..68840f70aa8 100644 --- a/service/marketplacecommerceanalytics/api_client.go +++ b/service/marketplacecommerceanalytics/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go b/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go index 97208e94cbf..8d1bb2b73f2 100644 --- a/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go +++ b/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go @@ -200,6 +200,9 @@ func addOperationGenerateDataSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -242,6 +245,9 @@ func addOperationGenerateDataSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go b/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go index c6fad16f656..ae2cebf7c09 100644 --- a/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go +++ b/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go @@ -117,6 +117,9 @@ func addOperationStartSupportDataExportMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationStartSupportDataExportMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacecommerceanalytics/go.mod b/service/marketplacecommerceanalytics/go.mod index d4b8da78a92..7d6a8a5247b 100644 --- a/service/marketplacecommerceanalytics/go.mod +++ b/service/marketplacecommerceanalytics/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacecommerceanalytics go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacecommerceanalytics/go.sum b/service/marketplacecommerceanalytics/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/marketplacecommerceanalytics/go.sum +++ b/service/marketplacecommerceanalytics/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/marketplaceentitlementservice/api_client.go b/service/marketplaceentitlementservice/api_client.go index 91490b4bfac..3495c70c555 100644 --- a/service/marketplaceentitlementservice/api_client.go +++ b/service/marketplaceentitlementservice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/marketplaceentitlementservice/api_op_GetEntitlements.go b/service/marketplaceentitlementservice/api_op_GetEntitlements.go index af9524fb209..b853b19f961 100644 --- a/service/marketplaceentitlementservice/api_op_GetEntitlements.go +++ b/service/marketplaceentitlementservice/api_op_GetEntitlements.go @@ -80,6 +80,9 @@ func addOperationGetEntitlementsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetEntitlementsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplaceentitlementservice/go.mod b/service/marketplaceentitlementservice/go.mod index f4042fe4129..baeb0222a06 100644 --- a/service/marketplaceentitlementservice/go.mod +++ b/service/marketplaceentitlementservice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/marketplaceentitlementservice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplaceentitlementservice/go.sum b/service/marketplaceentitlementservice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/marketplaceentitlementservice/go.sum +++ b/service/marketplaceentitlementservice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/marketplacemetering/api_client.go b/service/marketplacemetering/api_client.go index dc4139e3006..b888dccfbad 100644 --- a/service/marketplacemetering/api_client.go +++ b/service/marketplacemetering/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/marketplacemetering/api_op_BatchMeterUsage.go b/service/marketplacemetering/api_op_BatchMeterUsage.go index a2ee20698c9..1d90bf6929a 100644 --- a/service/marketplacemetering/api_op_BatchMeterUsage.go +++ b/service/marketplacemetering/api_op_BatchMeterUsage.go @@ -76,6 +76,9 @@ func addOperationBatchMeterUsageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationBatchMeterUsageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacemetering/api_op_MeterUsage.go b/service/marketplacemetering/api_op_MeterUsage.go index b477d8f1d35..688f6e3be1a 100644 --- a/service/marketplacemetering/api_op_MeterUsage.go +++ b/service/marketplacemetering/api_op_MeterUsage.go @@ -80,6 +80,9 @@ func addOperationMeterUsageMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationMeterUsageMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacemetering/api_op_RegisterUsage.go b/service/marketplacemetering/api_op_RegisterUsage.go index 4f6be5e4d15..d6b6570c047 100644 --- a/service/marketplacemetering/api_op_RegisterUsage.go +++ b/service/marketplacemetering/api_op_RegisterUsage.go @@ -98,6 +98,9 @@ func addOperationRegisterUsageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationRegisterUsageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacemetering/api_op_ResolveCustomer.go b/service/marketplacemetering/api_op_ResolveCustomer.go index c1e18b98680..fdd1edd145a 100644 --- a/service/marketplacemetering/api_op_ResolveCustomer.go +++ b/service/marketplacemetering/api_op_ResolveCustomer.go @@ -67,6 +67,9 @@ func addOperationResolveCustomerMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationResolveCustomerMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/marketplacemetering/go.mod b/service/marketplacemetering/go.mod index 2e224147bda..0aeb02db4f1 100644 --- a/service/marketplacemetering/go.mod +++ b/service/marketplacemetering/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacemetering go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacemetering/go.sum b/service/marketplacemetering/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/marketplacemetering/go.sum +++ b/service/marketplacemetering/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediaconnect/api_client.go b/service/mediaconnect/api_client.go index 29095c97949..74177b04b64 100644 --- a/service/mediaconnect/api_client.go +++ b/service/mediaconnect/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediaconnect/api_op_AddFlowOutputs.go b/service/mediaconnect/api_op_AddFlowOutputs.go index ec3ac7fb531..e477ad66958 100644 --- a/service/mediaconnect/api_op_AddFlowOutputs.go +++ b/service/mediaconnect/api_op_AddFlowOutputs.go @@ -62,6 +62,9 @@ func addOperationAddFlowOutputsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAddFlowOutputsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_AddFlowSources.go b/service/mediaconnect/api_op_AddFlowSources.go index 494727d1008..64d06280fbd 100644 --- a/service/mediaconnect/api_op_AddFlowSources.go +++ b/service/mediaconnect/api_op_AddFlowSources.go @@ -62,6 +62,9 @@ func addOperationAddFlowSourcesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAddFlowSourcesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_AddFlowVpcInterfaces.go b/service/mediaconnect/api_op_AddFlowVpcInterfaces.go index c66bfe1ec8e..14fe7c9cc88 100644 --- a/service/mediaconnect/api_op_AddFlowVpcInterfaces.go +++ b/service/mediaconnect/api_op_AddFlowVpcInterfaces.go @@ -62,6 +62,9 @@ func addOperationAddFlowVpcInterfacesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAddFlowVpcInterfacesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_CreateFlow.go b/service/mediaconnect/api_op_CreateFlow.go index a5d52242148..5d9ae08dd28 100644 --- a/service/mediaconnect/api_op_CreateFlow.go +++ b/service/mediaconnect/api_op_CreateFlow.go @@ -77,6 +77,9 @@ func addOperationCreateFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_DeleteFlow.go b/service/mediaconnect/api_op_DeleteFlow.go index 081b4d8bcf1..5e78c4cf003 100644 --- a/service/mediaconnect/api_op_DeleteFlow.go +++ b/service/mediaconnect/api_op_DeleteFlow.go @@ -56,6 +56,9 @@ func addOperationDeleteFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_DescribeFlow.go b/service/mediaconnect/api_op_DescribeFlow.go index 2e0df165472..b0e1736e34c 100644 --- a/service/mediaconnect/api_op_DescribeFlow.go +++ b/service/mediaconnect/api_op_DescribeFlow.go @@ -58,6 +58,9 @@ func addOperationDescribeFlowMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeFlowMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_DescribeOffering.go b/service/mediaconnect/api_op_DescribeOffering.go index b486ae460fd..3ddd6674cd1 100644 --- a/service/mediaconnect/api_op_DescribeOffering.go +++ b/service/mediaconnect/api_op_DescribeOffering.go @@ -56,6 +56,9 @@ func addOperationDescribeOfferingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeOfferingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_DescribeReservation.go b/service/mediaconnect/api_op_DescribeReservation.go index 548604d8e45..57c44a6b557 100644 --- a/service/mediaconnect/api_op_DescribeReservation.go +++ b/service/mediaconnect/api_op_DescribeReservation.go @@ -60,6 +60,9 @@ func addOperationDescribeReservationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeReservationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_GrantFlowEntitlements.go b/service/mediaconnect/api_op_GrantFlowEntitlements.go index eeff8fb68de..58eac891893 100644 --- a/service/mediaconnect/api_op_GrantFlowEntitlements.go +++ b/service/mediaconnect/api_op_GrantFlowEntitlements.go @@ -62,6 +62,9 @@ func addOperationGrantFlowEntitlementsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGrantFlowEntitlementsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_ListEntitlements.go b/service/mediaconnect/api_op_ListEntitlements.go index ce4293a46dd..07898a2c638 100644 --- a/service/mediaconnect/api_op_ListEntitlements.go +++ b/service/mediaconnect/api_op_ListEntitlements.go @@ -72,6 +72,9 @@ func addOperationListEntitlementsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListEntitlementsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_ListFlows.go b/service/mediaconnect/api_op_ListFlows.go index c6060463ca3..888540ea559 100644 --- a/service/mediaconnect/api_op_ListFlows.go +++ b/service/mediaconnect/api_op_ListFlows.go @@ -72,6 +72,9 @@ func addOperationListFlowsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListFlowsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_ListOfferings.go b/service/mediaconnect/api_op_ListOfferings.go index 9882d40c316..02089f64a5f 100644 --- a/service/mediaconnect/api_op_ListOfferings.go +++ b/service/mediaconnect/api_op_ListOfferings.go @@ -75,6 +75,9 @@ func addOperationListOfferingsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListOfferingsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_ListReservations.go b/service/mediaconnect/api_op_ListReservations.go index c5ece9ece17..c3f7e9ad0b7 100644 --- a/service/mediaconnect/api_op_ListReservations.go +++ b/service/mediaconnect/api_op_ListReservations.go @@ -74,6 +74,9 @@ func addOperationListReservationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListReservationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_ListTagsForResource.go b/service/mediaconnect/api_op_ListTagsForResource.go index ce12348a2cf..101400bb62d 100644 --- a/service/mediaconnect/api_op_ListTagsForResource.go +++ b/service/mediaconnect/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_PurchaseOffering.go b/service/mediaconnect/api_op_PurchaseOffering.go index 4cc4eafd220..b1821ebbc30 100644 --- a/service/mediaconnect/api_op_PurchaseOffering.go +++ b/service/mediaconnect/api_op_PurchaseOffering.go @@ -75,6 +75,9 @@ func addOperationPurchaseOfferingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationPurchaseOfferingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_RemoveFlowOutput.go b/service/mediaconnect/api_op_RemoveFlowOutput.go index d4abff02c95..12bc5cffa7f 100644 --- a/service/mediaconnect/api_op_RemoveFlowOutput.go +++ b/service/mediaconnect/api_op_RemoveFlowOutput.go @@ -63,6 +63,9 @@ func addOperationRemoveFlowOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRemoveFlowOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_RemoveFlowSource.go b/service/mediaconnect/api_op_RemoveFlowSource.go index 76b571f82c2..f225abe7e05 100644 --- a/service/mediaconnect/api_op_RemoveFlowSource.go +++ b/service/mediaconnect/api_op_RemoveFlowSource.go @@ -61,6 +61,9 @@ func addOperationRemoveFlowSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRemoveFlowSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_RemoveFlowVpcInterface.go b/service/mediaconnect/api_op_RemoveFlowVpcInterface.go index 43c4acef282..8ce21109c87 100644 --- a/service/mediaconnect/api_op_RemoveFlowVpcInterface.go +++ b/service/mediaconnect/api_op_RemoveFlowVpcInterface.go @@ -67,6 +67,9 @@ func addOperationRemoveFlowVpcInterfaceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRemoveFlowVpcInterfaceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_RevokeFlowEntitlement.go b/service/mediaconnect/api_op_RevokeFlowEntitlement.go index 66a9c8e6d4a..326b20f5d07 100644 --- a/service/mediaconnect/api_op_RevokeFlowEntitlement.go +++ b/service/mediaconnect/api_op_RevokeFlowEntitlement.go @@ -61,6 +61,9 @@ func addOperationRevokeFlowEntitlementMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRevokeFlowEntitlementMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_StartFlow.go b/service/mediaconnect/api_op_StartFlow.go index 3962a9e37d4..115d8f9cc0d 100644 --- a/service/mediaconnect/api_op_StartFlow.go +++ b/service/mediaconnect/api_op_StartFlow.go @@ -56,6 +56,9 @@ func addOperationStartFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_StopFlow.go b/service/mediaconnect/api_op_StopFlow.go index f40bb30660c..3ccc31205f0 100644 --- a/service/mediaconnect/api_op_StopFlow.go +++ b/service/mediaconnect/api_op_StopFlow.go @@ -56,6 +56,9 @@ func addOperationStopFlowMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopFlowMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_TagResource.go b/service/mediaconnect/api_op_TagResource.go index b72f807910e..5ab8250e0e2 100644 --- a/service/mediaconnect/api_op_TagResource.go +++ b/service/mediaconnect/api_op_TagResource.go @@ -61,6 +61,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_UntagResource.go b/service/mediaconnect/api_op_UntagResource.go index 5eb035b73d9..099d68d415b 100644 --- a/service/mediaconnect/api_op_UntagResource.go +++ b/service/mediaconnect/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_UpdateFlow.go b/service/mediaconnect/api_op_UpdateFlow.go index 09a55ebbd7c..d20656abefa 100644 --- a/service/mediaconnect/api_op_UpdateFlow.go +++ b/service/mediaconnect/api_op_UpdateFlow.go @@ -57,6 +57,9 @@ func addOperationUpdateFlowMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateFlowMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_UpdateFlowEntitlement.go b/service/mediaconnect/api_op_UpdateFlowEntitlement.go index e53439aa427..0838f98cbd1 100644 --- a/service/mediaconnect/api_op_UpdateFlowEntitlement.go +++ b/service/mediaconnect/api_op_UpdateFlowEntitlement.go @@ -84,6 +84,9 @@ func addOperationUpdateFlowEntitlementMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateFlowEntitlementMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_UpdateFlowOutput.go b/service/mediaconnect/api_op_UpdateFlowOutput.go index 5c99e91ff30..0c0af87033c 100644 --- a/service/mediaconnect/api_op_UpdateFlowOutput.go +++ b/service/mediaconnect/api_op_UpdateFlowOutput.go @@ -100,6 +100,9 @@ func addOperationUpdateFlowOutputMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationUpdateFlowOutputMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/api_op_UpdateFlowSource.go b/service/mediaconnect/api_op_UpdateFlowSource.go index 334919b3364..5e371a84e10 100644 --- a/service/mediaconnect/api_op_UpdateFlowSource.go +++ b/service/mediaconnect/api_op_UpdateFlowSource.go @@ -99,6 +99,9 @@ func addOperationUpdateFlowSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationUpdateFlowSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconnect/go.mod b/service/mediaconnect/go.mod index 790df82bc4a..d13c73d5e29 100644 --- a/service/mediaconnect/go.mod +++ b/service/mediaconnect/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediaconnect go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediaconnect/go.sum b/service/mediaconnect/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediaconnect/go.sum +++ b/service/mediaconnect/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediaconvert/api_client.go b/service/mediaconvert/api_client.go index be326ca9888..2b07af60d31 100644 --- a/service/mediaconvert/api_client.go +++ b/service/mediaconvert/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediaconvert/api_op_AssociateCertificate.go b/service/mediaconvert/api_op_AssociateCertificate.go index 2f24ea4dd58..67310190985 100644 --- a/service/mediaconvert/api_op_AssociateCertificate.go +++ b/service/mediaconvert/api_op_AssociateCertificate.go @@ -50,6 +50,9 @@ func addOperationAssociateCertificateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationAssociateCertificateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_CancelJob.go b/service/mediaconvert/api_op_CancelJob.go index 76b864c85df..f9f042cc993 100644 --- a/service/mediaconvert/api_op_CancelJob.go +++ b/service/mediaconvert/api_op_CancelJob.go @@ -49,6 +49,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_CreateJob.go b/service/mediaconvert/api_op_CreateJob.go index 4cf1decf6c7..509110b4412 100644 --- a/service/mediaconvert/api_op_CreateJob.go +++ b/service/mediaconvert/api_op_CreateJob.go @@ -124,6 +124,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_CreateJobTemplate.go b/service/mediaconvert/api_op_CreateJobTemplate.go index ba8123039ec..76e0efe1a8b 100644 --- a/service/mediaconvert/api_op_CreateJobTemplate.go +++ b/service/mediaconvert/api_op_CreateJobTemplate.go @@ -99,6 +99,9 @@ func addOperationCreateJobTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreateJobTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_CreatePreset.go b/service/mediaconvert/api_op_CreatePreset.go index f96093c205f..0e60e66a177 100644 --- a/service/mediaconvert/api_op_CreatePreset.go +++ b/service/mediaconvert/api_op_CreatePreset.go @@ -70,6 +70,9 @@ func addOperationCreatePresetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreatePresetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_CreateQueue.go b/service/mediaconvert/api_op_CreateQueue.go index 0227579cc6e..a0ca67a764a 100644 --- a/service/mediaconvert/api_op_CreateQueue.go +++ b/service/mediaconvert/api_op_CreateQueue.go @@ -81,6 +81,9 @@ func addOperationCreateQueueMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateQueueMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_DeleteJobTemplate.go b/service/mediaconvert/api_op_DeleteJobTemplate.go index ee96568c07b..8d6e25b201d 100644 --- a/service/mediaconvert/api_op_DeleteJobTemplate.go +++ b/service/mediaconvert/api_op_DeleteJobTemplate.go @@ -48,6 +48,9 @@ func addOperationDeleteJobTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteJobTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_DeletePreset.go b/service/mediaconvert/api_op_DeletePreset.go index 0dff1bd74e9..575c8387e19 100644 --- a/service/mediaconvert/api_op_DeletePreset.go +++ b/service/mediaconvert/api_op_DeletePreset.go @@ -48,6 +48,9 @@ func addOperationDeletePresetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeletePresetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_DeleteQueue.go b/service/mediaconvert/api_op_DeleteQueue.go index 616ed3f1233..46ef3b68dde 100644 --- a/service/mediaconvert/api_op_DeleteQueue.go +++ b/service/mediaconvert/api_op_DeleteQueue.go @@ -48,6 +48,9 @@ func addOperationDeleteQueueMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteQueueMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_DescribeEndpoints.go b/service/mediaconvert/api_op_DescribeEndpoints.go index 3bea3b735c3..6bea28dfc08 100644 --- a/service/mediaconvert/api_op_DescribeEndpoints.go +++ b/service/mediaconvert/api_op_DescribeEndpoints.go @@ -67,6 +67,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_DisassociateCertificate.go b/service/mediaconvert/api_op_DisassociateCertificate.go index d8889a0b8a3..3dbe93abac0 100644 --- a/service/mediaconvert/api_op_DisassociateCertificate.go +++ b/service/mediaconvert/api_op_DisassociateCertificate.go @@ -51,6 +51,9 @@ func addOperationDisassociateCertificateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDisassociateCertificateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_GetJob.go b/service/mediaconvert/api_op_GetJob.go index faf33a0eb52..5b0ba30f681 100644 --- a/service/mediaconvert/api_op_GetJob.go +++ b/service/mediaconvert/api_op_GetJob.go @@ -55,6 +55,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetJobMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_GetJobTemplate.go b/service/mediaconvert/api_op_GetJobTemplate.go index e177bbd3c4e..2edb5700afc 100644 --- a/service/mediaconvert/api_op_GetJobTemplate.go +++ b/service/mediaconvert/api_op_GetJobTemplate.go @@ -54,6 +54,9 @@ func addOperationGetJobTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetJobTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_GetPreset.go b/service/mediaconvert/api_op_GetPreset.go index fd26aeec159..f9e2ad53fa2 100644 --- a/service/mediaconvert/api_op_GetPreset.go +++ b/service/mediaconvert/api_op_GetPreset.go @@ -54,6 +54,9 @@ func addOperationGetPresetMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetPresetMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_GetQueue.go b/service/mediaconvert/api_op_GetQueue.go index 73e695f7536..053dc3ad9db 100644 --- a/service/mediaconvert/api_op_GetQueue.go +++ b/service/mediaconvert/api_op_GetQueue.go @@ -57,6 +57,9 @@ func addOperationGetQueueMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetQueueMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_ListJobTemplates.go b/service/mediaconvert/api_op_ListJobTemplates.go index 2d56be5810a..2abaae01140 100644 --- a/service/mediaconvert/api_op_ListJobTemplates.go +++ b/service/mediaconvert/api_op_ListJobTemplates.go @@ -74,6 +74,9 @@ func addOperationListJobTemplatesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListJobTemplatesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_ListJobs.go b/service/mediaconvert/api_op_ListJobs.go index 681e234f0a5..2fffd73a999 100644 --- a/service/mediaconvert/api_op_ListJobs.go +++ b/service/mediaconvert/api_op_ListJobs.go @@ -72,6 +72,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_ListPresets.go b/service/mediaconvert/api_op_ListPresets.go index 8e2c32338e0..c4c239fd37d 100644 --- a/service/mediaconvert/api_op_ListPresets.go +++ b/service/mediaconvert/api_op_ListPresets.go @@ -73,6 +73,9 @@ func addOperationListPresetsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListPresetsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_ListQueues.go b/service/mediaconvert/api_op_ListQueues.go index be91629913d..a06e5286807 100644 --- a/service/mediaconvert/api_op_ListQueues.go +++ b/service/mediaconvert/api_op_ListQueues.go @@ -69,6 +69,9 @@ func addOperationListQueuesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListQueuesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_ListTagsForResource.go b/service/mediaconvert/api_op_ListTagsForResource.go index 257c75047ab..1dcb8b7b0c9 100644 --- a/service/mediaconvert/api_op_ListTagsForResource.go +++ b/service/mediaconvert/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_TagResource.go b/service/mediaconvert/api_op_TagResource.go index 4b0e0a63a39..542db46e9d6 100644 --- a/service/mediaconvert/api_op_TagResource.go +++ b/service/mediaconvert/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_UntagResource.go b/service/mediaconvert/api_op_UntagResource.go index dc5332a49ba..502eabfcc55 100644 --- a/service/mediaconvert/api_op_UntagResource.go +++ b/service/mediaconvert/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_UpdateJobTemplate.go b/service/mediaconvert/api_op_UpdateJobTemplate.go index 8871407c9bc..a8b7259764d 100644 --- a/service/mediaconvert/api_op_UpdateJobTemplate.go +++ b/service/mediaconvert/api_op_UpdateJobTemplate.go @@ -88,6 +88,9 @@ func addOperationUpdateJobTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationUpdateJobTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_UpdatePreset.go b/service/mediaconvert/api_op_UpdatePreset.go index 1ba3641812c..12dd4fb9b50 100644 --- a/service/mediaconvert/api_op_UpdatePreset.go +++ b/service/mediaconvert/api_op_UpdatePreset.go @@ -63,6 +63,9 @@ func addOperationUpdatePresetMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdatePresetMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/api_op_UpdateQueue.go b/service/mediaconvert/api_op_UpdateQueue.go index 3974e17ea57..e1fffd6674e 100644 --- a/service/mediaconvert/api_op_UpdateQueue.go +++ b/service/mediaconvert/api_op_UpdateQueue.go @@ -72,6 +72,9 @@ func addOperationUpdateQueueMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateQueueMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediaconvert/go.mod b/service/mediaconvert/go.mod index b05bf7fb010..f3f2944bcaf 100644 --- a/service/mediaconvert/go.mod +++ b/service/mediaconvert/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediaconvert go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediaconvert/go.sum b/service/mediaconvert/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediaconvert/go.sum +++ b/service/mediaconvert/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/medialive/api_client.go b/service/medialive/api_client.go index a9e3984626e..598e6bcb228 100644 --- a/service/medialive/api_client.go +++ b/service/medialive/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/medialive/api_op_AcceptInputDeviceTransfer.go b/service/medialive/api_op_AcceptInputDeviceTransfer.go index 15bcb4bf586..8e16444ae5a 100644 --- a/service/medialive/api_op_AcceptInputDeviceTransfer.go +++ b/service/medialive/api_op_AcceptInputDeviceTransfer.go @@ -51,6 +51,9 @@ func addOperationAcceptInputDeviceTransferMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationAcceptInputDeviceTransferMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_BatchDelete.go b/service/medialive/api_op_BatchDelete.go index cee69a03035..f79d27e9dc3 100644 --- a/service/medialive/api_op_BatchDelete.go +++ b/service/medialive/api_op_BatchDelete.go @@ -65,6 +65,9 @@ func addOperationBatchDeleteMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationBatchDeleteMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_BatchStart.go b/service/medialive/api_op_BatchStart.go index 007fecf64e9..3be65669946 100644 --- a/service/medialive/api_op_BatchStart.go +++ b/service/medialive/api_op_BatchStart.go @@ -59,6 +59,9 @@ func addOperationBatchStartMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchStartMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_BatchStop.go b/service/medialive/api_op_BatchStop.go index ea358475c34..0d6d41fd1f5 100644 --- a/service/medialive/api_op_BatchStop.go +++ b/service/medialive/api_op_BatchStop.go @@ -59,6 +59,9 @@ func addOperationBatchStopMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchStopMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_BatchUpdateSchedule.go b/service/medialive/api_op_BatchUpdateSchedule.go index 53af5acc594..c25c6b751b8 100644 --- a/service/medialive/api_op_BatchUpdateSchedule.go +++ b/service/medialive/api_op_BatchUpdateSchedule.go @@ -64,6 +64,9 @@ func addOperationBatchUpdateScheduleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchUpdateScheduleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CancelInputDeviceTransfer.go b/service/medialive/api_op_CancelInputDeviceTransfer.go index c2e00cec776..c457cacd72c 100644 --- a/service/medialive/api_op_CancelInputDeviceTransfer.go +++ b/service/medialive/api_op_CancelInputDeviceTransfer.go @@ -50,6 +50,9 @@ func addOperationCancelInputDeviceTransferMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationCancelInputDeviceTransferMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CreateChannel.go b/service/medialive/api_op_CreateChannel.go index 6749e383e8d..3a9a4ebe7bf 100644 --- a/service/medialive/api_op_CreateChannel.go +++ b/service/medialive/api_op_CreateChannel.go @@ -90,6 +90,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CreateInput.go b/service/medialive/api_op_CreateInput.go index 8fc558b1b7d..f610c718d7d 100644 --- a/service/medialive/api_op_CreateInput.go +++ b/service/medialive/api_op_CreateInput.go @@ -94,6 +94,9 @@ func addOperationCreateInputMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateInputMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CreateInputSecurityGroup.go b/service/medialive/api_op_CreateInputSecurityGroup.go index 7d6201f6038..f2124f5a865 100644 --- a/service/medialive/api_op_CreateInputSecurityGroup.go +++ b/service/medialive/api_op_CreateInputSecurityGroup.go @@ -56,6 +56,9 @@ func addOperationCreateInputSecurityGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationCreateInputSecurityGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CreateMultiplex.go b/service/medialive/api_op_CreateMultiplex.go index 6edac42fa53..8009952301a 100644 --- a/service/medialive/api_op_CreateMultiplex.go +++ b/service/medialive/api_op_CreateMultiplex.go @@ -74,6 +74,9 @@ func addOperationCreateMultiplexMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateMultiplexMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CreateMultiplexProgram.go b/service/medialive/api_op_CreateMultiplexProgram.go index b9854801d5a..050860daf24 100644 --- a/service/medialive/api_op_CreateMultiplexProgram.go +++ b/service/medialive/api_op_CreateMultiplexProgram.go @@ -71,6 +71,9 @@ func addOperationCreateMultiplexProgramMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateMultiplexProgramMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_CreateTags.go b/service/medialive/api_op_CreateTags.go index 5f18a9eadca..cfba78c92e1 100644 --- a/service/medialive/api_op_CreateTags.go +++ b/service/medialive/api_op_CreateTags.go @@ -52,6 +52,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteChannel.go b/service/medialive/api_op_DeleteChannel.go index 8a62c2e49b8..1a0262c6aa5 100644 --- a/service/medialive/api_op_DeleteChannel.go +++ b/service/medialive/api_op_DeleteChannel.go @@ -103,6 +103,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteInput.go b/service/medialive/api_op_DeleteInput.go index 1543b915eaa..8a2d2dd7b46 100644 --- a/service/medialive/api_op_DeleteInput.go +++ b/service/medialive/api_op_DeleteInput.go @@ -50,6 +50,9 @@ func addOperationDeleteInputMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteInputMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteInputSecurityGroup.go b/service/medialive/api_op_DeleteInputSecurityGroup.go index e2af28461ab..6248520980a 100644 --- a/service/medialive/api_op_DeleteInputSecurityGroup.go +++ b/service/medialive/api_op_DeleteInputSecurityGroup.go @@ -50,6 +50,9 @@ func addOperationDeleteInputSecurityGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteInputSecurityGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteMultiplex.go b/service/medialive/api_op_DeleteMultiplex.go index eb427051a06..3a835aadd33 100644 --- a/service/medialive/api_op_DeleteMultiplex.go +++ b/service/medialive/api_op_DeleteMultiplex.go @@ -82,6 +82,9 @@ func addOperationDeleteMultiplexMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDeleteMultiplexMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteMultiplexProgram.go b/service/medialive/api_op_DeleteMultiplexProgram.go index 43777dd1b61..8a4796acfab 100644 --- a/service/medialive/api_op_DeleteMultiplexProgram.go +++ b/service/medialive/api_op_DeleteMultiplexProgram.go @@ -75,6 +75,9 @@ func addOperationDeleteMultiplexProgramMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteMultiplexProgramMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteReservation.go b/service/medialive/api_op_DeleteReservation.go index 4306cda415d..f34e915c7b8 100644 --- a/service/medialive/api_op_DeleteReservation.go +++ b/service/medialive/api_op_DeleteReservation.go @@ -109,6 +109,9 @@ func addOperationDeleteReservationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationDeleteReservationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteSchedule.go b/service/medialive/api_op_DeleteSchedule.go index 29a72100d1b..24f1e902a31 100644 --- a/service/medialive/api_op_DeleteSchedule.go +++ b/service/medialive/api_op_DeleteSchedule.go @@ -50,6 +50,9 @@ func addOperationDeleteScheduleMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteScheduleMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DeleteTags.go b/service/medialive/api_op_DeleteTags.go index b52db2253c2..8cd1aea9657 100644 --- a/service/medialive/api_op_DeleteTags.go +++ b/service/medialive/api_op_DeleteTags.go @@ -54,6 +54,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeChannel.go b/service/medialive/api_op_DescribeChannel.go index 88ec88def47..642eba4b612 100644 --- a/service/medialive/api_op_DescribeChannel.go +++ b/service/medialive/api_op_DescribeChannel.go @@ -103,6 +103,9 @@ func addOperationDescribeChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeInput.go b/service/medialive/api_op_DescribeInput.go index 80e1e544266..4e69d41df1c 100644 --- a/service/medialive/api_op_DescribeInput.go +++ b/service/medialive/api_op_DescribeInput.go @@ -107,6 +107,9 @@ func addOperationDescribeInputMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationDescribeInputMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeInputDevice.go b/service/medialive/api_op_DescribeInputDevice.go index 79b05afde98..2091dbe7c3c 100644 --- a/service/medialive/api_op_DescribeInputDevice.go +++ b/service/medialive/api_op_DescribeInputDevice.go @@ -86,6 +86,9 @@ func addOperationDescribeInputDeviceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeInputDeviceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeInputDeviceThumbnail.go b/service/medialive/api_op_DescribeInputDeviceThumbnail.go index e9fcd3a5e57..2c20a40c068 100644 --- a/service/medialive/api_op_DescribeInputDeviceThumbnail.go +++ b/service/medialive/api_op_DescribeInputDeviceThumbnail.go @@ -75,6 +75,9 @@ func addOperationDescribeInputDeviceThumbnailMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeInputDeviceThumbnailMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeInputSecurityGroup.go b/service/medialive/api_op_DescribeInputSecurityGroup.go index 29156053259..c6aa25911bb 100644 --- a/service/medialive/api_op_DescribeInputSecurityGroup.go +++ b/service/medialive/api_op_DescribeInputSecurityGroup.go @@ -70,6 +70,9 @@ func addOperationDescribeInputSecurityGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeInputSecurityGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeMultiplex.go b/service/medialive/api_op_DescribeMultiplex.go index 0328fb2e453..85989054d15 100644 --- a/service/medialive/api_op_DescribeMultiplex.go +++ b/service/medialive/api_op_DescribeMultiplex.go @@ -82,6 +82,9 @@ func addOperationDescribeMultiplexMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeMultiplexMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeMultiplexProgram.go b/service/medialive/api_op_DescribeMultiplexProgram.go index 89b7391eadc..d6bcfc99ef1 100644 --- a/service/medialive/api_op_DescribeMultiplexProgram.go +++ b/service/medialive/api_op_DescribeMultiplexProgram.go @@ -75,6 +75,9 @@ func addOperationDescribeMultiplexProgramMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeMultiplexProgramMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeOffering.go b/service/medialive/api_op_DescribeOffering.go index 000a101f3ac..ce72b6bbf1c 100644 --- a/service/medialive/api_op_DescribeOffering.go +++ b/service/medialive/api_op_DescribeOffering.go @@ -87,6 +87,9 @@ func addOperationDescribeOfferingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeOfferingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeReservation.go b/service/medialive/api_op_DescribeReservation.go index 05dc34fba9d..f5d16776a24 100644 --- a/service/medialive/api_op_DescribeReservation.go +++ b/service/medialive/api_op_DescribeReservation.go @@ -109,6 +109,9 @@ func addOperationDescribeReservationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationDescribeReservationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_DescribeSchedule.go b/service/medialive/api_op_DescribeSchedule.go index 803bb9bf1a5..f2c7933c7b4 100644 --- a/service/medialive/api_op_DescribeSchedule.go +++ b/service/medialive/api_op_DescribeSchedule.go @@ -64,6 +64,9 @@ func addOperationDescribeScheduleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeScheduleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListChannels.go b/service/medialive/api_op_ListChannels.go index 57aabe507f4..1c427b1c247 100644 --- a/service/medialive/api_op_ListChannels.go +++ b/service/medialive/api_op_ListChannels.go @@ -59,6 +59,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListInputDeviceTransfers.go b/service/medialive/api_op_ListInputDeviceTransfers.go index 847a0cbb2b8..8ee856db9cb 100644 --- a/service/medialive/api_op_ListInputDeviceTransfers.go +++ b/service/medialive/api_op_ListInputDeviceTransfers.go @@ -66,6 +66,9 @@ func addOperationListInputDeviceTransfersMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListInputDeviceTransfersMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListInputDevices.go b/service/medialive/api_op_ListInputDevices.go index dbad55aa14e..0d6f9af478b 100644 --- a/service/medialive/api_op_ListInputDevices.go +++ b/service/medialive/api_op_ListInputDevices.go @@ -59,6 +59,9 @@ func addOperationListInputDevicesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListInputDevicesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListInputSecurityGroups.go b/service/medialive/api_op_ListInputSecurityGroups.go index 64f95c1fd66..c4b3ff4e70c 100644 --- a/service/medialive/api_op_ListInputSecurityGroups.go +++ b/service/medialive/api_op_ListInputSecurityGroups.go @@ -59,6 +59,9 @@ func addOperationListInputSecurityGroupsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListInputSecurityGroupsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListInputs.go b/service/medialive/api_op_ListInputs.go index b4a96f881e6..6e288914795 100644 --- a/service/medialive/api_op_ListInputs.go +++ b/service/medialive/api_op_ListInputs.go @@ -59,6 +59,9 @@ func addOperationListInputsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListInputsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListMultiplexPrograms.go b/service/medialive/api_op_ListMultiplexPrograms.go index 218d576796f..c7d4f9447e6 100644 --- a/service/medialive/api_op_ListMultiplexPrograms.go +++ b/service/medialive/api_op_ListMultiplexPrograms.go @@ -64,6 +64,9 @@ func addOperationListMultiplexProgramsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListMultiplexProgramsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListMultiplexes.go b/service/medialive/api_op_ListMultiplexes.go index 491641ee756..d47353b6c80 100644 --- a/service/medialive/api_op_ListMultiplexes.go +++ b/service/medialive/api_op_ListMultiplexes.go @@ -59,6 +59,9 @@ func addOperationListMultiplexesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListMultiplexesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListOfferings.go b/service/medialive/api_op_ListOfferings.go index 8a10df978e3..c3c706e2f8f 100644 --- a/service/medialive/api_op_ListOfferings.go +++ b/service/medialive/api_op_ListOfferings.go @@ -90,6 +90,9 @@ func addOperationListOfferingsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListOfferingsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListReservations.go b/service/medialive/api_op_ListReservations.go index 1c41b373571..a50096e5d4b 100644 --- a/service/medialive/api_op_ListReservations.go +++ b/service/medialive/api_op_ListReservations.go @@ -83,6 +83,9 @@ func addOperationListReservationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListReservationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_ListTagsForResource.go b/service/medialive/api_op_ListTagsForResource.go index 388695e9364..48662493dae 100644 --- a/service/medialive/api_op_ListTagsForResource.go +++ b/service/medialive/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_PurchaseOffering.go b/service/medialive/api_op_PurchaseOffering.go index 5400b471caa..b117e7c0ca2 100644 --- a/service/medialive/api_op_PurchaseOffering.go +++ b/service/medialive/api_op_PurchaseOffering.go @@ -76,6 +76,9 @@ func addOperationPurchaseOfferingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationPurchaseOfferingMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_RejectInputDeviceTransfer.go b/service/medialive/api_op_RejectInputDeviceTransfer.go index e9feef9103f..7649106a4e7 100644 --- a/service/medialive/api_op_RejectInputDeviceTransfer.go +++ b/service/medialive/api_op_RejectInputDeviceTransfer.go @@ -50,6 +50,9 @@ func addOperationRejectInputDeviceTransferMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationRejectInputDeviceTransferMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_StartChannel.go b/service/medialive/api_op_StartChannel.go index 45872b70ef6..f80067e7dd4 100644 --- a/service/medialive/api_op_StartChannel.go +++ b/service/medialive/api_op_StartChannel.go @@ -103,6 +103,9 @@ func addOperationStartChannelMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationStartChannelMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_StartMultiplex.go b/service/medialive/api_op_StartMultiplex.go index 1a7ce4ae6e4..27cdf25440d 100644 --- a/service/medialive/api_op_StartMultiplex.go +++ b/service/medialive/api_op_StartMultiplex.go @@ -83,6 +83,9 @@ func addOperationStartMultiplexMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationStartMultiplexMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_StopChannel.go b/service/medialive/api_op_StopChannel.go index 93d63c732fe..c3bb8117507 100644 --- a/service/medialive/api_op_StopChannel.go +++ b/service/medialive/api_op_StopChannel.go @@ -103,6 +103,9 @@ func addOperationStopChannelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationStopChannelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_StopMultiplex.go b/service/medialive/api_op_StopMultiplex.go index dd277a1cb1d..70fb9fd790d 100644 --- a/service/medialive/api_op_StopMultiplex.go +++ b/service/medialive/api_op_StopMultiplex.go @@ -83,6 +83,9 @@ func addOperationStopMultiplexMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationStopMultiplexMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_TransferInputDevice.go b/service/medialive/api_op_TransferInputDevice.go index 933c244394c..710de770f40 100644 --- a/service/medialive/api_op_TransferInputDevice.go +++ b/service/medialive/api_op_TransferInputDevice.go @@ -57,6 +57,9 @@ func addOperationTransferInputDeviceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTransferInputDeviceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateChannel.go b/service/medialive/api_op_UpdateChannel.go index 8fa77a1ed9a..2492e0398f0 100644 --- a/service/medialive/api_op_UpdateChannel.go +++ b/service/medialive/api_op_UpdateChannel.go @@ -81,6 +81,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateChannelClass.go b/service/medialive/api_op_UpdateChannelClass.go index a63fc41ea77..db6ffca0325 100644 --- a/service/medialive/api_op_UpdateChannelClass.go +++ b/service/medialive/api_op_UpdateChannelClass.go @@ -63,6 +63,9 @@ func addOperationUpdateChannelClassMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateChannelClassMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateInput.go b/service/medialive/api_op_UpdateInput.go index 2725d550014..155c76275b2 100644 --- a/service/medialive/api_op_UpdateInput.go +++ b/service/medialive/api_op_UpdateInput.go @@ -83,6 +83,9 @@ func addOperationUpdateInputMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationUpdateInputMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateInputDevice.go b/service/medialive/api_op_UpdateInputDevice.go index a2cf0e90a86..ad1d9de3b5a 100644 --- a/service/medialive/api_op_UpdateInputDevice.go +++ b/service/medialive/api_op_UpdateInputDevice.go @@ -92,6 +92,9 @@ func addOperationUpdateInputDeviceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateInputDeviceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateInputSecurityGroup.go b/service/medialive/api_op_UpdateInputSecurityGroup.go index 9ae4e246f88..25f6b202d59 100644 --- a/service/medialive/api_op_UpdateInputSecurityGroup.go +++ b/service/medialive/api_op_UpdateInputSecurityGroup.go @@ -62,6 +62,9 @@ func addOperationUpdateInputSecurityGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateInputSecurityGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateMultiplex.go b/service/medialive/api_op_UpdateMultiplex.go index b239b77b371..2909198e12a 100644 --- a/service/medialive/api_op_UpdateMultiplex.go +++ b/service/medialive/api_op_UpdateMultiplex.go @@ -61,6 +61,9 @@ func addOperationUpdateMultiplexMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateMultiplexMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateMultiplexProgram.go b/service/medialive/api_op_UpdateMultiplexProgram.go index f4799b9a17e..c0cd72bb8e9 100644 --- a/service/medialive/api_op_UpdateMultiplexProgram.go +++ b/service/medialive/api_op_UpdateMultiplexProgram.go @@ -63,6 +63,9 @@ func addOperationUpdateMultiplexProgramMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateMultiplexProgramMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/api_op_UpdateReservation.go b/service/medialive/api_op_UpdateReservation.go index cf80a6384ec..a7316696d5d 100644 --- a/service/medialive/api_op_UpdateReservation.go +++ b/service/medialive/api_op_UpdateReservation.go @@ -58,6 +58,9 @@ func addOperationUpdateReservationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateReservationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/medialive/go.mod b/service/medialive/go.mod index acf4a3cc7f8..8189fdcd8e6 100644 --- a/service/medialive/go.mod +++ b/service/medialive/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/medialive go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/medialive/go.sum b/service/medialive/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/medialive/go.sum +++ b/service/medialive/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediapackage/api_client.go b/service/mediapackage/api_client.go index 4c2aa664dea..edf53c86f5f 100644 --- a/service/mediapackage/api_client.go +++ b/service/mediapackage/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediapackage/api_op_ConfigureLogs.go b/service/mediapackage/api_op_ConfigureLogs.go index 3809633dc95..4d38ef55d42 100644 --- a/service/mediapackage/api_op_ConfigureLogs.go +++ b/service/mediapackage/api_op_ConfigureLogs.go @@ -78,6 +78,9 @@ func addOperationConfigureLogsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationConfigureLogsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_CreateChannel.go b/service/mediapackage/api_op_CreateChannel.go index 16bc104a199..0ce4bdabc50 100644 --- a/service/mediapackage/api_op_CreateChannel.go +++ b/service/mediapackage/api_op_CreateChannel.go @@ -79,6 +79,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_CreateHarvestJob.go b/service/mediapackage/api_op_CreateHarvestJob.go index a9b39b42076..4166fe6b195 100644 --- a/service/mediapackage/api_op_CreateHarvestJob.go +++ b/service/mediapackage/api_op_CreateHarvestJob.go @@ -106,6 +106,9 @@ func addOperationCreateHarvestJobMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationCreateHarvestJobMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_CreateOriginEndpoint.go b/service/mediapackage/api_op_CreateOriginEndpoint.go index e98d9a17fd3..aba00839103 100644 --- a/service/mediapackage/api_op_CreateOriginEndpoint.go +++ b/service/mediapackage/api_op_CreateOriginEndpoint.go @@ -157,6 +157,9 @@ func addOperationCreateOriginEndpointMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -199,6 +202,9 @@ func addOperationCreateOriginEndpointMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_DeleteChannel.go b/service/mediapackage/api_op_DeleteChannel.go index 402536257c4..8c371931258 100644 --- a/service/mediapackage/api_op_DeleteChannel.go +++ b/service/mediapackage/api_op_DeleteChannel.go @@ -48,6 +48,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_DeleteOriginEndpoint.go b/service/mediapackage/api_op_DeleteOriginEndpoint.go index 0dd5ff65a98..1ea98a041c4 100644 --- a/service/mediapackage/api_op_DeleteOriginEndpoint.go +++ b/service/mediapackage/api_op_DeleteOriginEndpoint.go @@ -48,6 +48,9 @@ func addOperationDeleteOriginEndpointMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteOriginEndpointMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_DescribeChannel.go b/service/mediapackage/api_op_DescribeChannel.go index c868b64d69d..a9fa5c6d6ca 100644 --- a/service/mediapackage/api_op_DescribeChannel.go +++ b/service/mediapackage/api_op_DescribeChannel.go @@ -71,6 +71,9 @@ func addOperationDescribeChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_DescribeHarvestJob.go b/service/mediapackage/api_op_DescribeHarvestJob.go index e22ee46e733..f712f8ebfcf 100644 --- a/service/mediapackage/api_op_DescribeHarvestJob.go +++ b/service/mediapackage/api_op_DescribeHarvestJob.go @@ -82,6 +82,9 @@ func addOperationDescribeHarvestJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeHarvestJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_DescribeOriginEndpoint.go b/service/mediapackage/api_op_DescribeOriginEndpoint.go index f84af8903c4..a69ce6b76bc 100644 --- a/service/mediapackage/api_op_DescribeOriginEndpoint.go +++ b/service/mediapackage/api_op_DescribeOriginEndpoint.go @@ -105,6 +105,9 @@ func addOperationDescribeOriginEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationDescribeOriginEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_ListChannels.go b/service/mediapackage/api_op_ListChannels.go index f3c97174a69..dbd3d24c9de 100644 --- a/service/mediapackage/api_op_ListChannels.go +++ b/service/mediapackage/api_op_ListChannels.go @@ -57,6 +57,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListChannelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_ListHarvestJobs.go b/service/mediapackage/api_op_ListHarvestJobs.go index 281a85d900e..b20b0f72220 100644 --- a/service/mediapackage/api_op_ListHarvestJobs.go +++ b/service/mediapackage/api_op_ListHarvestJobs.go @@ -64,6 +64,9 @@ func addOperationListHarvestJobsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListHarvestJobsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_ListOriginEndpoints.go b/service/mediapackage/api_op_ListOriginEndpoints.go index 768269c8123..7803e73aa48 100644 --- a/service/mediapackage/api_op_ListOriginEndpoints.go +++ b/service/mediapackage/api_op_ListOriginEndpoints.go @@ -61,6 +61,9 @@ func addOperationListOriginEndpointsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListOriginEndpointsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_ListTagsForResource.go b/service/mediapackage/api_op_ListTagsForResource.go index 1f90d4b4a50..848bd704754 100644 --- a/service/mediapackage/api_op_ListTagsForResource.go +++ b/service/mediapackage/api_op_ListTagsForResource.go @@ -45,6 +45,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_RotateChannelCredentials.go b/service/mediapackage/api_op_RotateChannelCredentials.go index 4c7818949e8..19171910cdd 100644 --- a/service/mediapackage/api_op_RotateChannelCredentials.go +++ b/service/mediapackage/api_op_RotateChannelCredentials.go @@ -72,6 +72,9 @@ func addOperationRotateChannelCredentialsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationRotateChannelCredentialsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_RotateIngestEndpointCredentials.go b/service/mediapackage/api_op_RotateIngestEndpointCredentials.go index 2fc5adf4b6b..6fce2b6ef4b 100644 --- a/service/mediapackage/api_op_RotateIngestEndpointCredentials.go +++ b/service/mediapackage/api_op_RotateIngestEndpointCredentials.go @@ -77,6 +77,9 @@ func addOperationRotateIngestEndpointCredentialsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationRotateIngestEndpointCredentialsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_TagResource.go b/service/mediapackage/api_op_TagResource.go index ccd2b3bd0ee..0e07ebf6c2e 100644 --- a/service/mediapackage/api_op_TagResource.go +++ b/service/mediapackage/api_op_TagResource.go @@ -45,6 +45,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_UntagResource.go b/service/mediapackage/api_op_UntagResource.go index f2556f6c078..a02c853cd64 100644 --- a/service/mediapackage/api_op_UntagResource.go +++ b/service/mediapackage/api_op_UntagResource.go @@ -48,6 +48,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_UpdateChannel.go b/service/mediapackage/api_op_UpdateChannel.go index afb7c9a6431..b824da64ec5 100644 --- a/service/mediapackage/api_op_UpdateChannel.go +++ b/service/mediapackage/api_op_UpdateChannel.go @@ -75,6 +75,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/api_op_UpdateOriginEndpoint.go b/service/mediapackage/api_op_UpdateOriginEndpoint.go index a876695702a..861d73377a9 100644 --- a/service/mediapackage/api_op_UpdateOriginEndpoint.go +++ b/service/mediapackage/api_op_UpdateOriginEndpoint.go @@ -146,6 +146,9 @@ func addOperationUpdateOriginEndpointMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationUpdateOriginEndpointMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackage/go.mod b/service/mediapackage/go.mod index fe8ba8cdc09..c2602c3e651 100644 --- a/service/mediapackage/go.mod +++ b/service/mediapackage/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediapackage go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackage/go.sum b/service/mediapackage/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediapackage/go.sum +++ b/service/mediapackage/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediapackagevod/api_client.go b/service/mediapackagevod/api_client.go index 1aff1120abd..b2d7f795934 100644 --- a/service/mediapackagevod/api_client.go +++ b/service/mediapackagevod/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediapackagevod/api_op_CreateAsset.go b/service/mediapackagevod/api_op_CreateAsset.go index bd3791cc94d..5d7e8690b2a 100644 --- a/service/mediapackagevod/api_op_CreateAsset.go +++ b/service/mediapackagevod/api_op_CreateAsset.go @@ -99,6 +99,9 @@ func addOperationCreateAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreateAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_CreatePackagingConfiguration.go b/service/mediapackagevod/api_op_CreatePackagingConfiguration.go index 6d171fc4031..8a6f951a925 100644 --- a/service/mediapackagevod/api_op_CreatePackagingConfiguration.go +++ b/service/mediapackagevod/api_op_CreatePackagingConfiguration.go @@ -95,6 +95,9 @@ func addOperationCreatePackagingConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreatePackagingConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_CreatePackagingGroup.go b/service/mediapackagevod/api_op_CreatePackagingGroup.go index e2fd0c92c9e..6b20a0fa1cd 100644 --- a/service/mediapackagevod/api_op_CreatePackagingGroup.go +++ b/service/mediapackagevod/api_op_CreatePackagingGroup.go @@ -72,6 +72,9 @@ func addOperationCreatePackagingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreatePackagingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_DeleteAsset.go b/service/mediapackagevod/api_op_DeleteAsset.go index b63a36eb29c..9591440f5a6 100644 --- a/service/mediapackagevod/api_op_DeleteAsset.go +++ b/service/mediapackagevod/api_op_DeleteAsset.go @@ -48,6 +48,9 @@ func addOperationDeleteAssetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAssetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_DeletePackagingConfiguration.go b/service/mediapackagevod/api_op_DeletePackagingConfiguration.go index 1160dfaab41..26963e7fb8d 100644 --- a/service/mediapackagevod/api_op_DeletePackagingConfiguration.go +++ b/service/mediapackagevod/api_op_DeletePackagingConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeletePackagingConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeletePackagingConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_DeletePackagingGroup.go b/service/mediapackagevod/api_op_DeletePackagingGroup.go index d8cbb1b972f..1e64adfbd24 100644 --- a/service/mediapackagevod/api_op_DeletePackagingGroup.go +++ b/service/mediapackagevod/api_op_DeletePackagingGroup.go @@ -48,6 +48,9 @@ func addOperationDeletePackagingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeletePackagingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_DescribeAsset.go b/service/mediapackagevod/api_op_DescribeAsset.go index 37bfd925472..2cc18d3b786 100644 --- a/service/mediapackagevod/api_op_DescribeAsset.go +++ b/service/mediapackagevod/api_op_DescribeAsset.go @@ -77,6 +77,9 @@ func addOperationDescribeAssetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeAssetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_DescribePackagingConfiguration.go b/service/mediapackagevod/api_op_DescribePackagingConfiguration.go index 3f2b6f6037b..d3df0df2dba 100644 --- a/service/mediapackagevod/api_op_DescribePackagingConfiguration.go +++ b/service/mediapackagevod/api_op_DescribePackagingConfiguration.go @@ -74,6 +74,9 @@ func addOperationDescribePackagingConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribePackagingConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_DescribePackagingGroup.go b/service/mediapackagevod/api_op_DescribePackagingGroup.go index 14278d4d198..84edf2b159f 100644 --- a/service/mediapackagevod/api_op_DescribePackagingGroup.go +++ b/service/mediapackagevod/api_op_DescribePackagingGroup.go @@ -65,6 +65,9 @@ func addOperationDescribePackagingGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribePackagingGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_ListAssets.go b/service/mediapackagevod/api_op_ListAssets.go index 7965e5a083e..0de01470ecf 100644 --- a/service/mediapackagevod/api_op_ListAssets.go +++ b/service/mediapackagevod/api_op_ListAssets.go @@ -60,6 +60,9 @@ func addOperationListAssetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListAssetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_ListPackagingConfigurations.go b/service/mediapackagevod/api_op_ListPackagingConfigurations.go index 6a185c0cced..bcd316c4116 100644 --- a/service/mediapackagevod/api_op_ListPackagingConfigurations.go +++ b/service/mediapackagevod/api_op_ListPackagingConfigurations.go @@ -61,6 +61,9 @@ func addOperationListPackagingConfigurationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListPackagingConfigurationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_ListPackagingGroups.go b/service/mediapackagevod/api_op_ListPackagingGroups.go index d2d67add158..eb2561cd510 100644 --- a/service/mediapackagevod/api_op_ListPackagingGroups.go +++ b/service/mediapackagevod/api_op_ListPackagingGroups.go @@ -57,6 +57,9 @@ func addOperationListPackagingGroupsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListPackagingGroupsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_ListTagsForResource.go b/service/mediapackagevod/api_op_ListTagsForResource.go index 0f4857ea48f..9fbc50385ae 100644 --- a/service/mediapackagevod/api_op_ListTagsForResource.go +++ b/service/mediapackagevod/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_TagResource.go b/service/mediapackagevod/api_op_TagResource.go index 148149b91d9..96e1a34065f 100644 --- a/service/mediapackagevod/api_op_TagResource.go +++ b/service/mediapackagevod/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_UntagResource.go b/service/mediapackagevod/api_op_UntagResource.go index be27a0156ac..5190a5ed2dc 100644 --- a/service/mediapackagevod/api_op_UntagResource.go +++ b/service/mediapackagevod/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/api_op_UpdatePackagingGroup.go b/service/mediapackagevod/api_op_UpdatePackagingGroup.go index be40803e5ed..9bc75724066 100644 --- a/service/mediapackagevod/api_op_UpdatePackagingGroup.go +++ b/service/mediapackagevod/api_op_UpdatePackagingGroup.go @@ -70,6 +70,9 @@ func addOperationUpdatePackagingGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdatePackagingGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediapackagevod/go.mod b/service/mediapackagevod/go.mod index 9bf69872efa..672f7ddc1ca 100644 --- a/service/mediapackagevod/go.mod +++ b/service/mediapackagevod/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediapackagevod go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackagevod/go.sum b/service/mediapackagevod/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediapackagevod/go.sum +++ b/service/mediapackagevod/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediastore/api_client.go b/service/mediastore/api_client.go index 1efbe79a0fd..9a99283a542 100644 --- a/service/mediastore/api_client.go +++ b/service/mediastore/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediastore/api_op_CreateContainer.go b/service/mediastore/api_op_CreateContainer.go index e80d0de8da5..869bc41fb5b 100644 --- a/service/mediastore/api_op_CreateContainer.go +++ b/service/mediastore/api_op_CreateContainer.go @@ -77,6 +77,9 @@ func addOperationCreateContainerMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateContainerMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_DeleteContainer.go b/service/mediastore/api_op_DeleteContainer.go index 68acc8f39b4..5d7fdf6ad29 100644 --- a/service/mediastore/api_op_DeleteContainer.go +++ b/service/mediastore/api_op_DeleteContainer.go @@ -50,6 +50,9 @@ func addOperationDeleteContainerMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteContainerMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_DeleteContainerPolicy.go b/service/mediastore/api_op_DeleteContainerPolicy.go index d734fbc0357..a86a7c1073f 100644 --- a/service/mediastore/api_op_DeleteContainerPolicy.go +++ b/service/mediastore/api_op_DeleteContainerPolicy.go @@ -48,6 +48,9 @@ func addOperationDeleteContainerPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteContainerPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_DeleteCorsPolicy.go b/service/mediastore/api_op_DeleteCorsPolicy.go index 06c1883e5dd..e184301ed4f 100644 --- a/service/mediastore/api_op_DeleteCorsPolicy.go +++ b/service/mediastore/api_op_DeleteCorsPolicy.go @@ -51,6 +51,9 @@ func addOperationDeleteCorsPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteCorsPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_DeleteLifecyclePolicy.go b/service/mediastore/api_op_DeleteLifecyclePolicy.go index 2b2ffb7f00f..2b07c66e35c 100644 --- a/service/mediastore/api_op_DeleteLifecyclePolicy.go +++ b/service/mediastore/api_op_DeleteLifecyclePolicy.go @@ -49,6 +49,9 @@ func addOperationDeleteLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteLifecyclePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_DeleteMetricPolicy.go b/service/mediastore/api_op_DeleteMetricPolicy.go index 2f1ba883162..5581d6bc9a5 100644 --- a/service/mediastore/api_op_DeleteMetricPolicy.go +++ b/service/mediastore/api_op_DeleteMetricPolicy.go @@ -51,6 +51,9 @@ func addOperationDeleteMetricPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteMetricPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_DescribeContainer.go b/service/mediastore/api_op_DescribeContainer.go index c8ebfd53dd8..5b20f95a5bf 100644 --- a/service/mediastore/api_op_DescribeContainer.go +++ b/service/mediastore/api_op_DescribeContainer.go @@ -56,6 +56,9 @@ func addOperationDescribeContainerMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeContainerMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_GetContainerPolicy.go b/service/mediastore/api_op_GetContainerPolicy.go index 997095581ec..03e66e109c2 100644 --- a/service/mediastore/api_op_GetContainerPolicy.go +++ b/service/mediastore/api_op_GetContainerPolicy.go @@ -56,6 +56,9 @@ func addOperationGetContainerPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetContainerPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_GetCorsPolicy.go b/service/mediastore/api_op_GetCorsPolicy.go index d84a40848db..7d9ee04264e 100644 --- a/service/mediastore/api_op_GetCorsPolicy.go +++ b/service/mediastore/api_op_GetCorsPolicy.go @@ -58,6 +58,9 @@ func addOperationGetCorsPolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetCorsPolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_GetLifecyclePolicy.go b/service/mediastore/api_op_GetLifecyclePolicy.go index f3e17e5a609..3aa82bc4b33 100644 --- a/service/mediastore/api_op_GetLifecyclePolicy.go +++ b/service/mediastore/api_op_GetLifecyclePolicy.go @@ -54,6 +54,9 @@ func addOperationGetLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_GetMetricPolicy.go b/service/mediastore/api_op_GetMetricPolicy.go index 372b8b9bc41..b7a28acd4ec 100644 --- a/service/mediastore/api_op_GetMetricPolicy.go +++ b/service/mediastore/api_op_GetMetricPolicy.go @@ -55,6 +55,9 @@ func addOperationGetMetricPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetMetricPolicyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_ListContainers.go b/service/mediastore/api_op_ListContainers.go index 3f37a79dc0a..0168c56d890 100644 --- a/service/mediastore/api_op_ListContainers.go +++ b/service/mediastore/api_op_ListContainers.go @@ -72,6 +72,9 @@ func addOperationListContainersMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListContainersMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_ListTagsForResource.go b/service/mediastore/api_op_ListTagsForResource.go index e9d4b9f5de5..7fe06763d0d 100644 --- a/service/mediastore/api_op_ListTagsForResource.go +++ b/service/mediastore/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_PutContainerPolicy.go b/service/mediastore/api_op_PutContainerPolicy.go index 430c7ca1a8f..fe501fd786a 100644 --- a/service/mediastore/api_op_PutContainerPolicy.go +++ b/service/mediastore/api_op_PutContainerPolicy.go @@ -63,6 +63,9 @@ func addOperationPutContainerPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPutContainerPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_PutCorsPolicy.go b/service/mediastore/api_op_PutCorsPolicy.go index 2477c5c2621..4242f6e5412 100644 --- a/service/mediastore/api_op_PutCorsPolicy.go +++ b/service/mediastore/api_op_PutCorsPolicy.go @@ -65,6 +65,9 @@ func addOperationPutCorsPolicyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationPutCorsPolicyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_PutLifecyclePolicy.go b/service/mediastore/api_op_PutLifecyclePolicy.go index 8727fc7b7c9..85c57261683 100644 --- a/service/mediastore/api_op_PutLifecyclePolicy.go +++ b/service/mediastore/api_op_PutLifecyclePolicy.go @@ -59,6 +59,9 @@ func addOperationPutLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationPutLifecyclePolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_PutMetricPolicy.go b/service/mediastore/api_op_PutMetricPolicy.go index eb00fdb0081..50c11bd73c1 100644 --- a/service/mediastore/api_op_PutMetricPolicy.go +++ b/service/mediastore/api_op_PutMetricPolicy.go @@ -71,6 +71,9 @@ func addOperationPutMetricPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationPutMetricPolicyMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_StartAccessLogging.go b/service/mediastore/api_op_StartAccessLogging.go index c3e3139715b..58b541e0876 100644 --- a/service/mediastore/api_op_StartAccessLogging.go +++ b/service/mediastore/api_op_StartAccessLogging.go @@ -50,6 +50,9 @@ func addOperationStartAccessLoggingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationStartAccessLoggingMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_StopAccessLogging.go b/service/mediastore/api_op_StopAccessLogging.go index 58e5ae4c0d8..73a4b358512 100644 --- a/service/mediastore/api_op_StopAccessLogging.go +++ b/service/mediastore/api_op_StopAccessLogging.go @@ -50,6 +50,9 @@ func addOperationStopAccessLoggingMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationStopAccessLoggingMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_TagResource.go b/service/mediastore/api_op_TagResource.go index d88293b7a9d..1e6dc941303 100644 --- a/service/mediastore/api_op_TagResource.go +++ b/service/mediastore/api_op_TagResource.go @@ -66,6 +66,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/api_op_UntagResource.go b/service/mediastore/api_op_UntagResource.go index e3abebe4724..c5869954eed 100644 --- a/service/mediastore/api_op_UntagResource.go +++ b/service/mediastore/api_op_UntagResource.go @@ -57,6 +57,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastore/go.mod b/service/mediastore/go.mod index d0d7bfc2613..941aa46a1bf 100644 --- a/service/mediastore/go.mod +++ b/service/mediastore/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediastore go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediastore/go.sum b/service/mediastore/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediastore/go.sum +++ b/service/mediastore/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediastoredata/api_client.go b/service/mediastoredata/api_client.go index 0d3017fec54..1f55b98a297 100644 --- a/service/mediastoredata/api_client.go +++ b/service/mediastoredata/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediastoredata/api_op_DeleteObject.go b/service/mediastoredata/api_op_DeleteObject.go index cc73c6ff528..4cb75e3f3cc 100644 --- a/service/mediastoredata/api_op_DeleteObject.go +++ b/service/mediastoredata/api_op_DeleteObject.go @@ -49,6 +49,9 @@ func addOperationDeleteObjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteObjectMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastoredata/api_op_DescribeObject.go b/service/mediastoredata/api_op_DescribeObject.go index 4a7c460e504..f53962e2672 100644 --- a/service/mediastoredata/api_op_DescribeObject.go +++ b/service/mediastoredata/api_op_DescribeObject.go @@ -70,6 +70,9 @@ func addOperationDescribeObjectMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeObjectMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastoredata/api_op_GetObject.go b/service/mediastoredata/api_op_GetObject.go index c3603660d69..7c0aae64342 100644 --- a/service/mediastoredata/api_op_GetObject.go +++ b/service/mediastoredata/api_op_GetObject.go @@ -102,6 +102,9 @@ func addOperationGetObjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationGetObjectMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastoredata/api_op_ListItems.go b/service/mediastoredata/api_op_ListItems.go index 7fbe31931d0..9ae91878d74 100644 --- a/service/mediastoredata/api_op_ListItems.go +++ b/service/mediastoredata/api_op_ListItems.go @@ -74,6 +74,9 @@ func addOperationListItemsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListItemsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastoredata/api_op_PutObject.go b/service/mediastoredata/api_op_PutObject.go index baf677f1ce7..60ff053d4f3 100644 --- a/service/mediastoredata/api_op_PutObject.go +++ b/service/mediastoredata/api_op_PutObject.go @@ -95,6 +95,9 @@ func addOperationPutObjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationPutObjectMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediastoredata/go.mod b/service/mediastoredata/go.mod index 1fdce00d23d..22fd0dc4864 100644 --- a/service/mediastoredata/go.mod +++ b/service/mediastoredata/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediastoredata go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediastoredata/go.sum b/service/mediastoredata/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediastoredata/go.sum +++ b/service/mediastoredata/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediatailor/api_client.go b/service/mediatailor/api_client.go index 9c9eeb7723d..d755eccabbf 100644 --- a/service/mediatailor/api_client.go +++ b/service/mediatailor/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mediatailor/api_op_DeletePlaybackConfiguration.go b/service/mediatailor/api_op_DeletePlaybackConfiguration.go index 351ab891335..ccf6b04a579 100644 --- a/service/mediatailor/api_op_DeletePlaybackConfiguration.go +++ b/service/mediatailor/api_op_DeletePlaybackConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeletePlaybackConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeletePlaybackConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/api_op_GetPlaybackConfiguration.go b/service/mediatailor/api_op_GetPlaybackConfiguration.go index ceaa72a3dc8..74166ae0f3a 100644 --- a/service/mediatailor/api_op_GetPlaybackConfiguration.go +++ b/service/mediatailor/api_op_GetPlaybackConfiguration.go @@ -120,6 +120,9 @@ func addOperationGetPlaybackConfigurationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationGetPlaybackConfigurationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/api_op_ListPlaybackConfigurations.go b/service/mediatailor/api_op_ListPlaybackConfigurations.go index 4bdf11b2f81..66e21a596ca 100644 --- a/service/mediatailor/api_op_ListPlaybackConfigurations.go +++ b/service/mediatailor/api_op_ListPlaybackConfigurations.go @@ -65,6 +65,9 @@ func addOperationListPlaybackConfigurationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListPlaybackConfigurationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/api_op_ListTagsForResource.go b/service/mediatailor/api_op_ListTagsForResource.go index e1d90a38145..f356758b137 100644 --- a/service/mediatailor/api_op_ListTagsForResource.go +++ b/service/mediatailor/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/api_op_PutPlaybackConfiguration.go b/service/mediatailor/api_op_PutPlaybackConfiguration.go index af865513196..df1e75a946f 100644 --- a/service/mediatailor/api_op_PutPlaybackConfiguration.go +++ b/service/mediatailor/api_op_PutPlaybackConfiguration.go @@ -171,6 +171,9 @@ func addOperationPutPlaybackConfigurationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -210,6 +213,9 @@ func addOperationPutPlaybackConfigurationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/api_op_TagResource.go b/service/mediatailor/api_op_TagResource.go index 111e45c2036..021b1ed5388 100644 --- a/service/mediatailor/api_op_TagResource.go +++ b/service/mediatailor/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/api_op_UntagResource.go b/service/mediatailor/api_op_UntagResource.go index 836366c4635..8705b8581fb 100644 --- a/service/mediatailor/api_op_UntagResource.go +++ b/service/mediatailor/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mediatailor/go.mod b/service/mediatailor/go.mod index bd58aaf1016..02c42c33f36 100644 --- a/service/mediatailor/go.mod +++ b/service/mediatailor/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mediatailor go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediatailor/go.sum b/service/mediatailor/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mediatailor/go.sum +++ b/service/mediatailor/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/migrationhub/api_client.go b/service/migrationhub/api_client.go index 2ee043d7b5e..5e345880c80 100644 --- a/service/migrationhub/api_client.go +++ b/service/migrationhub/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/migrationhub/api_op_AssociateCreatedArtifact.go b/service/migrationhub/api_op_AssociateCreatedArtifact.go index aadd5aad94b..be557f3600e 100644 --- a/service/migrationhub/api_op_AssociateCreatedArtifact.go +++ b/service/migrationhub/api_op_AssociateCreatedArtifact.go @@ -79,6 +79,9 @@ func addOperationAssociateCreatedArtifactMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationAssociateCreatedArtifactMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_AssociateDiscoveredResource.go b/service/migrationhub/api_op_AssociateDiscoveredResource.go index 1dbe566d5b7..54576266ddf 100644 --- a/service/migrationhub/api_op_AssociateDiscoveredResource.go +++ b/service/migrationhub/api_op_AssociateDiscoveredResource.go @@ -65,6 +65,9 @@ func addOperationAssociateDiscoveredResourceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAssociateDiscoveredResourceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_CreateProgressUpdateStream.go b/service/migrationhub/api_op_CreateProgressUpdateStream.go index 69ee9d31a34..fc303829497 100644 --- a/service/migrationhub/api_op_CreateProgressUpdateStream.go +++ b/service/migrationhub/api_op_CreateProgressUpdateStream.go @@ -56,6 +56,9 @@ func addOperationCreateProgressUpdateStreamMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateProgressUpdateStreamMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_DeleteProgressUpdateStream.go b/service/migrationhub/api_op_DeleteProgressUpdateStream.go index 262ad694c36..59892cac039 100644 --- a/service/migrationhub/api_op_DeleteProgressUpdateStream.go +++ b/service/migrationhub/api_op_DeleteProgressUpdateStream.go @@ -75,6 +75,9 @@ func addOperationDeleteProgressUpdateStreamMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteProgressUpdateStreamMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_DescribeApplicationState.go b/service/migrationhub/api_op_DescribeApplicationState.go index eb39c681785..035f1d1b0f9 100644 --- a/service/migrationhub/api_op_DescribeApplicationState.go +++ b/service/migrationhub/api_op_DescribeApplicationState.go @@ -58,6 +58,9 @@ func addOperationDescribeApplicationStateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeApplicationStateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_DescribeMigrationTask.go b/service/migrationhub/api_op_DescribeMigrationTask.go index 34612665564..d00ed50b5df 100644 --- a/service/migrationhub/api_op_DescribeMigrationTask.go +++ b/service/migrationhub/api_op_DescribeMigrationTask.go @@ -59,6 +59,9 @@ func addOperationDescribeMigrationTaskMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeMigrationTaskMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_DisassociateCreatedArtifact.go b/service/migrationhub/api_op_DisassociateCreatedArtifact.go index d3e1fe624da..1626a24f685 100644 --- a/service/migrationhub/api_op_DisassociateCreatedArtifact.go +++ b/service/migrationhub/api_op_DisassociateCreatedArtifact.go @@ -78,6 +78,9 @@ func addOperationDisassociateCreatedArtifactMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDisassociateCreatedArtifactMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_DisassociateDiscoveredResource.go b/service/migrationhub/api_op_DisassociateDiscoveredResource.go index 36066bb315e..0f65445c453 100644 --- a/service/migrationhub/api_op_DisassociateDiscoveredResource.go +++ b/service/migrationhub/api_op_DisassociateDiscoveredResource.go @@ -65,6 +65,9 @@ func addOperationDisassociateDiscoveredResourceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDisassociateDiscoveredResourceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_ImportMigrationTask.go b/service/migrationhub/api_op_ImportMigrationTask.go index 14c89cbaeb3..114a32e358a 100644 --- a/service/migrationhub/api_op_ImportMigrationTask.go +++ b/service/migrationhub/api_op_ImportMigrationTask.go @@ -61,6 +61,9 @@ func addOperationImportMigrationTaskMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationImportMigrationTaskMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_ListApplicationStates.go b/service/migrationhub/api_op_ListApplicationStates.go index cfa2325e09a..877312d9fd4 100644 --- a/service/migrationhub/api_op_ListApplicationStates.go +++ b/service/migrationhub/api_op_ListApplicationStates.go @@ -67,6 +67,9 @@ func addOperationListApplicationStatesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListApplicationStatesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_ListCreatedArtifacts.go b/service/migrationhub/api_op_ListCreatedArtifacts.go index f953ed47deb..e94867bd4a5 100644 --- a/service/migrationhub/api_op_ListCreatedArtifacts.go +++ b/service/migrationhub/api_op_ListCreatedArtifacts.go @@ -82,6 +82,9 @@ func addOperationListCreatedArtifactsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListCreatedArtifactsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_ListDiscoveredResources.go b/service/migrationhub/api_op_ListDiscoveredResources.go index 20ba334d391..466e3fba1ef 100644 --- a/service/migrationhub/api_op_ListDiscoveredResources.go +++ b/service/migrationhub/api_op_ListDiscoveredResources.go @@ -70,6 +70,9 @@ func addOperationListDiscoveredResourcesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListDiscoveredResourcesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_ListMigrationTasks.go b/service/migrationhub/api_op_ListMigrationTasks.go index 48590c30e9e..8fde875fd36 100644 --- a/service/migrationhub/api_op_ListMigrationTasks.go +++ b/service/migrationhub/api_op_ListMigrationTasks.go @@ -75,6 +75,9 @@ func addOperationListMigrationTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListMigrationTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_ListProgressUpdateStreams.go b/service/migrationhub/api_op_ListProgressUpdateStreams.go index ef6b5553481..40ff22d1a58 100644 --- a/service/migrationhub/api_op_ListProgressUpdateStreams.go +++ b/service/migrationhub/api_op_ListProgressUpdateStreams.go @@ -61,6 +61,9 @@ func addOperationListProgressUpdateStreamsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListProgressUpdateStreamsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_NotifyApplicationState.go b/service/migrationhub/api_op_NotifyApplicationState.go index 77435729db3..fdfd09e4c4a 100644 --- a/service/migrationhub/api_op_NotifyApplicationState.go +++ b/service/migrationhub/api_op_NotifyApplicationState.go @@ -65,6 +65,9 @@ func addOperationNotifyApplicationStateMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationNotifyApplicationStateMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_NotifyMigrationTaskState.go b/service/migrationhub/api_op_NotifyMigrationTaskState.go index 3f2b6f5087d..8daf48c6474 100644 --- a/service/migrationhub/api_op_NotifyMigrationTaskState.go +++ b/service/migrationhub/api_op_NotifyMigrationTaskState.go @@ -88,6 +88,9 @@ func addOperationNotifyMigrationTaskStateMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationNotifyMigrationTaskStateMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/api_op_PutResourceAttributes.go b/service/migrationhub/api_op_PutResourceAttributes.go index 10790e18fe9..1845443bfbc 100644 --- a/service/migrationhub/api_op_PutResourceAttributes.go +++ b/service/migrationhub/api_op_PutResourceAttributes.go @@ -101,6 +101,9 @@ func addOperationPutResourceAttributesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationPutResourceAttributesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhub/go.mod b/service/migrationhub/go.mod index 1786f877589..64ca2c6a99d 100644 --- a/service/migrationhub/go.mod +++ b/service/migrationhub/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhub go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhub/go.sum b/service/migrationhub/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/migrationhub/go.sum +++ b/service/migrationhub/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/migrationhubconfig/api_client.go b/service/migrationhubconfig/api_client.go index 367bb7cb9a9..bc4bf9883cc 100644 --- a/service/migrationhubconfig/api_client.go +++ b/service/migrationhubconfig/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/migrationhubconfig/api_op_CreateHomeRegionControl.go b/service/migrationhubconfig/api_op_CreateHomeRegionControl.go index 5dc8be31b79..d7b5a776f37 100644 --- a/service/migrationhubconfig/api_op_CreateHomeRegionControl.go +++ b/service/migrationhubconfig/api_op_CreateHomeRegionControl.go @@ -64,6 +64,9 @@ func addOperationCreateHomeRegionControlMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateHomeRegionControlMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go b/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go index 4a36954e547..0f5bcce1c62 100644 --- a/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go +++ b/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go @@ -72,6 +72,9 @@ func addOperationDescribeHomeRegionControlsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeHomeRegionControlsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhubconfig/api_op_GetHomeRegion.go b/service/migrationhubconfig/api_op_GetHomeRegion.go index 9c7d3a5ee79..70a3c704161 100644 --- a/service/migrationhubconfig/api_op_GetHomeRegion.go +++ b/service/migrationhubconfig/api_op_GetHomeRegion.go @@ -51,6 +51,9 @@ func addOperationGetHomeRegionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetHomeRegionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/migrationhubconfig/go.mod b/service/migrationhubconfig/go.mod index 615a93b4925..cb1ad46be6c 100644 --- a/service/migrationhubconfig/go.mod +++ b/service/migrationhubconfig/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhubconfig go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhubconfig/go.sum b/service/migrationhubconfig/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/migrationhubconfig/go.sum +++ b/service/migrationhubconfig/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mobile/api_client.go b/service/mobile/api_client.go index 4c3dc32a58b..945f636213e 100644 --- a/service/mobile/api_client.go +++ b/service/mobile/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mobile/api_op_CreateProject.go b/service/mobile/api_op_CreateProject.go index 995ae697ddc..ee84c658a93 100644 --- a/service/mobile/api_op_CreateProject.go +++ b/service/mobile/api_op_CreateProject.go @@ -65,6 +65,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_DeleteProject.go b/service/mobile/api_op_DeleteProject.go index 1bdb61a57be..4fb30426835 100644 --- a/service/mobile/api_op_DeleteProject.go +++ b/service/mobile/api_op_DeleteProject.go @@ -59,6 +59,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_DescribeBundle.go b/service/mobile/api_op_DescribeBundle.go index f7c1467cbad..f53245583b8 100644 --- a/service/mobile/api_op_DescribeBundle.go +++ b/service/mobile/api_op_DescribeBundle.go @@ -55,6 +55,9 @@ func addOperationDescribeBundleMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeBundleMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_DescribeProject.go b/service/mobile/api_op_DescribeProject.go index ccf62aaea3b..95fb9c54a22 100644 --- a/service/mobile/api_op_DescribeProject.go +++ b/service/mobile/api_op_DescribeProject.go @@ -60,6 +60,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeProjectMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_ExportBundle.go b/service/mobile/api_op_ExportBundle.go index 90d7a9d47bd..6eb9f7bb6f2 100644 --- a/service/mobile/api_op_ExportBundle.go +++ b/service/mobile/api_op_ExportBundle.go @@ -66,6 +66,9 @@ func addOperationExportBundleMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationExportBundleMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_ExportProject.go b/service/mobile/api_op_ExportProject.go index c67447e9039..ac09eff91b9 100644 --- a/service/mobile/api_op_ExportProject.go +++ b/service/mobile/api_op_ExportProject.go @@ -68,6 +68,9 @@ func addOperationExportProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationExportProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_ListBundles.go b/service/mobile/api_op_ListBundles.go index 9e808903843..242dcfbea35 100644 --- a/service/mobile/api_op_ListBundles.go +++ b/service/mobile/api_op_ListBundles.go @@ -62,6 +62,9 @@ func addOperationListBundlesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListBundlesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_ListProjects.go b/service/mobile/api_op_ListProjects.go index 220c7b0d624..692c412599e 100644 --- a/service/mobile/api_op_ListProjects.go +++ b/service/mobile/api_op_ListProjects.go @@ -63,6 +63,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListProjectsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/api_op_UpdateProject.go b/service/mobile/api_op_UpdateProject.go index 24ca2c5fc08..4a851eb132e 100644 --- a/service/mobile/api_op_UpdateProject.go +++ b/service/mobile/api_op_UpdateProject.go @@ -60,6 +60,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mobile/go.mod b/service/mobile/go.mod index 5c84e01a822..7de0b264633 100644 --- a/service/mobile/go.mod +++ b/service/mobile/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mobile go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mobile/go.sum b/service/mobile/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mobile/go.sum +++ b/service/mobile/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mq/api_client.go b/service/mq/api_client.go index 48e273f8530..9228ef7eb40 100644 --- a/service/mq/api_client.go +++ b/service/mq/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mq/api_op_CreateBroker.go b/service/mq/api_op_CreateBroker.go index c50bb47e565..b1ad4a6d9b2 100644 --- a/service/mq/api_op_CreateBroker.go +++ b/service/mq/api_op_CreateBroker.go @@ -130,6 +130,9 @@ func addOperationCreateBrokerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationCreateBrokerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_CreateConfiguration.go b/service/mq/api_op_CreateConfiguration.go index 79b2a38be39..9ed9d7512e3 100644 --- a/service/mq/api_op_CreateConfiguration.go +++ b/service/mq/api_op_CreateConfiguration.go @@ -89,6 +89,9 @@ func addOperationCreateConfigurationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateConfigurationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_CreateTags.go b/service/mq/api_op_CreateTags.go index 8fdb6ceb699..f639ad72b50 100644 --- a/service/mq/api_op_CreateTags.go +++ b/service/mq/api_op_CreateTags.go @@ -52,6 +52,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_CreateUser.go b/service/mq/api_op_CreateUser.go index 404a72610bb..00d3b710a21 100644 --- a/service/mq/api_op_CreateUser.go +++ b/service/mq/api_op_CreateUser.go @@ -68,6 +68,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DeleteBroker.go b/service/mq/api_op_DeleteBroker.go index 700018815b5..77e84fcb797 100644 --- a/service/mq/api_op_DeleteBroker.go +++ b/service/mq/api_op_DeleteBroker.go @@ -52,6 +52,9 @@ func addOperationDeleteBrokerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteBrokerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DeleteTags.go b/service/mq/api_op_DeleteTags.go index bf047a9e29e..d7494aeca24 100644 --- a/service/mq/api_op_DeleteTags.go +++ b/service/mq/api_op_DeleteTags.go @@ -53,6 +53,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DeleteUser.go b/service/mq/api_op_DeleteUser.go index 76941fdb50b..b097fb40107 100644 --- a/service/mq/api_op_DeleteUser.go +++ b/service/mq/api_op_DeleteUser.go @@ -55,6 +55,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DescribeBroker.go b/service/mq/api_op_DescribeBroker.go index 2e3639bfa57..c3e3fa0a98b 100644 --- a/service/mq/api_op_DescribeBroker.go +++ b/service/mq/api_op_DescribeBroker.go @@ -157,6 +157,9 @@ func addOperationDescribeBrokerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -199,6 +202,9 @@ func addOperationDescribeBrokerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DescribeBrokerEngineTypes.go b/service/mq/api_op_DescribeBrokerEngineTypes.go index 5b7209f973f..ad56a1b3d74 100644 --- a/service/mq/api_op_DescribeBrokerEngineTypes.go +++ b/service/mq/api_op_DescribeBrokerEngineTypes.go @@ -67,6 +67,9 @@ func addOperationDescribeBrokerEngineTypesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeBrokerEngineTypesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DescribeBrokerInstanceOptions.go b/service/mq/api_op_DescribeBrokerInstanceOptions.go index da9d8ad8724..b2ad47f924c 100644 --- a/service/mq/api_op_DescribeBrokerInstanceOptions.go +++ b/service/mq/api_op_DescribeBrokerInstanceOptions.go @@ -73,6 +73,9 @@ func addOperationDescribeBrokerInstanceOptionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeBrokerInstanceOptionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DescribeConfiguration.go b/service/mq/api_op_DescribeConfiguration.go index 01c32886356..8e6792b6c95 100644 --- a/service/mq/api_op_DescribeConfiguration.go +++ b/service/mq/api_op_DescribeConfiguration.go @@ -86,6 +86,9 @@ func addOperationDescribeConfigurationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeConfigurationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DescribeConfigurationRevision.go b/service/mq/api_op_DescribeConfigurationRevision.go index c81611be245..fd941f9c16a 100644 --- a/service/mq/api_op_DescribeConfigurationRevision.go +++ b/service/mq/api_op_DescribeConfigurationRevision.go @@ -67,6 +67,9 @@ func addOperationDescribeConfigurationRevisionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeConfigurationRevisionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_DescribeUser.go b/service/mq/api_op_DescribeUser.go index 52f53dda583..84fd9c8535e 100644 --- a/service/mq/api_op_DescribeUser.go +++ b/service/mq/api_op_DescribeUser.go @@ -76,6 +76,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_ListBrokers.go b/service/mq/api_op_ListBrokers.go index 7eb7b28c1d9..45b578b4be5 100644 --- a/service/mq/api_op_ListBrokers.go +++ b/service/mq/api_op_ListBrokers.go @@ -60,6 +60,9 @@ func addOperationListBrokersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListBrokersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_ListConfigurationRevisions.go b/service/mq/api_op_ListConfigurationRevisions.go index 47f4796bd4d..74a57cfcaaa 100644 --- a/service/mq/api_op_ListConfigurationRevisions.go +++ b/service/mq/api_op_ListConfigurationRevisions.go @@ -72,6 +72,9 @@ func addOperationListConfigurationRevisionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListConfigurationRevisionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_ListConfigurations.go b/service/mq/api_op_ListConfigurations.go index b274a4fff51..90cb392c520 100644 --- a/service/mq/api_op_ListConfigurations.go +++ b/service/mq/api_op_ListConfigurations.go @@ -64,6 +64,9 @@ func addOperationListConfigurationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListConfigurationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_ListTags.go b/service/mq/api_op_ListTags.go index c8c2b087605..11425ffb68c 100644 --- a/service/mq/api_op_ListTags.go +++ b/service/mq/api_op_ListTags.go @@ -52,6 +52,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_ListUsers.go b/service/mq/api_op_ListUsers.go index 3172f3987d4..e1e45fc66cd 100644 --- a/service/mq/api_op_ListUsers.go +++ b/service/mq/api_op_ListUsers.go @@ -72,6 +72,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_RebootBroker.go b/service/mq/api_op_RebootBroker.go index 31048637071..d7a6c7f68ae 100644 --- a/service/mq/api_op_RebootBroker.go +++ b/service/mq/api_op_RebootBroker.go @@ -48,6 +48,9 @@ func addOperationRebootBrokerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationRebootBrokerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_UpdateBroker.go b/service/mq/api_op_UpdateBroker.go index d5d2dd690a4..f21c88aba0b 100644 --- a/service/mq/api_op_UpdateBroker.go +++ b/service/mq/api_op_UpdateBroker.go @@ -115,6 +115,9 @@ func addOperationUpdateBrokerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateBrokerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_UpdateConfiguration.go b/service/mq/api_op_UpdateConfiguration.go index 8fa40d354df..30ba7785924 100644 --- a/service/mq/api_op_UpdateConfiguration.go +++ b/service/mq/api_op_UpdateConfiguration.go @@ -79,6 +79,9 @@ func addOperationUpdateConfigurationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateConfigurationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/api_op_UpdateUser.go b/service/mq/api_op_UpdateUser.go index 584398cc86a..83b2f054e60 100644 --- a/service/mq/api_op_UpdateUser.go +++ b/service/mq/api_op_UpdateUser.go @@ -68,6 +68,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mq/go.mod b/service/mq/go.mod index 9029564668b..b12d67f1d84 100644 --- a/service/mq/go.mod +++ b/service/mq/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mq go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mq/go.sum b/service/mq/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mq/go.sum +++ b/service/mq/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mturk/api_client.go b/service/mturk/api_client.go index 7617525f3e5..efd81faf39c 100644 --- a/service/mturk/api_client.go +++ b/service/mturk/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/mturk/api_op_AcceptQualificationRequest.go b/service/mturk/api_op_AcceptQualificationRequest.go index 72036b71a53..9ebcfb1d37f 100644 --- a/service/mturk/api_op_AcceptQualificationRequest.go +++ b/service/mturk/api_op_AcceptQualificationRequest.go @@ -56,6 +56,9 @@ func addOperationAcceptQualificationRequestMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAcceptQualificationRequestMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ApproveAssignment.go b/service/mturk/api_op_ApproveAssignment.go index ab49caef8eb..c84eb2b2471 100644 --- a/service/mturk/api_op_ApproveAssignment.go +++ b/service/mturk/api_op_ApproveAssignment.go @@ -74,6 +74,9 @@ func addOperationApproveAssignmentMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationApproveAssignmentMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_AssociateQualificationWithWorker.go b/service/mturk/api_op_AssociateQualificationWithWorker.go index c4ddf33d987..20ab15f6c7c 100644 --- a/service/mturk/api_op_AssociateQualificationWithWorker.go +++ b/service/mturk/api_op_AssociateQualificationWithWorker.go @@ -71,6 +71,9 @@ func addOperationAssociateQualificationWithWorkerMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationAssociateQualificationWithWorkerMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go b/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go index a432ba9dc2b..b8b5a60d8c7 100644 --- a/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go +++ b/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go @@ -74,6 +74,9 @@ func addOperationCreateAdditionalAssignmentsForHITMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateAdditionalAssignmentsForHITMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_CreateHIT.go b/service/mturk/api_op_CreateHIT.go index f1ebef7a0b2..c96b29c9294 100644 --- a/service/mturk/api_op_CreateHIT.go +++ b/service/mturk/api_op_CreateHIT.go @@ -169,6 +169,9 @@ func addOperationCreateHITMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -211,6 +214,9 @@ func addOperationCreateHITMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_CreateHITType.go b/service/mturk/api_op_CreateHITType.go index 21c364e7a77..3518a846553 100644 --- a/service/mturk/api_op_CreateHITType.go +++ b/service/mturk/api_op_CreateHITType.go @@ -98,6 +98,9 @@ func addOperationCreateHITTypeMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateHITTypeMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_CreateHITWithHITType.go b/service/mturk/api_op_CreateHITWithHITType.go index 8a1868e7785..c8a00254b3c 100644 --- a/service/mturk/api_op_CreateHITWithHITType.go +++ b/service/mturk/api_op_CreateHITWithHITType.go @@ -121,6 +121,9 @@ func addOperationCreateHITWithHITTypeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationCreateHITWithHITTypeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_CreateQualificationType.go b/service/mturk/api_op_CreateQualificationType.go index 6bd22e23afb..5fa460e5f33 100644 --- a/service/mturk/api_op_CreateQualificationType.go +++ b/service/mturk/api_op_CreateQualificationType.go @@ -110,6 +110,9 @@ func addOperationCreateQualificationTypeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationCreateQualificationTypeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_CreateWorkerBlock.go b/service/mturk/api_op_CreateWorkerBlock.go index adaec5704d0..9192de04dbc 100644 --- a/service/mturk/api_op_CreateWorkerBlock.go +++ b/service/mturk/api_op_CreateWorkerBlock.go @@ -56,6 +56,9 @@ func addOperationCreateWorkerBlockMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateWorkerBlockMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_DeleteHIT.go b/service/mturk/api_op_DeleteHIT.go index 5c74ef6a03d..8d68ff3d21a 100644 --- a/service/mturk/api_op_DeleteHIT.go +++ b/service/mturk/api_op_DeleteHIT.go @@ -67,6 +67,9 @@ func addOperationDeleteHITMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteHITMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_DeleteQualificationType.go b/service/mturk/api_op_DeleteQualificationType.go index a6f3ba634e6..b361fa242fc 100644 --- a/service/mturk/api_op_DeleteQualificationType.go +++ b/service/mturk/api_op_DeleteQualificationType.go @@ -57,6 +57,9 @@ func addOperationDeleteQualificationTypeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteQualificationTypeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_DeleteWorkerBlock.go b/service/mturk/api_op_DeleteWorkerBlock.go index 739bc690e15..931ef608159 100644 --- a/service/mturk/api_op_DeleteWorkerBlock.go +++ b/service/mturk/api_op_DeleteWorkerBlock.go @@ -57,6 +57,9 @@ func addOperationDeleteWorkerBlockMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteWorkerBlockMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_DisassociateQualificationFromWorker.go b/service/mturk/api_op_DisassociateQualificationFromWorker.go index 63f41cca1e1..1377a322684 100644 --- a/service/mturk/api_op_DisassociateQualificationFromWorker.go +++ b/service/mturk/api_op_DisassociateQualificationFromWorker.go @@ -60,6 +60,9 @@ func addOperationDisassociateQualificationFromWorkerMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisassociateQualificationFromWorkerMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_GetAccountBalance.go b/service/mturk/api_op_GetAccountBalance.go index 17babcbda49..1c4b062b7bb 100644 --- a/service/mturk/api_op_GetAccountBalance.go +++ b/service/mturk/api_op_GetAccountBalance.go @@ -51,6 +51,9 @@ func addOperationGetAccountBalanceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetAccountBalanceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_GetAssignment.go b/service/mturk/api_op_GetAssignment.go index e42f822e96f..4d1a2be6b45 100644 --- a/service/mturk/api_op_GetAssignment.go +++ b/service/mturk/api_op_GetAssignment.go @@ -56,6 +56,9 @@ func addOperationGetAssignmentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetAssignmentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_GetFileUploadURL.go b/service/mturk/api_op_GetFileUploadURL.go index f62268682c8..414b58286f2 100644 --- a/service/mturk/api_op_GetFileUploadURL.go +++ b/service/mturk/api_op_GetFileUploadURL.go @@ -69,6 +69,9 @@ func addOperationGetFileUploadURLMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetFileUploadURLMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_GetHIT.go b/service/mturk/api_op_GetHIT.go index 59e2fa06fb4..d1c49083d47 100644 --- a/service/mturk/api_op_GetHIT.go +++ b/service/mturk/api_op_GetHIT.go @@ -53,6 +53,9 @@ func addOperationGetHITMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetHITMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_GetQualificationScore.go b/service/mturk/api_op_GetQualificationScore.go index c32ceea63f3..1da42777ba1 100644 --- a/service/mturk/api_op_GetQualificationScore.go +++ b/service/mturk/api_op_GetQualificationScore.go @@ -63,6 +63,9 @@ func addOperationGetQualificationScoreMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetQualificationScoreMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_GetQualificationType.go b/service/mturk/api_op_GetQualificationType.go index 42b5d8c740a..abc85a1b311 100644 --- a/service/mturk/api_op_GetQualificationType.go +++ b/service/mturk/api_op_GetQualificationType.go @@ -54,6 +54,9 @@ func addOperationGetQualificationTypeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetQualificationTypeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListAssignmentsForHIT.go b/service/mturk/api_op_ListAssignmentsForHIT.go index 2d877d5b780..e6a97b07d29 100644 --- a/service/mturk/api_op_ListAssignmentsForHIT.go +++ b/service/mturk/api_op_ListAssignmentsForHIT.go @@ -83,6 +83,9 @@ func addOperationListAssignmentsForHITMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListAssignmentsForHITMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListBonusPayments.go b/service/mturk/api_op_ListBonusPayments.go index c701fb315cc..a2f22755f84 100644 --- a/service/mturk/api_op_ListBonusPayments.go +++ b/service/mturk/api_op_ListBonusPayments.go @@ -75,6 +75,9 @@ func addOperationListBonusPaymentsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListBonusPaymentsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListHITs.go b/service/mturk/api_op_ListHITs.go index a6779d3de9e..3129b2f8ed9 100644 --- a/service/mturk/api_op_ListHITs.go +++ b/service/mturk/api_op_ListHITs.go @@ -63,6 +63,9 @@ func addOperationListHITsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListHITsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListHITsForQualificationType.go b/service/mturk/api_op_ListHITsForQualificationType.go index 16396f919fd..eac85351e94 100644 --- a/service/mturk/api_op_ListHITsForQualificationType.go +++ b/service/mturk/api_op_ListHITsForQualificationType.go @@ -71,6 +71,9 @@ func addOperationListHITsForQualificationTypeMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListHITsForQualificationTypeMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListQualificationRequests.go b/service/mturk/api_op_ListQualificationRequests.go index 0373f88347a..14a5090c8f5 100644 --- a/service/mturk/api_op_ListQualificationRequests.go +++ b/service/mturk/api_op_ListQualificationRequests.go @@ -72,6 +72,9 @@ func addOperationListQualificationRequestsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListQualificationRequestsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListQualificationTypes.go b/service/mturk/api_op_ListQualificationTypes.go index 077a67a28a7..b7547e9802f 100644 --- a/service/mturk/api_op_ListQualificationTypes.go +++ b/service/mturk/api_op_ListQualificationTypes.go @@ -83,6 +83,9 @@ func addOperationListQualificationTypesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListQualificationTypesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListReviewPolicyResultsForHIT.go b/service/mturk/api_op_ListReviewPolicyResultsForHIT.go index 29b82c36bce..5ce61841b8d 100644 --- a/service/mturk/api_op_ListReviewPolicyResultsForHIT.go +++ b/service/mturk/api_op_ListReviewPolicyResultsForHIT.go @@ -95,6 +95,9 @@ func addOperationListReviewPolicyResultsForHITMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationListReviewPolicyResultsForHITMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListReviewableHITs.go b/service/mturk/api_op_ListReviewableHITs.go index 406d1964033..80b6b2ebb01 100644 --- a/service/mturk/api_op_ListReviewableHITs.go +++ b/service/mturk/api_op_ListReviewableHITs.go @@ -72,6 +72,9 @@ func addOperationListReviewableHITsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListReviewableHITsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListWorkerBlocks.go b/service/mturk/api_op_ListWorkerBlocks.go index eba55f2a00d..7cf35d2bc50 100644 --- a/service/mturk/api_op_ListWorkerBlocks.go +++ b/service/mturk/api_op_ListWorkerBlocks.go @@ -63,6 +63,9 @@ func addOperationListWorkerBlocksMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListWorkerBlocksMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_ListWorkersWithQualificationType.go b/service/mturk/api_op_ListWorkersWithQualificationType.go index 19f6c0a4034..dc4b67a6d69 100644 --- a/service/mturk/api_op_ListWorkersWithQualificationType.go +++ b/service/mturk/api_op_ListWorkersWithQualificationType.go @@ -72,6 +72,9 @@ func addOperationListWorkersWithQualificationTypeMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListWorkersWithQualificationTypeMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_NotifyWorkers.go b/service/mturk/api_op_NotifyWorkers.go index ab4b821b617..29733ff336c 100644 --- a/service/mturk/api_op_NotifyWorkers.go +++ b/service/mturk/api_op_NotifyWorkers.go @@ -69,6 +69,9 @@ func addOperationNotifyWorkersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationNotifyWorkersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_RejectAssignment.go b/service/mturk/api_op_RejectAssignment.go index 51dad95a131..cc01c379e4a 100644 --- a/service/mturk/api_op_RejectAssignment.go +++ b/service/mturk/api_op_RejectAssignment.go @@ -61,6 +61,9 @@ func addOperationRejectAssignmentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRejectAssignmentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_RejectQualificationRequest.go b/service/mturk/api_op_RejectQualificationRequest.go index a37e1d8990d..1d05f7001c1 100644 --- a/service/mturk/api_op_RejectQualificationRequest.go +++ b/service/mturk/api_op_RejectQualificationRequest.go @@ -55,6 +55,9 @@ func addOperationRejectQualificationRequestMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRejectQualificationRequestMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_SendBonus.go b/service/mturk/api_op_SendBonus.go index 03594ee593f..44613266b30 100644 --- a/service/mturk/api_op_SendBonus.go +++ b/service/mturk/api_op_SendBonus.go @@ -81,6 +81,9 @@ func addOperationSendBonusMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationSendBonusMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_SendTestEventNotification.go b/service/mturk/api_op_SendTestEventNotification.go index 51a44446429..aee45d60033 100644 --- a/service/mturk/api_op_SendTestEventNotification.go +++ b/service/mturk/api_op_SendTestEventNotification.go @@ -64,6 +64,9 @@ func addOperationSendTestEventNotificationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationSendTestEventNotificationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_UpdateExpirationForHIT.go b/service/mturk/api_op_UpdateExpirationForHIT.go index bdb10eb4620..815af2be2fc 100644 --- a/service/mturk/api_op_UpdateExpirationForHIT.go +++ b/service/mturk/api_op_UpdateExpirationForHIT.go @@ -56,6 +56,9 @@ func addOperationUpdateExpirationForHITMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateExpirationForHITMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_UpdateHITReviewStatus.go b/service/mturk/api_op_UpdateHITReviewStatus.go index fb9fbafcb67..5c077965e5e 100644 --- a/service/mturk/api_op_UpdateHITReviewStatus.go +++ b/service/mturk/api_op_UpdateHITReviewStatus.go @@ -59,6 +59,9 @@ func addOperationUpdateHITReviewStatusMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateHITReviewStatusMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_UpdateHITTypeOfHIT.go b/service/mturk/api_op_UpdateHITTypeOfHIT.go index df4830dcf7a..d6511466bab 100644 --- a/service/mturk/api_op_UpdateHITTypeOfHIT.go +++ b/service/mturk/api_op_UpdateHITTypeOfHIT.go @@ -56,6 +56,9 @@ func addOperationUpdateHITTypeOfHITMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateHITTypeOfHITMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_UpdateNotificationSettings.go b/service/mturk/api_op_UpdateNotificationSettings.go index 462cda32c21..1f478880c3b 100644 --- a/service/mturk/api_op_UpdateNotificationSettings.go +++ b/service/mturk/api_op_UpdateNotificationSettings.go @@ -68,6 +68,9 @@ func addOperationUpdateNotificationSettingsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateNotificationSettingsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/api_op_UpdateQualificationType.go b/service/mturk/api_op_UpdateQualificationType.go index 03d5fa6e93d..9368e42b134 100644 --- a/service/mturk/api_op_UpdateQualificationType.go +++ b/service/mturk/api_op_UpdateQualificationType.go @@ -115,6 +115,9 @@ func addOperationUpdateQualificationTypeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateQualificationTypeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/mturk/go.mod b/service/mturk/go.mod index a74bb104862..a0ffb61a49e 100644 --- a/service/mturk/go.mod +++ b/service/mturk/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/mturk go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mturk/go.sum b/service/mturk/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/mturk/go.sum +++ b/service/mturk/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/neptune/api_client.go b/service/neptune/api_client.go index 79fecb34fce..88be2eb3651 100644 --- a/service/neptune/api_client.go +++ b/service/neptune/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/neptune/api_op_AddRoleToDBCluster.go b/service/neptune/api_op_AddRoleToDBCluster.go index d976026beed..7d29b913d80 100644 --- a/service/neptune/api_op_AddRoleToDBCluster.go +++ b/service/neptune/api_op_AddRoleToDBCluster.go @@ -59,6 +59,9 @@ func addOperationAddRoleToDBClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddRoleToDBClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_AddSourceIdentifierToSubscription.go b/service/neptune/api_op_AddSourceIdentifierToSubscription.go index 86351ee3df9..ac68fa6d310 100644 --- a/service/neptune/api_op_AddSourceIdentifierToSubscription.go +++ b/service/neptune/api_op_AddSourceIdentifierToSubscription.go @@ -73,6 +73,9 @@ func addOperationAddSourceIdentifierToSubscriptionMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationAddSourceIdentifierToSubscriptionMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_AddTagsToResource.go b/service/neptune/api_op_AddTagsToResource.go index 2a83d238ed8..b669891cd91 100644 --- a/service/neptune/api_op_AddTagsToResource.go +++ b/service/neptune/api_op_AddTagsToResource.go @@ -59,6 +59,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ApplyPendingMaintenanceAction.go b/service/neptune/api_op_ApplyPendingMaintenanceAction.go index 8ae90685748..0791d06667c 100644 --- a/service/neptune/api_op_ApplyPendingMaintenanceAction.go +++ b/service/neptune/api_op_ApplyPendingMaintenanceAction.go @@ -78,6 +78,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CopyDBClusterParameterGroup.go b/service/neptune/api_op_CopyDBClusterParameterGroup.go index 917ac1bb802..be13d1f013d 100644 --- a/service/neptune/api_op_CopyDBClusterParameterGroup.go +++ b/service/neptune/api_op_CopyDBClusterParameterGroup.go @@ -96,6 +96,9 @@ func addOperationCopyDBClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCopyDBClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CopyDBClusterSnapshot.go b/service/neptune/api_op_CopyDBClusterSnapshot.go index fadc5b29de6..3d35376d513 100644 --- a/service/neptune/api_op_CopyDBClusterSnapshot.go +++ b/service/neptune/api_op_CopyDBClusterSnapshot.go @@ -107,6 +107,9 @@ func addOperationCopyDBClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationCopyDBClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CopyDBParameterGroup.go b/service/neptune/api_op_CopyDBParameterGroup.go index b2ec85959ce..b6f25fcddeb 100644 --- a/service/neptune/api_op_CopyDBParameterGroup.go +++ b/service/neptune/api_op_CopyDBParameterGroup.go @@ -88,6 +88,9 @@ func addOperationCopyDBParameterGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCopyDBParameterGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBCluster.go b/service/neptune/api_op_CreateDBCluster.go index 6a92e83cb37..577e1357e79 100644 --- a/service/neptune/api_op_CreateDBCluster.go +++ b/service/neptune/api_op_CreateDBCluster.go @@ -212,6 +212,9 @@ func addOperationCreateDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -254,6 +257,9 @@ func addOperationCreateDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBClusterEndpoint.go b/service/neptune/api_op_CreateDBClusterEndpoint.go index 5362f40e269..455de61e913 100644 --- a/service/neptune/api_op_CreateDBClusterEndpoint.go +++ b/service/neptune/api_op_CreateDBClusterEndpoint.go @@ -127,6 +127,9 @@ func addOperationCreateDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBClusterParameterGroup.go b/service/neptune/api_op_CreateDBClusterParameterGroup.go index 6951408ea25..e01d3c3a58b 100644 --- a/service/neptune/api_op_CreateDBClusterParameterGroup.go +++ b/service/neptune/api_op_CreateDBClusterParameterGroup.go @@ -96,6 +96,9 @@ func addOperationCreateDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBClusterSnapshot.go b/service/neptune/api_op_CreateDBClusterSnapshot.go index 9d27f9f09d9..ccfa06e963d 100644 --- a/service/neptune/api_op_CreateDBClusterSnapshot.go +++ b/service/neptune/api_op_CreateDBClusterSnapshot.go @@ -79,6 +79,9 @@ func addOperationCreateDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBInstance.go b/service/neptune/api_op_CreateDBInstance.go index 507428e95d3..c0f1053dad6 100644 --- a/service/neptune/api_op_CreateDBInstance.go +++ b/service/neptune/api_op_CreateDBInstance.go @@ -273,6 +273,9 @@ func addOperationCreateDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -315,6 +318,9 @@ func addOperationCreateDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBParameterGroup.go b/service/neptune/api_op_CreateDBParameterGroup.go index 5c6a4158713..ed25da98a37 100644 --- a/service/neptune/api_op_CreateDBParameterGroup.go +++ b/service/neptune/api_op_CreateDBParameterGroup.go @@ -97,6 +97,9 @@ func addOperationCreateDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateDBSubnetGroup.go b/service/neptune/api_op_CreateDBSubnetGroup.go index dc844209fa0..5d300bdf4bd 100644 --- a/service/neptune/api_op_CreateDBSubnetGroup.go +++ b/service/neptune/api_op_CreateDBSubnetGroup.go @@ -70,6 +70,9 @@ func addOperationCreateDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_CreateEventSubscription.go b/service/neptune/api_op_CreateEventSubscription.go index 5cbc46b72e4..76c17588326 100644 --- a/service/neptune/api_op_CreateEventSubscription.go +++ b/service/neptune/api_op_CreateEventSubscription.go @@ -116,6 +116,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBCluster.go b/service/neptune/api_op_DeleteDBCluster.go index ed731240983..e259379c298 100644 --- a/service/neptune/api_op_DeleteDBCluster.go +++ b/service/neptune/api_op_DeleteDBCluster.go @@ -82,6 +82,9 @@ func addOperationDeleteDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDeleteDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBClusterEndpoint.go b/service/neptune/api_op_DeleteDBClusterEndpoint.go index 89d377ac553..11dccb525e0 100644 --- a/service/neptune/api_op_DeleteDBClusterEndpoint.go +++ b/service/neptune/api_op_DeleteDBClusterEndpoint.go @@ -103,6 +103,9 @@ func addOperationDeleteDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDeleteDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBClusterParameterGroup.go b/service/neptune/api_op_DeleteDBClusterParameterGroup.go index c945ae549a6..2c39e0b2f91 100644 --- a/service/neptune/api_op_DeleteDBClusterParameterGroup.go +++ b/service/neptune/api_op_DeleteDBClusterParameterGroup.go @@ -57,6 +57,9 @@ func addOperationDeleteDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBClusterSnapshot.go b/service/neptune/api_op_DeleteDBClusterSnapshot.go index abf3b385254..f0a2effd64d 100644 --- a/service/neptune/api_op_DeleteDBClusterSnapshot.go +++ b/service/neptune/api_op_DeleteDBClusterSnapshot.go @@ -57,6 +57,9 @@ func addOperationDeleteDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBInstance.go b/service/neptune/api_op_DeleteDBInstance.go index ef5b80dcb88..fce24b9baa8 100644 --- a/service/neptune/api_op_DeleteDBInstance.go +++ b/service/neptune/api_op_DeleteDBInstance.go @@ -95,6 +95,9 @@ func addOperationDeleteDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDeleteDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBParameterGroup.go b/service/neptune/api_op_DeleteDBParameterGroup.go index 7f3b44ff028..8b5151e42cc 100644 --- a/service/neptune/api_op_DeleteDBParameterGroup.go +++ b/service/neptune/api_op_DeleteDBParameterGroup.go @@ -57,6 +57,9 @@ func addOperationDeleteDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteDBSubnetGroup.go b/service/neptune/api_op_DeleteDBSubnetGroup.go index 7979d04f385..11a1817bca5 100644 --- a/service/neptune/api_op_DeleteDBSubnetGroup.go +++ b/service/neptune/api_op_DeleteDBSubnetGroup.go @@ -51,6 +51,9 @@ func addOperationDeleteDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DeleteEventSubscription.go b/service/neptune/api_op_DeleteEventSubscription.go index 41c19e10172..9f0da4f4e89 100644 --- a/service/neptune/api_op_DeleteEventSubscription.go +++ b/service/neptune/api_op_DeleteEventSubscription.go @@ -54,6 +54,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBClusterEndpoints.go b/service/neptune/api_op_DescribeDBClusterEndpoints.go index c7d62b78fcd..3b2eb9f255a 100644 --- a/service/neptune/api_op_DescribeDBClusterEndpoints.go +++ b/service/neptune/api_op_DescribeDBClusterEndpoints.go @@ -86,6 +86,9 @@ func addOperationDescribeDBClusterEndpointsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeDBClusterEndpointsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBClusterParameterGroups.go b/service/neptune/api_op_DescribeDBClusterParameterGroups.go index 570c2177b37..046a6dc9aa7 100644 --- a/service/neptune/api_op_DescribeDBClusterParameterGroups.go +++ b/service/neptune/api_op_DescribeDBClusterParameterGroups.go @@ -78,6 +78,9 @@ func addOperationDescribeDBClusterParameterGroupsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeDBClusterParameterGroupsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBClusterParameters.go b/service/neptune/api_op_DescribeDBClusterParameters.go index e86d94289ee..93fb6a61456 100644 --- a/service/neptune/api_op_DescribeDBClusterParameters.go +++ b/service/neptune/api_op_DescribeDBClusterParameters.go @@ -80,6 +80,9 @@ func addOperationDescribeDBClusterParametersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeDBClusterParametersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go b/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go index 626a0ccb2b0..f60c4bf7c7e 100644 --- a/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go +++ b/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go @@ -65,6 +65,9 @@ func addOperationDescribeDBClusterSnapshotAttributesMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeDBClusterSnapshotAttributesMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBClusterSnapshots.go b/service/neptune/api_op_DescribeDBClusterSnapshots.go index 86a842db542..d0a822b0ac3 100644 --- a/service/neptune/api_op_DescribeDBClusterSnapshots.go +++ b/service/neptune/api_op_DescribeDBClusterSnapshots.go @@ -126,6 +126,9 @@ func addOperationDescribeDBClusterSnapshotsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationDescribeDBClusterSnapshotsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBClusters.go b/service/neptune/api_op_DescribeDBClusters.go index 260dd731ecd..cac3f76fc40 100644 --- a/service/neptune/api_op_DescribeDBClusters.go +++ b/service/neptune/api_op_DescribeDBClusters.go @@ -87,6 +87,9 @@ func addOperationDescribeDBClustersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeDBClustersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBEngineVersions.go b/service/neptune/api_op_DescribeDBEngineVersions.go index 989dd3704a3..b576468d252 100644 --- a/service/neptune/api_op_DescribeDBEngineVersions.go +++ b/service/neptune/api_op_DescribeDBEngineVersions.go @@ -93,6 +93,9 @@ func addOperationDescribeDBEngineVersionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeDBEngineVersionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBInstances.go b/service/neptune/api_op_DescribeDBInstances.go index 25997bd6f83..bc6bca43f6c 100644 --- a/service/neptune/api_op_DescribeDBInstances.go +++ b/service/neptune/api_op_DescribeDBInstances.go @@ -90,6 +90,9 @@ func addOperationDescribeDBInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeDBInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBParameterGroups.go b/service/neptune/api_op_DescribeDBParameterGroups.go index 0786287f639..ba72dfc99b5 100644 --- a/service/neptune/api_op_DescribeDBParameterGroups.go +++ b/service/neptune/api_op_DescribeDBParameterGroups.go @@ -75,6 +75,9 @@ func addOperationDescribeDBParameterGroupsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeDBParameterGroupsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBParameters.go b/service/neptune/api_op_DescribeDBParameters.go index 76e207bbfbd..c21dc2d5981 100644 --- a/service/neptune/api_op_DescribeDBParameters.go +++ b/service/neptune/api_op_DescribeDBParameters.go @@ -79,6 +79,9 @@ func addOperationDescribeDBParametersMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeDBParametersMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeDBSubnetGroups.go b/service/neptune/api_op_DescribeDBSubnetGroups.go index 1842129f97c..9f867056ea0 100644 --- a/service/neptune/api_op_DescribeDBSubnetGroups.go +++ b/service/neptune/api_op_DescribeDBSubnetGroups.go @@ -73,6 +73,9 @@ func addOperationDescribeDBSubnetGroupsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeDBSubnetGroupsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go b/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go index 4fa0d465ff6..946b0d712a6 100644 --- a/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go +++ b/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go @@ -71,6 +71,9 @@ func addOperationDescribeEngineDefaultClusterParametersMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeEngineDefaultClusterParametersMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeEngineDefaultParameters.go b/service/neptune/api_op_DescribeEngineDefaultParameters.go index 58686c1ef5e..74684f5b686 100644 --- a/service/neptune/api_op_DescribeEngineDefaultParameters.go +++ b/service/neptune/api_op_DescribeEngineDefaultParameters.go @@ -70,6 +70,9 @@ func addOperationDescribeEngineDefaultParametersMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeEngineDefaultParametersMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeEventCategories.go b/service/neptune/api_op_DescribeEventCategories.go index 490c55a9c31..9dd206a0813 100644 --- a/service/neptune/api_op_DescribeEventCategories.go +++ b/service/neptune/api_op_DescribeEventCategories.go @@ -56,6 +56,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeEventSubscriptions.go b/service/neptune/api_op_DescribeEventSubscriptions.go index a4b27c3b289..df6d3d4d260 100644 --- a/service/neptune/api_op_DescribeEventSubscriptions.go +++ b/service/neptune/api_op_DescribeEventSubscriptions.go @@ -75,6 +75,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeEvents.go b/service/neptune/api_op_DescribeEvents.go index 9c16869acb4..e33247c210b 100644 --- a/service/neptune/api_op_DescribeEvents.go +++ b/service/neptune/api_op_DescribeEvents.go @@ -115,6 +115,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go b/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go index 7cbb8b8666f..dcadb57b9c0 100644 --- a/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go +++ b/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go @@ -90,6 +90,9 @@ func addOperationDescribeOrderableDBInstanceOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeOrderableDBInstanceOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribePendingMaintenanceActions.go b/service/neptune/api_op_DescribePendingMaintenanceActions.go index b5523870510..0aaef614c5b 100644 --- a/service/neptune/api_op_DescribePendingMaintenanceActions.go +++ b/service/neptune/api_op_DescribePendingMaintenanceActions.go @@ -83,6 +83,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_DescribeValidDBInstanceModifications.go b/service/neptune/api_op_DescribeValidDBInstanceModifications.go index 0b075cf3ccf..ba80857043f 100644 --- a/service/neptune/api_op_DescribeValidDBInstanceModifications.go +++ b/service/neptune/api_op_DescribeValidDBInstanceModifications.go @@ -58,6 +58,9 @@ func addOperationDescribeValidDBInstanceModificationsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeValidDBInstanceModificationsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_FailoverDBCluster.go b/service/neptune/api_op_FailoverDBCluster.go index a3d9aaf9652..3f1eb034c2c 100644 --- a/service/neptune/api_op_FailoverDBCluster.go +++ b/service/neptune/api_op_FailoverDBCluster.go @@ -68,6 +68,9 @@ func addOperationFailoverDBClusterMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationFailoverDBClusterMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ListTagsForResource.go b/service/neptune/api_op_ListTagsForResource.go index 5f26c1757c7..024dfec5876 100644 --- a/service/neptune/api_op_ListTagsForResource.go +++ b/service/neptune/api_op_ListTagsForResource.go @@ -59,6 +59,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBCluster.go b/service/neptune/api_op_ModifyDBCluster.go index 74a3974e7f2..f1f0dd33cb0 100644 --- a/service/neptune/api_op_ModifyDBCluster.go +++ b/service/neptune/api_op_ModifyDBCluster.go @@ -156,6 +156,9 @@ func addOperationModifyDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -198,6 +201,9 @@ func addOperationModifyDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBClusterEndpoint.go b/service/neptune/api_op_ModifyDBClusterEndpoint.go index e6bef6ed882..a2939e8352f 100644 --- a/service/neptune/api_op_ModifyDBClusterEndpoint.go +++ b/service/neptune/api_op_ModifyDBClusterEndpoint.go @@ -114,6 +114,9 @@ func addOperationModifyDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationModifyDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBClusterParameterGroup.go b/service/neptune/api_op_ModifyDBClusterParameterGroup.go index c94644a4cf4..be0670795d1 100644 --- a/service/neptune/api_op_ModifyDBClusterParameterGroup.go +++ b/service/neptune/api_op_ModifyDBClusterParameterGroup.go @@ -84,6 +84,9 @@ func addOperationModifyDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationModifyDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go b/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go index 2bd67eb973f..57fa2a64c6d 100644 --- a/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go +++ b/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go @@ -94,6 +94,9 @@ func addOperationModifyDBClusterSnapshotAttributeMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationModifyDBClusterSnapshotAttributeMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBInstance.go b/service/neptune/api_op_ModifyDBInstance.go index c4f629db684..2487f5d7f05 100644 --- a/service/neptune/api_op_ModifyDBInstance.go +++ b/service/neptune/api_op_ModifyDBInstance.go @@ -276,6 +276,9 @@ func addOperationModifyDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -318,6 +321,9 @@ func addOperationModifyDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBParameterGroup.go b/service/neptune/api_op_ModifyDBParameterGroup.go index 23c1823ecb4..708130acb68 100644 --- a/service/neptune/api_op_ModifyDBParameterGroup.go +++ b/service/neptune/api_op_ModifyDBParameterGroup.go @@ -81,6 +81,9 @@ func addOperationModifyDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationModifyDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyDBSubnetGroup.go b/service/neptune/api_op_ModifyDBSubnetGroup.go index 8f4520d1d2b..1b6cbddb924 100644 --- a/service/neptune/api_op_ModifyDBSubnetGroup.go +++ b/service/neptune/api_op_ModifyDBSubnetGroup.go @@ -65,6 +65,9 @@ func addOperationModifyDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationModifyDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ModifyEventSubscription.go b/service/neptune/api_op_ModifyEventSubscription.go index 3e47cfd01f1..ddfd36e5ba5 100644 --- a/service/neptune/api_op_ModifyEventSubscription.go +++ b/service/neptune/api_op_ModifyEventSubscription.go @@ -76,6 +76,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_PromoteReadReplicaDBCluster.go b/service/neptune/api_op_PromoteReadReplicaDBCluster.go index 284e90349a5..e9d71770cb8 100644 --- a/service/neptune/api_op_PromoteReadReplicaDBCluster.go +++ b/service/neptune/api_op_PromoteReadReplicaDBCluster.go @@ -54,6 +54,9 @@ func addOperationPromoteReadReplicaDBClusterMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationPromoteReadReplicaDBClusterMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_RebootDBInstance.go b/service/neptune/api_op_RebootDBInstance.go index 9d0e4953149..7af65ba9987 100644 --- a/service/neptune/api_op_RebootDBInstance.go +++ b/service/neptune/api_op_RebootDBInstance.go @@ -66,6 +66,9 @@ func addOperationRebootDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRebootDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_RemoveRoleFromDBCluster.go b/service/neptune/api_op_RemoveRoleFromDBCluster.go index 0886e3cf653..1e50bd09cc4 100644 --- a/service/neptune/api_op_RemoveRoleFromDBCluster.go +++ b/service/neptune/api_op_RemoveRoleFromDBCluster.go @@ -59,6 +59,9 @@ func addOperationRemoveRoleFromDBClusterMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRemoveRoleFromDBClusterMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go b/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go index 0b93fa100a9..fd16b750da6 100644 --- a/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go +++ b/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go @@ -61,6 +61,9 @@ func addOperationRemoveSourceIdentifierFromSubscriptionMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRemoveSourceIdentifierFromSubscriptionMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_RemoveTagsFromResource.go b/service/neptune/api_op_RemoveTagsFromResource.go index b58f861829d..3db9219074b 100644 --- a/service/neptune/api_op_RemoveTagsFromResource.go +++ b/service/neptune/api_op_RemoveTagsFromResource.go @@ -56,6 +56,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ResetDBClusterParameterGroup.go b/service/neptune/api_op_ResetDBClusterParameterGroup.go index fb8cbbb046f..29a3b9c64fe 100644 --- a/service/neptune/api_op_ResetDBClusterParameterGroup.go +++ b/service/neptune/api_op_ResetDBClusterParameterGroup.go @@ -82,6 +82,9 @@ func addOperationResetDBClusterParameterGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationResetDBClusterParameterGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_ResetDBParameterGroup.go b/service/neptune/api_op_ResetDBParameterGroup.go index f4be5205f63..d666330f77c 100644 --- a/service/neptune/api_op_ResetDBParameterGroup.go +++ b/service/neptune/api_op_ResetDBParameterGroup.go @@ -72,6 +72,9 @@ func addOperationResetDBParameterGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationResetDBParameterGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_RestoreDBClusterFromSnapshot.go b/service/neptune/api_op_RestoreDBClusterFromSnapshot.go index 7c49c406b3f..07acc021f93 100644 --- a/service/neptune/api_op_RestoreDBClusterFromSnapshot.go +++ b/service/neptune/api_op_RestoreDBClusterFromSnapshot.go @@ -154,6 +154,9 @@ func addOperationRestoreDBClusterFromSnapshotMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -196,6 +199,9 @@ func addOperationRestoreDBClusterFromSnapshotMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_RestoreDBClusterToPointInTime.go b/service/neptune/api_op_RestoreDBClusterToPointInTime.go index 50ed62a78be..7a2d4cbd209 100644 --- a/service/neptune/api_op_RestoreDBClusterToPointInTime.go +++ b/service/neptune/api_op_RestoreDBClusterToPointInTime.go @@ -175,6 +175,9 @@ func addOperationRestoreDBClusterToPointInTimeMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -217,6 +220,9 @@ func addOperationRestoreDBClusterToPointInTimeMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_StartDBCluster.go b/service/neptune/api_op_StartDBCluster.go index 57bae77bfe2..54ece337610 100644 --- a/service/neptune/api_op_StartDBCluster.go +++ b/service/neptune/api_op_StartDBCluster.go @@ -56,6 +56,9 @@ func addOperationStartDBClusterMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartDBClusterMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/api_op_StopDBCluster.go b/service/neptune/api_op_StopDBCluster.go index f8cbaf21557..65f41bdfe40 100644 --- a/service/neptune/api_op_StopDBCluster.go +++ b/service/neptune/api_op_StopDBCluster.go @@ -58,6 +58,9 @@ func addOperationStopDBClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationStopDBClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/neptune/go.mod b/service/neptune/go.mod index 8eff5962af1..cd2192de393 100644 --- a/service/neptune/go.mod +++ b/service/neptune/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/neptune go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/neptune/go.sum b/service/neptune/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/neptune/go.sum +++ b/service/neptune/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/networkmanager/api_client.go b/service/networkmanager/api_client.go index 90b85b9dfc3..2f85b7cc278 100644 --- a/service/networkmanager/api_client.go +++ b/service/networkmanager/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/networkmanager/api_op_AssociateCustomerGateway.go b/service/networkmanager/api_op_AssociateCustomerGateway.go index 599ec389efd..f6b102be155 100644 --- a/service/networkmanager/api_op_AssociateCustomerGateway.go +++ b/service/networkmanager/api_op_AssociateCustomerGateway.go @@ -77,6 +77,9 @@ func addOperationAssociateCustomerGatewayMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAssociateCustomerGatewayMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_AssociateLink.go b/service/networkmanager/api_op_AssociateLink.go index 3f5cee1e9cd..22cdebdfc8e 100644 --- a/service/networkmanager/api_op_AssociateLink.go +++ b/service/networkmanager/api_op_AssociateLink.go @@ -65,6 +65,9 @@ func addOperationAssociateLinkMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAssociateLinkMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_CreateDevice.go b/service/networkmanager/api_op_CreateDevice.go index 0e1fdb56b7a..c2b125cceaa 100644 --- a/service/networkmanager/api_op_CreateDevice.go +++ b/service/networkmanager/api_op_CreateDevice.go @@ -81,6 +81,9 @@ func addOperationCreateDeviceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateDeviceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_CreateGlobalNetwork.go b/service/networkmanager/api_op_CreateGlobalNetwork.go index 8d2964f74c7..c76080300f3 100644 --- a/service/networkmanager/api_op_CreateGlobalNetwork.go +++ b/service/networkmanager/api_op_CreateGlobalNetwork.go @@ -55,6 +55,9 @@ func addOperationCreateGlobalNetworkMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationCreateGlobalNetworkMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_CreateLink.go b/service/networkmanager/api_op_CreateLink.go index be1b619e72e..2251cf4bf00 100644 --- a/service/networkmanager/api_op_CreateLink.go +++ b/service/networkmanager/api_op_CreateLink.go @@ -77,6 +77,9 @@ func addOperationCreateLinkMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateLinkMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_CreateSite.go b/service/networkmanager/api_op_CreateSite.go index 020febd3f92..0d05853c3ba 100644 --- a/service/networkmanager/api_op_CreateSite.go +++ b/service/networkmanager/api_op_CreateSite.go @@ -72,6 +72,9 @@ func addOperationCreateSiteMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateSiteMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DeleteDevice.go b/service/networkmanager/api_op_DeleteDevice.go index 62c0136ad1c..2f76cdf4306 100644 --- a/service/networkmanager/api_op_DeleteDevice.go +++ b/service/networkmanager/api_op_DeleteDevice.go @@ -59,6 +59,9 @@ func addOperationDeleteDeviceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteDeviceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DeleteGlobalNetwork.go b/service/networkmanager/api_op_DeleteGlobalNetwork.go index 9ea95eefd84..234384c17f2 100644 --- a/service/networkmanager/api_op_DeleteGlobalNetwork.go +++ b/service/networkmanager/api_op_DeleteGlobalNetwork.go @@ -54,6 +54,9 @@ func addOperationDeleteGlobalNetworkMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteGlobalNetworkMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DeleteLink.go b/service/networkmanager/api_op_DeleteLink.go index a99cf3ff03a..0b1a6e2011d 100644 --- a/service/networkmanager/api_op_DeleteLink.go +++ b/service/networkmanager/api_op_DeleteLink.go @@ -59,6 +59,9 @@ func addOperationDeleteLinkMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteLinkMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DeleteSite.go b/service/networkmanager/api_op_DeleteSite.go index 70085faf8eb..0d80591a3fd 100644 --- a/service/networkmanager/api_op_DeleteSite.go +++ b/service/networkmanager/api_op_DeleteSite.go @@ -58,6 +58,9 @@ func addOperationDeleteSiteMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteSiteMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DeregisterTransitGateway.go b/service/networkmanager/api_op_DeregisterTransitGateway.go index 18f0b4a2d5a..ce6c604b83b 100644 --- a/service/networkmanager/api_op_DeregisterTransitGateway.go +++ b/service/networkmanager/api_op_DeregisterTransitGateway.go @@ -60,6 +60,9 @@ func addOperationDeregisterTransitGatewayMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeregisterTransitGatewayMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DescribeGlobalNetworks.go b/service/networkmanager/api_op_DescribeGlobalNetworks.go index 5c51d6a604d..31f2981a6a9 100644 --- a/service/networkmanager/api_op_DescribeGlobalNetworks.go +++ b/service/networkmanager/api_op_DescribeGlobalNetworks.go @@ -63,6 +63,9 @@ func addOperationDescribeGlobalNetworksMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeGlobalNetworksMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DisassociateCustomerGateway.go b/service/networkmanager/api_op_DisassociateCustomerGateway.go index 5a118cf87c0..5376afe0348 100644 --- a/service/networkmanager/api_op_DisassociateCustomerGateway.go +++ b/service/networkmanager/api_op_DisassociateCustomerGateway.go @@ -60,6 +60,9 @@ func addOperationDisassociateCustomerGatewayMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisassociateCustomerGatewayMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_DisassociateLink.go b/service/networkmanager/api_op_DisassociateLink.go index fd297934735..7dec2e56245 100644 --- a/service/networkmanager/api_op_DisassociateLink.go +++ b/service/networkmanager/api_op_DisassociateLink.go @@ -64,6 +64,9 @@ func addOperationDisassociateLinkMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDisassociateLinkMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_GetCustomerGatewayAssociations.go b/service/networkmanager/api_op_GetCustomerGatewayAssociations.go index edb24af1bbc..d75a3eb3967 100644 --- a/service/networkmanager/api_op_GetCustomerGatewayAssociations.go +++ b/service/networkmanager/api_op_GetCustomerGatewayAssociations.go @@ -69,6 +69,9 @@ func addOperationGetCustomerGatewayAssociationsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetCustomerGatewayAssociationsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_GetDevices.go b/service/networkmanager/api_op_GetDevices.go index 505e8cdd8ff..b79df922057 100644 --- a/service/networkmanager/api_op_GetDevices.go +++ b/service/networkmanager/api_op_GetDevices.go @@ -68,6 +68,9 @@ func addOperationGetDevicesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetDevicesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_GetLinkAssociations.go b/service/networkmanager/api_op_GetLinkAssociations.go index aaadcf0e147..1cd5947982f 100644 --- a/service/networkmanager/api_op_GetLinkAssociations.go +++ b/service/networkmanager/api_op_GetLinkAssociations.go @@ -69,6 +69,9 @@ func addOperationGetLinkAssociationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetLinkAssociationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_GetLinks.go b/service/networkmanager/api_op_GetLinks.go index 567436ac0c3..e74070d06ca 100644 --- a/service/networkmanager/api_op_GetLinks.go +++ b/service/networkmanager/api_op_GetLinks.go @@ -76,6 +76,9 @@ func addOperationGetLinksMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetLinksMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_GetSites.go b/service/networkmanager/api_op_GetSites.go index 1388eecb24a..71b37adad08 100644 --- a/service/networkmanager/api_op_GetSites.go +++ b/service/networkmanager/api_op_GetSites.go @@ -65,6 +65,9 @@ func addOperationGetSitesMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetSitesMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_GetTransitGatewayRegistrations.go b/service/networkmanager/api_op_GetTransitGatewayRegistrations.go index 842b835ac3b..74753a81fe8 100644 --- a/service/networkmanager/api_op_GetTransitGatewayRegistrations.go +++ b/service/networkmanager/api_op_GetTransitGatewayRegistrations.go @@ -67,6 +67,9 @@ func addOperationGetTransitGatewayRegistrationsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetTransitGatewayRegistrationsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_ListTagsForResource.go b/service/networkmanager/api_op_ListTagsForResource.go index 3aa1ab4d690..07e1eefac9a 100644 --- a/service/networkmanager/api_op_ListTagsForResource.go +++ b/service/networkmanager/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_RegisterTransitGateway.go b/service/networkmanager/api_op_RegisterTransitGateway.go index 339f6b3586b..5583c55d803 100644 --- a/service/networkmanager/api_op_RegisterTransitGateway.go +++ b/service/networkmanager/api_op_RegisterTransitGateway.go @@ -63,6 +63,9 @@ func addOperationRegisterTransitGatewayMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRegisterTransitGatewayMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_TagResource.go b/service/networkmanager/api_op_TagResource.go index a6ba03c2b6e..94bef2a3345 100644 --- a/service/networkmanager/api_op_TagResource.go +++ b/service/networkmanager/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_UntagResource.go b/service/networkmanager/api_op_UntagResource.go index 50e32f09904..40f6ce65b0d 100644 --- a/service/networkmanager/api_op_UntagResource.go +++ b/service/networkmanager/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_UpdateDevice.go b/service/networkmanager/api_op_UpdateDevice.go index f0102a3d810..f690a13ff90 100644 --- a/service/networkmanager/api_op_UpdateDevice.go +++ b/service/networkmanager/api_op_UpdateDevice.go @@ -82,6 +82,9 @@ func addOperationUpdateDeviceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateDeviceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_UpdateGlobalNetwork.go b/service/networkmanager/api_op_UpdateGlobalNetwork.go index aca819357b8..98d93c64ce2 100644 --- a/service/networkmanager/api_op_UpdateGlobalNetwork.go +++ b/service/networkmanager/api_op_UpdateGlobalNetwork.go @@ -58,6 +58,9 @@ func addOperationUpdateGlobalNetworkMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateGlobalNetworkMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_UpdateLink.go b/service/networkmanager/api_op_UpdateLink.go index 1f605b0e6f4..c2f9b67c6e0 100644 --- a/service/networkmanager/api_op_UpdateLink.go +++ b/service/networkmanager/api_op_UpdateLink.go @@ -71,6 +71,9 @@ func addOperationUpdateLinkMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateLinkMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/api_op_UpdateSite.go b/service/networkmanager/api_op_UpdateSite.go index 22de22060e1..a9a4f8fa0dd 100644 --- a/service/networkmanager/api_op_UpdateSite.go +++ b/service/networkmanager/api_op_UpdateSite.go @@ -73,6 +73,9 @@ func addOperationUpdateSiteMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateSiteMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/networkmanager/go.mod b/service/networkmanager/go.mod index 9871bbf13be..0dcc0fa2f91 100644 --- a/service/networkmanager/go.mod +++ b/service/networkmanager/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/networkmanager go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/networkmanager/go.sum b/service/networkmanager/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/networkmanager/go.sum +++ b/service/networkmanager/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/opsworks/api_client.go b/service/opsworks/api_client.go index f7ea8350419..19b746d903e 100644 --- a/service/opsworks/api_client.go +++ b/service/opsworks/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/opsworks/api_op_AssignInstance.go b/service/opsworks/api_op_AssignInstance.go index 9939382aaa5..37139bb0dcc 100644 --- a/service/opsworks/api_op_AssignInstance.go +++ b/service/opsworks/api_op_AssignInstance.go @@ -70,6 +70,9 @@ func addOperationAssignInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAssignInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_AssignVolume.go b/service/opsworks/api_op_AssignVolume.go index b6517ff8bd4..3edf07fc399 100644 --- a/service/opsworks/api_op_AssignVolume.go +++ b/service/opsworks/api_op_AssignVolume.go @@ -60,6 +60,9 @@ func addOperationAssignVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAssignVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_AssociateElasticIp.go b/service/opsworks/api_op_AssociateElasticIp.go index 70a48cf51d6..e6644d6bbd3 100644 --- a/service/opsworks/api_op_AssociateElasticIp.go +++ b/service/opsworks/api_op_AssociateElasticIp.go @@ -58,6 +58,9 @@ func addOperationAssociateElasticIpMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAssociateElasticIpMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_AttachElasticLoadBalancer.go b/service/opsworks/api_op_AttachElasticLoadBalancer.go index a51641161f5..9b32250bd78 100644 --- a/service/opsworks/api_op_AttachElasticLoadBalancer.go +++ b/service/opsworks/api_op_AttachElasticLoadBalancer.go @@ -67,6 +67,9 @@ func addOperationAttachElasticLoadBalancerMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationAttachElasticLoadBalancerMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CloneStack.go b/service/opsworks/api_op_CloneStack.go index 5db8d9fb56b..69ee9bfa0fc 100644 --- a/service/opsworks/api_op_CloneStack.go +++ b/service/opsworks/api_op_CloneStack.go @@ -303,6 +303,9 @@ func addOperationCloneStackMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -345,6 +348,9 @@ func addOperationCloneStackMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CreateApp.go b/service/opsworks/api_op_CreateApp.go index 95b58c0b1c2..056b11530cc 100644 --- a/service/opsworks/api_op_CreateApp.go +++ b/service/opsworks/api_op_CreateApp.go @@ -113,6 +113,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CreateDeployment.go b/service/opsworks/api_op_CreateDeployment.go index 171e1792f18..e3c7e6f0c59 100644 --- a/service/opsworks/api_op_CreateDeployment.go +++ b/service/opsworks/api_op_CreateDeployment.go @@ -92,6 +92,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreateDeploymentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CreateInstance.go b/service/opsworks/api_op_CreateInstance.go index dc8f930fffc..59c00020ae5 100644 --- a/service/opsworks/api_op_CreateInstance.go +++ b/service/opsworks/api_op_CreateInstance.go @@ -203,6 +203,9 @@ func addOperationCreateInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -245,6 +248,9 @@ func addOperationCreateInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CreateLayer.go b/service/opsworks/api_op_CreateLayer.go index 95782fbaa29..9cfb9b48aab 100644 --- a/service/opsworks/api_op_CreateLayer.go +++ b/service/opsworks/api_op_CreateLayer.go @@ -152,6 +152,9 @@ func addOperationCreateLayerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationCreateLayerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CreateStack.go b/service/opsworks/api_op_CreateStack.go index 4e87969e9a5..4d64effc342 100644 --- a/service/opsworks/api_op_CreateStack.go +++ b/service/opsworks/api_op_CreateStack.go @@ -307,6 +307,9 @@ func addOperationCreateStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -349,6 +352,9 @@ func addOperationCreateStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_CreateUserProfile.go b/service/opsworks/api_op_CreateUserProfile.go index 559fffed812..5c914f6234d 100644 --- a/service/opsworks/api_op_CreateUserProfile.go +++ b/service/opsworks/api_op_CreateUserProfile.go @@ -71,6 +71,9 @@ func addOperationCreateUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeleteApp.go b/service/opsworks/api_op_DeleteApp.go index 52bb184e6fe..42a50b37a93 100644 --- a/service/opsworks/api_op_DeleteApp.go +++ b/service/opsworks/api_op_DeleteApp.go @@ -52,6 +52,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeleteInstance.go b/service/opsworks/api_op_DeleteInstance.go index efb5743c736..212a25f1e27 100644 --- a/service/opsworks/api_op_DeleteInstance.go +++ b/service/opsworks/api_op_DeleteInstance.go @@ -62,6 +62,9 @@ func addOperationDeleteInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeleteLayer.go b/service/opsworks/api_op_DeleteLayer.go index 9a5fc7cc636..80439074a49 100644 --- a/service/opsworks/api_op_DeleteLayer.go +++ b/service/opsworks/api_op_DeleteLayer.go @@ -56,6 +56,9 @@ func addOperationDeleteLayerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteLayerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeleteStack.go b/service/opsworks/api_op_DeleteStack.go index b53518d975d..a894dc2ca5b 100644 --- a/service/opsworks/api_op_DeleteStack.go +++ b/service/opsworks/api_op_DeleteStack.go @@ -55,6 +55,9 @@ func addOperationDeleteStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeleteUserProfile.go b/service/opsworks/api_op_DeleteUserProfile.go index 8e52961e850..dd37dcc27c6 100644 --- a/service/opsworks/api_op_DeleteUserProfile.go +++ b/service/opsworks/api_op_DeleteUserProfile.go @@ -51,6 +51,9 @@ func addOperationDeleteUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeregisterEcsCluster.go b/service/opsworks/api_op_DeregisterEcsCluster.go index 7547e89dd74..292ea7f1e29 100644 --- a/service/opsworks/api_op_DeregisterEcsCluster.go +++ b/service/opsworks/api_op_DeregisterEcsCluster.go @@ -55,6 +55,9 @@ func addOperationDeregisterEcsClusterMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeregisterEcsClusterMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeregisterElasticIp.go b/service/opsworks/api_op_DeregisterElasticIp.go index a0fd197972e..c044b709158 100644 --- a/service/opsworks/api_op_DeregisterElasticIp.go +++ b/service/opsworks/api_op_DeregisterElasticIp.go @@ -54,6 +54,9 @@ func addOperationDeregisterElasticIpMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeregisterElasticIpMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeregisterInstance.go b/service/opsworks/api_op_DeregisterInstance.go index 82dbf189b34..5f216f1e2ab 100644 --- a/service/opsworks/api_op_DeregisterInstance.go +++ b/service/opsworks/api_op_DeregisterInstance.go @@ -54,6 +54,9 @@ func addOperationDeregisterInstanceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeregisterInstanceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeregisterRdsDbInstance.go b/service/opsworks/api_op_DeregisterRdsDbInstance.go index ab5b2fd9e61..2be04e70846 100644 --- a/service/opsworks/api_op_DeregisterRdsDbInstance.go +++ b/service/opsworks/api_op_DeregisterRdsDbInstance.go @@ -52,6 +52,9 @@ func addOperationDeregisterRdsDbInstanceMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeregisterRdsDbInstanceMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DeregisterVolume.go b/service/opsworks/api_op_DeregisterVolume.go index a0f038fca67..69c6e622615 100644 --- a/service/opsworks/api_op_DeregisterVolume.go +++ b/service/opsworks/api_op_DeregisterVolume.go @@ -56,6 +56,9 @@ func addOperationDeregisterVolumeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeregisterVolumeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeAgentVersions.go b/service/opsworks/api_op_DescribeAgentVersions.go index f9c1fdd241c..c398921ff5d 100644 --- a/service/opsworks/api_op_DescribeAgentVersions.go +++ b/service/opsworks/api_op_DescribeAgentVersions.go @@ -59,6 +59,9 @@ func addOperationDescribeAgentVersionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeAgentVersionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeApps.go b/service/opsworks/api_op_DescribeApps.go index 4e2c2ef48df..b8ab5705663 100644 --- a/service/opsworks/api_op_DescribeApps.go +++ b/service/opsworks/api_op_DescribeApps.go @@ -63,6 +63,9 @@ func addOperationDescribeAppsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeAppsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeCommands.go b/service/opsworks/api_op_DescribeCommands.go index 03cf21422f3..9ffeb63a744 100644 --- a/service/opsworks/api_op_DescribeCommands.go +++ b/service/opsworks/api_op_DescribeCommands.go @@ -67,6 +67,9 @@ func addOperationDescribeCommandsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeCommandsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeDeployments.go b/service/opsworks/api_op_DescribeDeployments.go index e5eb48cf607..c65677f38cf 100644 --- a/service/opsworks/api_op_DescribeDeployments.go +++ b/service/opsworks/api_op_DescribeDeployments.go @@ -67,6 +67,9 @@ func addOperationDescribeDeploymentsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeDeploymentsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeEcsClusters.go b/service/opsworks/api_op_DescribeEcsClusters.go index ceab128a462..0c60627ab76 100644 --- a/service/opsworks/api_op_DescribeEcsClusters.go +++ b/service/opsworks/api_op_DescribeEcsClusters.go @@ -84,6 +84,9 @@ func addOperationDescribeEcsClustersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeEcsClustersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeElasticIps.go b/service/opsworks/api_op_DescribeElasticIps.go index 8cf4d86912a..001ae6b4b44 100644 --- a/service/opsworks/api_op_DescribeElasticIps.go +++ b/service/opsworks/api_op_DescribeElasticIps.go @@ -69,6 +69,9 @@ func addOperationDescribeElasticIpsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeElasticIpsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeElasticLoadBalancers.go b/service/opsworks/api_op_DescribeElasticLoadBalancers.go index e841f3f41da..5c736ad52ef 100644 --- a/service/opsworks/api_op_DescribeElasticLoadBalancers.go +++ b/service/opsworks/api_op_DescribeElasticLoadBalancers.go @@ -62,6 +62,9 @@ func addOperationDescribeElasticLoadBalancersMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeElasticLoadBalancersMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeInstances.go b/service/opsworks/api_op_DescribeInstances.go index 46e60edf67e..39cc10fe9a0 100644 --- a/service/opsworks/api_op_DescribeInstances.go +++ b/service/opsworks/api_op_DescribeInstances.go @@ -67,6 +67,9 @@ func addOperationDescribeInstancesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeInstancesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeLayers.go b/service/opsworks/api_op_DescribeLayers.go index 882ea9a17e0..c279e5cb07b 100644 --- a/service/opsworks/api_op_DescribeLayers.go +++ b/service/opsworks/api_op_DescribeLayers.go @@ -62,6 +62,9 @@ func addOperationDescribeLayersMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeLayersMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go b/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go index 48c1db2cdcc..af22748d183 100644 --- a/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go +++ b/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go @@ -60,6 +60,9 @@ func addOperationDescribeLoadBasedAutoScalingMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeLoadBasedAutoScalingMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeMyUserProfile.go b/service/opsworks/api_op_DescribeMyUserProfile.go index 371cd87463a..f304ee41a91 100644 --- a/service/opsworks/api_op_DescribeMyUserProfile.go +++ b/service/opsworks/api_op_DescribeMyUserProfile.go @@ -53,6 +53,9 @@ func addOperationDescribeMyUserProfileMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDescribeMyUserProfileMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeOperatingSystems.go b/service/opsworks/api_op_DescribeOperatingSystems.go index 189f96a2a31..3ad4f791bed 100644 --- a/service/opsworks/api_op_DescribeOperatingSystems.go +++ b/service/opsworks/api_op_DescribeOperatingSystems.go @@ -49,6 +49,9 @@ func addOperationDescribeOperatingSystemsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationDescribeOperatingSystemsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribePermissions.go b/service/opsworks/api_op_DescribePermissions.go index 0ca0545780d..4c71b9a3fb1 100644 --- a/service/opsworks/api_op_DescribePermissions.go +++ b/service/opsworks/api_op_DescribePermissions.go @@ -73,6 +73,9 @@ func addOperationDescribePermissionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribePermissionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeRaidArrays.go b/service/opsworks/api_op_DescribeRaidArrays.go index 22b22626a2a..deff38ffc14 100644 --- a/service/opsworks/api_op_DescribeRaidArrays.go +++ b/service/opsworks/api_op_DescribeRaidArrays.go @@ -66,6 +66,9 @@ func addOperationDescribeRaidArraysMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeRaidArraysMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeRdsDbInstances.go b/service/opsworks/api_op_DescribeRdsDbInstances.go index 65c00cad7cf..2de4c59a302 100644 --- a/service/opsworks/api_op_DescribeRdsDbInstances.go +++ b/service/opsworks/api_op_DescribeRdsDbInstances.go @@ -63,6 +63,9 @@ func addOperationDescribeRdsDbInstancesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeRdsDbInstancesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeServiceErrors.go b/service/opsworks/api_op_DescribeServiceErrors.go index 4d0544f9e8f..48b333056a2 100644 --- a/service/opsworks/api_op_DescribeServiceErrors.go +++ b/service/opsworks/api_op_DescribeServiceErrors.go @@ -67,6 +67,9 @@ func addOperationDescribeServiceErrorsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeServiceErrorsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeStackProvisioningParameters.go b/service/opsworks/api_op_DescribeStackProvisioningParameters.go index a2037fc03f9..c1bb800daad 100644 --- a/service/opsworks/api_op_DescribeStackProvisioningParameters.go +++ b/service/opsworks/api_op_DescribeStackProvisioningParameters.go @@ -61,6 +61,9 @@ func addOperationDescribeStackProvisioningParametersMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeStackProvisioningParametersMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeStackSummary.go b/service/opsworks/api_op_DescribeStackSummary.go index 7713fa0dedd..6e7892821d4 100644 --- a/service/opsworks/api_op_DescribeStackSummary.go +++ b/service/opsworks/api_op_DescribeStackSummary.go @@ -59,6 +59,9 @@ func addOperationDescribeStackSummaryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeStackSummaryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeStacks.go b/service/opsworks/api_op_DescribeStacks.go index 3cec87c6515..fa0f8dc44ed 100644 --- a/service/opsworks/api_op_DescribeStacks.go +++ b/service/opsworks/api_op_DescribeStacks.go @@ -57,6 +57,9 @@ func addOperationDescribeStacksMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeStacksMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go b/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go index d5b5be95a61..e53130c130a 100644 --- a/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go +++ b/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go @@ -60,6 +60,9 @@ func addOperationDescribeTimeBasedAutoScalingMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeTimeBasedAutoScalingMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeUserProfiles.go b/service/opsworks/api_op_DescribeUserProfiles.go index 4a5892ba4a2..cdb2eba03bd 100644 --- a/service/opsworks/api_op_DescribeUserProfiles.go +++ b/service/opsworks/api_op_DescribeUserProfiles.go @@ -55,6 +55,9 @@ func addOperationDescribeUserProfilesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDescribeUserProfilesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DescribeVolumes.go b/service/opsworks/api_op_DescribeVolumes.go index ff0900b9ed7..0fb5f2fab8a 100644 --- a/service/opsworks/api_op_DescribeVolumes.go +++ b/service/opsworks/api_op_DescribeVolumes.go @@ -70,6 +70,9 @@ func addOperationDescribeVolumesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeVolumesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DetachElasticLoadBalancer.go b/service/opsworks/api_op_DetachElasticLoadBalancer.go index 883249f59f4..a88afd4c607 100644 --- a/service/opsworks/api_op_DetachElasticLoadBalancer.go +++ b/service/opsworks/api_op_DetachElasticLoadBalancer.go @@ -57,6 +57,9 @@ func addOperationDetachElasticLoadBalancerMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDetachElasticLoadBalancerMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_DisassociateElasticIp.go b/service/opsworks/api_op_DisassociateElasticIp.go index c61a922d8d8..6fe8eb41cfc 100644 --- a/service/opsworks/api_op_DisassociateElasticIp.go +++ b/service/opsworks/api_op_DisassociateElasticIp.go @@ -54,6 +54,9 @@ func addOperationDisassociateElasticIpMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateElasticIpMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_GetHostnameSuggestion.go b/service/opsworks/api_op_GetHostnameSuggestion.go index d34851dda63..ee76e26fca5 100644 --- a/service/opsworks/api_op_GetHostnameSuggestion.go +++ b/service/opsworks/api_op_GetHostnameSuggestion.go @@ -61,6 +61,9 @@ func addOperationGetHostnameSuggestionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetHostnameSuggestionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_GrantAccess.go b/service/opsworks/api_op_GrantAccess.go index 5ec72ed57a2..88763cfde5c 100644 --- a/service/opsworks/api_op_GrantAccess.go +++ b/service/opsworks/api_op_GrantAccess.go @@ -62,6 +62,9 @@ func addOperationGrantAccessMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGrantAccessMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_ListTags.go b/service/opsworks/api_op_ListTags.go index 3831883cd01..c4512b7c483 100644 --- a/service/opsworks/api_op_ListTags.go +++ b/service/opsworks/api_op_ListTags.go @@ -68,6 +68,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_RebootInstance.go b/service/opsworks/api_op_RebootInstance.go index 88825c2ea0b..4ac486363fa 100644 --- a/service/opsworks/api_op_RebootInstance.go +++ b/service/opsworks/api_op_RebootInstance.go @@ -55,6 +55,9 @@ func addOperationRebootInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRebootInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_RegisterEcsCluster.go b/service/opsworks/api_op_RegisterEcsCluster.go index 73b9f1cc840..aca634d8e6d 100644 --- a/service/opsworks/api_op_RegisterEcsCluster.go +++ b/service/opsworks/api_op_RegisterEcsCluster.go @@ -66,6 +66,9 @@ func addOperationRegisterEcsClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRegisterEcsClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_RegisterElasticIp.go b/service/opsworks/api_op_RegisterElasticIp.go index 4ae05f6990d..900a6f09050 100644 --- a/service/opsworks/api_op_RegisterElasticIp.go +++ b/service/opsworks/api_op_RegisterElasticIp.go @@ -66,6 +66,9 @@ func addOperationRegisterElasticIpMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRegisterElasticIpMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_RegisterInstance.go b/service/opsworks/api_op_RegisterInstance.go index be6848d7274..0afe14c859b 100644 --- a/service/opsworks/api_op_RegisterInstance.go +++ b/service/opsworks/api_op_RegisterInstance.go @@ -91,6 +91,9 @@ func addOperationRegisterInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationRegisterInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_RegisterRdsDbInstance.go b/service/opsworks/api_op_RegisterRdsDbInstance.go index a800534ed23..3fe91b62214 100644 --- a/service/opsworks/api_op_RegisterRdsDbInstance.go +++ b/service/opsworks/api_op_RegisterRdsDbInstance.go @@ -67,6 +67,9 @@ func addOperationRegisterRdsDbInstanceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRegisterRdsDbInstanceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_RegisterVolume.go b/service/opsworks/api_op_RegisterVolume.go index 6bbde932305..673cbb14bf7 100644 --- a/service/opsworks/api_op_RegisterVolume.go +++ b/service/opsworks/api_op_RegisterVolume.go @@ -64,6 +64,9 @@ func addOperationRegisterVolumeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationRegisterVolumeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_SetLoadBasedAutoScaling.go b/service/opsworks/api_op_SetLoadBasedAutoScaling.go index d4c8aa9cdb7..857dc3073c8 100644 --- a/service/opsworks/api_op_SetLoadBasedAutoScaling.go +++ b/service/opsworks/api_op_SetLoadBasedAutoScaling.go @@ -72,6 +72,9 @@ func addOperationSetLoadBasedAutoScalingMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSetLoadBasedAutoScalingMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_SetPermission.go b/service/opsworks/api_op_SetPermission.go index 9c283d53e15..f361f233e58 100644 --- a/service/opsworks/api_op_SetPermission.go +++ b/service/opsworks/api_op_SetPermission.go @@ -85,6 +85,9 @@ func addOperationSetPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationSetPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_SetTimeBasedAutoScaling.go b/service/opsworks/api_op_SetTimeBasedAutoScaling.go index fe8cbbf1106..a0947e5e06a 100644 --- a/service/opsworks/api_op_SetTimeBasedAutoScaling.go +++ b/service/opsworks/api_op_SetTimeBasedAutoScaling.go @@ -59,6 +59,9 @@ func addOperationSetTimeBasedAutoScalingMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationSetTimeBasedAutoScalingMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_StartInstance.go b/service/opsworks/api_op_StartInstance.go index 7f7e4261663..bea0488668b 100644 --- a/service/opsworks/api_op_StartInstance.go +++ b/service/opsworks/api_op_StartInstance.go @@ -55,6 +55,9 @@ func addOperationStartInstanceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStartInstanceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_StartStack.go b/service/opsworks/api_op_StartStack.go index 6a7f052dab1..ef986e39578 100644 --- a/service/opsworks/api_op_StartStack.go +++ b/service/opsworks/api_op_StartStack.go @@ -52,6 +52,9 @@ func addOperationStartStackMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStartStackMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_StopInstance.go b/service/opsworks/api_op_StopInstance.go index c7eff096fdf..630e5ba410b 100644 --- a/service/opsworks/api_op_StopInstance.go +++ b/service/opsworks/api_op_StopInstance.go @@ -65,6 +65,9 @@ func addOperationStopInstanceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationStopInstanceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_StopStack.go b/service/opsworks/api_op_StopStack.go index 788e0951a87..e0a67cdf45a 100644 --- a/service/opsworks/api_op_StopStack.go +++ b/service/opsworks/api_op_StopStack.go @@ -52,6 +52,9 @@ func addOperationStopStackMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationStopStackMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_TagResource.go b/service/opsworks/api_op_TagResource.go index 759debd8c06..c8b4c565444 100644 --- a/service/opsworks/api_op_TagResource.go +++ b/service/opsworks/api_op_TagResource.go @@ -73,6 +73,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UnassignInstance.go b/service/opsworks/api_op_UnassignInstance.go index 7f96d05b9e7..ef194156cb4 100644 --- a/service/opsworks/api_op_UnassignInstance.go +++ b/service/opsworks/api_op_UnassignInstance.go @@ -55,6 +55,9 @@ func addOperationUnassignInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUnassignInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UnassignVolume.go b/service/opsworks/api_op_UnassignVolume.go index 107ee73662f..eac9a81f17d 100644 --- a/service/opsworks/api_op_UnassignVolume.go +++ b/service/opsworks/api_op_UnassignVolume.go @@ -54,6 +54,9 @@ func addOperationUnassignVolumeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUnassignVolumeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UntagResource.go b/service/opsworks/api_op_UntagResource.go index 3d29f46c01e..02cf04c8762 100644 --- a/service/opsworks/api_op_UntagResource.go +++ b/service/opsworks/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateApp.go b/service/opsworks/api_op_UpdateApp.go index a866eb4ed87..72a6bb4e06b 100644 --- a/service/opsworks/api_op_UpdateApp.go +++ b/service/opsworks/api_op_UpdateApp.go @@ -95,6 +95,9 @@ func addOperationUpdateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateElasticIp.go b/service/opsworks/api_op_UpdateElasticIp.go index 807d118971e..bafa699d5b6 100644 --- a/service/opsworks/api_op_UpdateElasticIp.go +++ b/service/opsworks/api_op_UpdateElasticIp.go @@ -57,6 +57,9 @@ func addOperationUpdateElasticIpMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateElasticIpMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateInstance.go b/service/opsworks/api_op_UpdateInstance.go index bbe2b62ccb8..b9114d15d7d 100644 --- a/service/opsworks/api_op_UpdateInstance.go +++ b/service/opsworks/api_op_UpdateInstance.go @@ -153,6 +153,9 @@ func addOperationUpdateInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -195,6 +198,9 @@ func addOperationUpdateInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateLayer.go b/service/opsworks/api_op_UpdateLayer.go index 9f352f38730..b91bf85f65e 100644 --- a/service/opsworks/api_op_UpdateLayer.go +++ b/service/opsworks/api_op_UpdateLayer.go @@ -125,6 +125,9 @@ func addOperationUpdateLayerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationUpdateLayerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateMyUserProfile.go b/service/opsworks/api_op_UpdateMyUserProfile.go index bc646bc4ded..6a981868a55 100644 --- a/service/opsworks/api_op_UpdateMyUserProfile.go +++ b/service/opsworks/api_op_UpdateMyUserProfile.go @@ -50,6 +50,9 @@ func addOperationUpdateMyUserProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationUpdateMyUserProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateRdsDbInstance.go b/service/opsworks/api_op_UpdateRdsDbInstance.go index 31738423bf5..4d392146333 100644 --- a/service/opsworks/api_op_UpdateRdsDbInstance.go +++ b/service/opsworks/api_op_UpdateRdsDbInstance.go @@ -58,6 +58,9 @@ func addOperationUpdateRdsDbInstanceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateRdsDbInstanceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateStack.go b/service/opsworks/api_op_UpdateStack.go index c3451225e4f..ebb48b505ec 100644 --- a/service/opsworks/api_op_UpdateStack.go +++ b/service/opsworks/api_op_UpdateStack.go @@ -240,6 +240,9 @@ func addOperationUpdateStackMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -282,6 +285,9 @@ func addOperationUpdateStackMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateUserProfile.go b/service/opsworks/api_op_UpdateUserProfile.go index bb6d8e87eee..ef39673d0ec 100644 --- a/service/opsworks/api_op_UpdateUserProfile.go +++ b/service/opsworks/api_op_UpdateUserProfile.go @@ -66,6 +66,9 @@ func addOperationUpdateUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/api_op_UpdateVolume.go b/service/opsworks/api_op_UpdateVolume.go index 929dfa75800..6b7c884dad3 100644 --- a/service/opsworks/api_op_UpdateVolume.go +++ b/service/opsworks/api_op_UpdateVolume.go @@ -60,6 +60,9 @@ func addOperationUpdateVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworks/go.mod b/service/opsworks/go.mod index f675586618e..c05edd79bdf 100644 --- a/service/opsworks/go.mod +++ b/service/opsworks/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/opsworks go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/opsworks/go.sum b/service/opsworks/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/opsworks/go.sum +++ b/service/opsworks/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/opsworkscm/api_client.go b/service/opsworkscm/api_client.go index ad3ad5f7740..a183d367130 100644 --- a/service/opsworkscm/api_client.go +++ b/service/opsworkscm/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/opsworkscm/api_op_AssociateNode.go b/service/opsworkscm/api_op_AssociateNode.go index 0e21bc5e514..3aea5e8c5f0 100644 --- a/service/opsworkscm/api_op_AssociateNode.go +++ b/service/opsworkscm/api_op_AssociateNode.go @@ -92,6 +92,9 @@ func addOperationAssociateNodeMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationAssociateNodeMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_CreateBackup.go b/service/opsworkscm/api_op_CreateBackup.go index 8a90122d39a..46f7d2036d8 100644 --- a/service/opsworkscm/api_op_CreateBackup.go +++ b/service/opsworkscm/api_op_CreateBackup.go @@ -84,6 +84,9 @@ func addOperationCreateBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateBackupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_CreateServer.go b/service/opsworkscm/api_op_CreateServer.go index 8e3ae24110c..8865c62b916 100644 --- a/service/opsworkscm/api_op_CreateServer.go +++ b/service/opsworkscm/api_op_CreateServer.go @@ -273,6 +273,9 @@ func addOperationCreateServerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -315,6 +318,9 @@ func addOperationCreateServerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DeleteBackup.go b/service/opsworkscm/api_op_DeleteBackup.go index 7fe5640d63b..2cd6ef019c3 100644 --- a/service/opsworkscm/api_op_DeleteBackup.go +++ b/service/opsworkscm/api_op_DeleteBackup.go @@ -53,6 +53,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteBackupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DeleteServer.go b/service/opsworkscm/api_op_DeleteServer.go index 991f992711b..4b2063ed33a 100644 --- a/service/opsworkscm/api_op_DeleteServer.go +++ b/service/opsworkscm/api_op_DeleteServer.go @@ -55,6 +55,9 @@ func addOperationDeleteServerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteServerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DescribeAccountAttributes.go b/service/opsworkscm/api_op_DescribeAccountAttributes.go index b172978663e..b5bcb7f4d64 100644 --- a/service/opsworkscm/api_op_DescribeAccountAttributes.go +++ b/service/opsworkscm/api_op_DescribeAccountAttributes.go @@ -48,6 +48,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DescribeBackups.go b/service/opsworkscm/api_op_DescribeBackups.go index 1ae80e25825..4b1440b2437 100644 --- a/service/opsworkscm/api_op_DescribeBackups.go +++ b/service/opsworkscm/api_op_DescribeBackups.go @@ -67,6 +67,9 @@ func addOperationDescribeBackupsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeBackupsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DescribeEvents.go b/service/opsworkscm/api_op_DescribeEvents.go index 60bb32ebca3..4aa94516277 100644 --- a/service/opsworkscm/api_op_DescribeEvents.go +++ b/service/opsworkscm/api_op_DescribeEvents.go @@ -80,6 +80,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go index 8f591e3b577..d33f9b8948c 100644 --- a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go +++ b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go @@ -76,6 +76,9 @@ func addOperationDescribeNodeAssociationStatusMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeNodeAssociationStatusMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DescribeServers.go b/service/opsworkscm/api_op_DescribeServers.go index 69ed14a60d4..9038f66c9e6 100644 --- a/service/opsworkscm/api_op_DescribeServers.go +++ b/service/opsworkscm/api_op_DescribeServers.go @@ -72,6 +72,9 @@ func addOperationDescribeServersMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeServersMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_DisassociateNode.go b/service/opsworkscm/api_op_DisassociateNode.go index 0ea1faf39ae..a837254abb8 100644 --- a/service/opsworkscm/api_op_DisassociateNode.go +++ b/service/opsworkscm/api_op_DisassociateNode.go @@ -74,6 +74,9 @@ func addOperationDisassociateNodeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDisassociateNodeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_ExportServerEngineAttribute.go b/service/opsworkscm/api_op_ExportServerEngineAttribute.go index 2732402cd80..d09d0f706b5 100644 --- a/service/opsworkscm/api_op_ExportServerEngineAttribute.go +++ b/service/opsworkscm/api_op_ExportServerEngineAttribute.go @@ -91,6 +91,9 @@ func addOperationExportServerEngineAttributeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationExportServerEngineAttributeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_ListTagsForResource.go b/service/opsworkscm/api_op_ListTagsForResource.go index 346fcd2c85f..32cea1b19d8 100644 --- a/service/opsworkscm/api_op_ListTagsForResource.go +++ b/service/opsworkscm/api_op_ListTagsForResource.go @@ -77,6 +77,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_RestoreServer.go b/service/opsworkscm/api_op_RestoreServer.go index bdb6f1956f5..b40ba970c7e 100644 --- a/service/opsworkscm/api_op_RestoreServer.go +++ b/service/opsworkscm/api_op_RestoreServer.go @@ -75,6 +75,9 @@ func addOperationRestoreServerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRestoreServerMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_StartMaintenance.go b/service/opsworkscm/api_op_StartMaintenance.go index 61d65552955..c66857da73e 100644 --- a/service/opsworkscm/api_op_StartMaintenance.go +++ b/service/opsworkscm/api_op_StartMaintenance.go @@ -70,6 +70,9 @@ func addOperationStartMaintenanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationStartMaintenanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_TagResource.go b/service/opsworkscm/api_op_TagResource.go index 65af2cd2678..7f1ce23cb58 100644 --- a/service/opsworkscm/api_op_TagResource.go +++ b/service/opsworkscm/api_op_TagResource.go @@ -74,6 +74,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_UntagResource.go b/service/opsworkscm/api_op_UntagResource.go index e74528ed83a..7d0e046a6ae 100644 --- a/service/opsworkscm/api_op_UntagResource.go +++ b/service/opsworkscm/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_UpdateServer.go b/service/opsworkscm/api_op_UpdateServer.go index cff1f8aa086..bc381011e29 100644 --- a/service/opsworkscm/api_op_UpdateServer.go +++ b/service/opsworkscm/api_op_UpdateServer.go @@ -70,6 +70,9 @@ func addOperationUpdateServerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateServerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/api_op_UpdateServerEngineAttributes.go b/service/opsworkscm/api_op_UpdateServerEngineAttributes.go index 76feb0c0acb..cefbdac0f1b 100644 --- a/service/opsworkscm/api_op_UpdateServerEngineAttributes.go +++ b/service/opsworkscm/api_op_UpdateServerEngineAttributes.go @@ -68,6 +68,9 @@ func addOperationUpdateServerEngineAttributesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateServerEngineAttributesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/opsworkscm/go.mod b/service/opsworkscm/go.mod index 8c462861a6a..d3dff7f1901 100644 --- a/service/opsworkscm/go.mod +++ b/service/opsworkscm/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/opsworkscm go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/opsworkscm/go.sum b/service/opsworkscm/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/opsworkscm/go.sum +++ b/service/opsworkscm/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/organizations/api_client.go b/service/organizations/api_client.go index 6ec37bb1e41..de3a5181d86 100644 --- a/service/organizations/api_client.go +++ b/service/organizations/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/organizations/api_op_AcceptHandshake.go b/service/organizations/api_op_AcceptHandshake.go index 401b965d76e..8e118989d9c 100644 --- a/service/organizations/api_op_AcceptHandshake.go +++ b/service/organizations/api_op_AcceptHandshake.go @@ -82,6 +82,9 @@ func addOperationAcceptHandshakeMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationAcceptHandshakeMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_AttachPolicy.go b/service/organizations/api_op_AttachPolicy.go index 12666d7c909..42bc4a87378 100644 --- a/service/organizations/api_op_AttachPolicy.go +++ b/service/organizations/api_op_AttachPolicy.go @@ -93,6 +93,9 @@ func addOperationAttachPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationAttachPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_CancelHandshake.go b/service/organizations/api_op_CancelHandshake.go index 2c00ce262c1..c52e43021da 100644 --- a/service/organizations/api_op_CancelHandshake.go +++ b/service/organizations/api_op_CancelHandshake.go @@ -62,6 +62,9 @@ func addOperationCancelHandshakeMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCancelHandshakeMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_CreateAccount.go b/service/organizations/api_op_CreateAccount.go index d9d4a8480f2..e031692c952 100644 --- a/service/organizations/api_op_CreateAccount.go +++ b/service/organizations/api_op_CreateAccount.go @@ -185,6 +185,9 @@ func addOperationCreateAccountMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -227,6 +230,9 @@ func addOperationCreateAccountMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_CreateGovCloudAccount.go b/service/organizations/api_op_CreateGovCloudAccount.go index d96aefd8a03..7a460ddf25a 100644 --- a/service/organizations/api_op_CreateGovCloudAccount.go +++ b/service/organizations/api_op_CreateGovCloudAccount.go @@ -225,6 +225,9 @@ func addOperationCreateGovCloudAccountMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -267,6 +270,9 @@ func addOperationCreateGovCloudAccountMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_CreateOrganization.go b/service/organizations/api_op_CreateOrganization.go index 7bd9a8fa4e0..3c9f572c3bc 100644 --- a/service/organizations/api_op_CreateOrganization.go +++ b/service/organizations/api_op_CreateOrganization.go @@ -77,6 +77,9 @@ func addOperationCreateOrganizationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateOrganizationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_CreateOrganizationalUnit.go b/service/organizations/api_op_CreateOrganizationalUnit.go index d0b6dc39046..218b6d37dbc 100644 --- a/service/organizations/api_op_CreateOrganizationalUnit.go +++ b/service/organizations/api_op_CreateOrganizationalUnit.go @@ -88,6 +88,9 @@ func addOperationCreateOrganizationalUnitMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateOrganizationalUnitMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_CreatePolicy.go b/service/organizations/api_op_CreatePolicy.go index 56818d75dd4..70d3c8d54c5 100644 --- a/service/organizations/api_op_CreatePolicy.go +++ b/service/organizations/api_op_CreatePolicy.go @@ -103,6 +103,9 @@ func addOperationCreatePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreatePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DeclineHandshake.go b/service/organizations/api_op_DeclineHandshake.go index c5b153310a5..72a87a85ab2 100644 --- a/service/organizations/api_op_DeclineHandshake.go +++ b/service/organizations/api_op_DeclineHandshake.go @@ -63,6 +63,9 @@ func addOperationDeclineHandshakeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeclineHandshakeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DeleteOrganization.go b/service/organizations/api_op_DeleteOrganization.go index 2052e40a55f..625c1961153 100644 --- a/service/organizations/api_op_DeleteOrganization.go +++ b/service/organizations/api_op_DeleteOrganization.go @@ -45,6 +45,9 @@ func addOperationDeleteOrganizationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationDeleteOrganizationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DeleteOrganizationalUnit.go b/service/organizations/api_op_DeleteOrganizationalUnit.go index 4c3a7324a13..eb4fe7b5629 100644 --- a/service/organizations/api_op_DeleteOrganizationalUnit.go +++ b/service/organizations/api_op_DeleteOrganizationalUnit.go @@ -55,6 +55,9 @@ func addOperationDeleteOrganizationalUnitMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteOrganizationalUnitMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DeletePolicy.go b/service/organizations/api_op_DeletePolicy.go index fe2b1aa3be8..6a651376eda 100644 --- a/service/organizations/api_op_DeletePolicy.go +++ b/service/organizations/api_op_DeletePolicy.go @@ -55,6 +55,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeletePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DeregisterDelegatedAdministrator.go b/service/organizations/api_op_DeregisterDelegatedAdministrator.go index 163e7f5e83b..58109360cbb 100644 --- a/service/organizations/api_op_DeregisterDelegatedAdministrator.go +++ b/service/organizations/api_op_DeregisterDelegatedAdministrator.go @@ -68,6 +68,9 @@ func addOperationDeregisterDelegatedAdministratorMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeregisterDelegatedAdministratorMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribeAccount.go b/service/organizations/api_op_DescribeAccount.go index 697b0adbc3e..1e99a0d1248 100644 --- a/service/organizations/api_op_DescribeAccount.go +++ b/service/organizations/api_op_DescribeAccount.go @@ -58,6 +58,9 @@ func addOperationDescribeAccountMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeAccountMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribeCreateAccountStatus.go b/service/organizations/api_op_DescribeCreateAccountStatus.go index 3bb5cb4b646..9de9c99d281 100644 --- a/service/organizations/api_op_DescribeCreateAccountStatus.go +++ b/service/organizations/api_op_DescribeCreateAccountStatus.go @@ -59,6 +59,9 @@ func addOperationDescribeCreateAccountStatusMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeCreateAccountStatusMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribeEffectivePolicy.go b/service/organizations/api_op_DescribeEffectivePolicy.go index 2d1004544dc..06edf393fa8 100644 --- a/service/organizations/api_op_DescribeEffectivePolicy.go +++ b/service/organizations/api_op_DescribeEffectivePolicy.go @@ -79,6 +79,9 @@ func addOperationDescribeEffectivePolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeEffectivePolicyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribeHandshake.go b/service/organizations/api_op_DescribeHandshake.go index 5362e15724f..19a7eef7460 100644 --- a/service/organizations/api_op_DescribeHandshake.go +++ b/service/organizations/api_op_DescribeHandshake.go @@ -62,6 +62,9 @@ func addOperationDescribeHandshakeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeHandshakeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribeOrganization.go b/service/organizations/api_op_DescribeOrganization.go index 270025a0c71..4141bdd4172 100644 --- a/service/organizations/api_op_DescribeOrganization.go +++ b/service/organizations/api_op_DescribeOrganization.go @@ -56,6 +56,9 @@ func addOperationDescribeOrganizationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeOrganizationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribeOrganizationalUnit.go b/service/organizations/api_op_DescribeOrganizationalUnit.go index 3af10c7fe14..1409f577701 100644 --- a/service/organizations/api_op_DescribeOrganizationalUnit.go +++ b/service/organizations/api_op_DescribeOrganizationalUnit.go @@ -60,6 +60,9 @@ func addOperationDescribeOrganizationalUnitMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeOrganizationalUnitMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DescribePolicy.go b/service/organizations/api_op_DescribePolicy.go index b3533576e7b..7dcdbf170c8 100644 --- a/service/organizations/api_op_DescribePolicy.go +++ b/service/organizations/api_op_DescribePolicy.go @@ -59,6 +59,9 @@ func addOperationDescribePolicyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribePolicyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DetachPolicy.go b/service/organizations/api_op_DetachPolicy.go index d532c40e7f3..e15ae5173fe 100644 --- a/service/organizations/api_op_DetachPolicy.go +++ b/service/organizations/api_op_DetachPolicy.go @@ -86,6 +86,9 @@ func addOperationDetachPolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDetachPolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DisableAWSServiceAccess.go b/service/organizations/api_op_DisableAWSServiceAccess.go index 7eeaaccda41..8311f6b946b 100644 --- a/service/organizations/api_op_DisableAWSServiceAccess.go +++ b/service/organizations/api_op_DisableAWSServiceAccess.go @@ -72,6 +72,9 @@ func addOperationDisableAWSServiceAccessMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDisableAWSServiceAccessMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_DisablePolicyType.go b/service/organizations/api_op_DisablePolicyType.go index bee03d531de..1a8e5531393 100644 --- a/service/organizations/api_op_DisablePolicyType.go +++ b/service/organizations/api_op_DisablePolicyType.go @@ -90,6 +90,9 @@ func addOperationDisablePolicyTypeMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDisablePolicyTypeMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_EnableAWSServiceAccess.go b/service/organizations/api_op_EnableAWSServiceAccess.go index be991557495..5aad4482c93 100644 --- a/service/organizations/api_op_EnableAWSServiceAccess.go +++ b/service/organizations/api_op_EnableAWSServiceAccess.go @@ -68,6 +68,9 @@ func addOperationEnableAWSServiceAccessMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationEnableAWSServiceAccessMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_EnableAllFeatures.go b/service/organizations/api_op_EnableAllFeatures.go index 514db8ca0c4..08b6b81f512 100644 --- a/service/organizations/api_op_EnableAllFeatures.go +++ b/service/organizations/api_op_EnableAllFeatures.go @@ -72,6 +72,9 @@ func addOperationEnableAllFeaturesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationEnableAllFeaturesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_EnablePolicyType.go b/service/organizations/api_op_EnablePolicyType.go index e145a0066f8..37024ba5efb 100644 --- a/service/organizations/api_op_EnablePolicyType.go +++ b/service/organizations/api_op_EnablePolicyType.go @@ -85,6 +85,9 @@ func addOperationEnablePolicyTypeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationEnablePolicyTypeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_InviteAccountToOrganization.go b/service/organizations/api_op_InviteAccountToOrganization.go index 6d707333713..ae245c93bbf 100644 --- a/service/organizations/api_op_InviteAccountToOrganization.go +++ b/service/organizations/api_op_InviteAccountToOrganization.go @@ -104,6 +104,9 @@ func addOperationInviteAccountToOrganizationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationInviteAccountToOrganizationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_LeaveOrganization.go b/service/organizations/api_op_LeaveOrganization.go index 33cd975cea4..c6098dc4d58 100644 --- a/service/organizations/api_op_LeaveOrganization.go +++ b/service/organizations/api_op_LeaveOrganization.go @@ -87,6 +87,9 @@ func addOperationLeaveOrganizationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationLeaveOrganizationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListAWSServiceAccessForOrganization.go b/service/organizations/api_op_ListAWSServiceAccessForOrganization.go index ad820a33f8a..93babe5beab 100644 --- a/service/organizations/api_op_ListAWSServiceAccessForOrganization.go +++ b/service/organizations/api_op_ListAWSServiceAccessForOrganization.go @@ -82,6 +82,9 @@ func addOperationListAWSServiceAccessForOrganizationMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListAWSServiceAccessForOrganizationMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListAccounts.go b/service/organizations/api_op_ListAccounts.go index 07c2df3dd0e..6578cc903db 100644 --- a/service/organizations/api_op_ListAccounts.go +++ b/service/organizations/api_op_ListAccounts.go @@ -79,6 +79,9 @@ func addOperationListAccountsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListAccountsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListAccountsForParent.go b/service/organizations/api_op_ListAccountsForParent.go index f57231d8afe..b6270279b0d 100644 --- a/service/organizations/api_op_ListAccountsForParent.go +++ b/service/organizations/api_op_ListAccountsForParent.go @@ -87,6 +87,9 @@ func addOperationListAccountsForParentMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListAccountsForParentMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListChildren.go b/service/organizations/api_op_ListChildren.go index 608d00d0822..d437c00aabd 100644 --- a/service/organizations/api_op_ListChildren.go +++ b/service/organizations/api_op_ListChildren.go @@ -99,6 +99,9 @@ func addOperationListChildrenMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationListChildrenMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListCreateAccountStatus.go b/service/organizations/api_op_ListCreateAccountStatus.go index bdfaf2c5c3a..37e9206c3af 100644 --- a/service/organizations/api_op_ListCreateAccountStatus.go +++ b/service/organizations/api_op_ListCreateAccountStatus.go @@ -84,6 +84,9 @@ func addOperationListCreateAccountStatusMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListCreateAccountStatusMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListDelegatedAdministrators.go b/service/organizations/api_op_ListDelegatedAdministrators.go index c4defe664b8..9e446381145 100644 --- a/service/organizations/api_op_ListDelegatedAdministrators.go +++ b/service/organizations/api_op_ListDelegatedAdministrators.go @@ -80,6 +80,9 @@ func addOperationListDelegatedAdministratorsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListDelegatedAdministratorsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListDelegatedServicesForAccount.go b/service/organizations/api_op_ListDelegatedServicesForAccount.go index 402e739c822..a2ab6aa85c7 100644 --- a/service/organizations/api_op_ListDelegatedServicesForAccount.go +++ b/service/organizations/api_op_ListDelegatedServicesForAccount.go @@ -79,6 +79,9 @@ func addOperationListDelegatedServicesForAccountMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListDelegatedServicesForAccountMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListHandshakesForAccount.go b/service/organizations/api_op_ListHandshakesForAccount.go index 32eaa9f69c2..a748acc9424 100644 --- a/service/organizations/api_op_ListHandshakesForAccount.go +++ b/service/organizations/api_op_ListHandshakesForAccount.go @@ -88,6 +88,9 @@ func addOperationListHandshakesForAccountMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListHandshakesForAccountMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListHandshakesForOrganization.go b/service/organizations/api_op_ListHandshakesForOrganization.go index f99c4cdfbb5..e6db515dba9 100644 --- a/service/organizations/api_op_ListHandshakesForOrganization.go +++ b/service/organizations/api_op_ListHandshakesForOrganization.go @@ -91,6 +91,9 @@ func addOperationListHandshakesForOrganizationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListHandshakesForOrganizationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListOrganizationalUnitsForParent.go b/service/organizations/api_op_ListOrganizationalUnitsForParent.go index 2992146d8cd..443a03bf1c1 100644 --- a/service/organizations/api_op_ListOrganizationalUnitsForParent.go +++ b/service/organizations/api_op_ListOrganizationalUnitsForParent.go @@ -92,6 +92,9 @@ func addOperationListOrganizationalUnitsForParentMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListOrganizationalUnitsForParentMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListParents.go b/service/organizations/api_op_ListParents.go index f481454014b..b097415352c 100644 --- a/service/organizations/api_op_ListParents.go +++ b/service/organizations/api_op_ListParents.go @@ -96,6 +96,9 @@ func addOperationListParentsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationListParentsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListPolicies.go b/service/organizations/api_op_ListPolicies.go index 8528783b563..c3e11212e3e 100644 --- a/service/organizations/api_op_ListPolicies.go +++ b/service/organizations/api_op_ListPolicies.go @@ -100,6 +100,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationListPoliciesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListPoliciesForTarget.go b/service/organizations/api_op_ListPoliciesForTarget.go index 1055f486614..31a6ddeb5d1 100644 --- a/service/organizations/api_op_ListPoliciesForTarget.go +++ b/service/organizations/api_op_ListPoliciesForTarget.go @@ -119,6 +119,9 @@ func addOperationListPoliciesForTargetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationListPoliciesForTargetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListRoots.go b/service/organizations/api_op_ListRoots.go index 8401cf73801..12ef8b5f36e 100644 --- a/service/organizations/api_op_ListRoots.go +++ b/service/organizations/api_op_ListRoots.go @@ -82,6 +82,9 @@ func addOperationListRootsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListRootsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListTagsForResource.go b/service/organizations/api_op_ListTagsForResource.go index 4e468b98b0a..d46d2a03580 100644 --- a/service/organizations/api_op_ListTagsForResource.go +++ b/service/organizations/api_op_ListTagsForResource.go @@ -92,6 +92,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_ListTargetsForPolicy.go b/service/organizations/api_op_ListTargetsForPolicy.go index 1f2bc3c7063..0be1a70108d 100644 --- a/service/organizations/api_op_ListTargetsForPolicy.go +++ b/service/organizations/api_op_ListTargetsForPolicy.go @@ -87,6 +87,9 @@ func addOperationListTargetsForPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListTargetsForPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_MoveAccount.go b/service/organizations/api_op_MoveAccount.go index a2d42303a85..209512003c6 100644 --- a/service/organizations/api_op_MoveAccount.go +++ b/service/organizations/api_op_MoveAccount.go @@ -84,6 +84,9 @@ func addOperationMoveAccountMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationMoveAccountMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_RegisterDelegatedAdministrator.go b/service/organizations/api_op_RegisterDelegatedAdministrator.go index 61bba1ab193..7a0705816a6 100644 --- a/service/organizations/api_op_RegisterDelegatedAdministrator.go +++ b/service/organizations/api_op_RegisterDelegatedAdministrator.go @@ -64,6 +64,9 @@ func addOperationRegisterDelegatedAdministratorMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationRegisterDelegatedAdministratorMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_RemoveAccountFromOrganization.go b/service/organizations/api_op_RemoveAccountFromOrganization.go index 7a963498c3e..e68f5eb86af 100644 --- a/service/organizations/api_op_RemoveAccountFromOrganization.go +++ b/service/organizations/api_op_RemoveAccountFromOrganization.go @@ -76,6 +76,9 @@ func addOperationRemoveAccountFromOrganizationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationRemoveAccountFromOrganizationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_TagResource.go b/service/organizations/api_op_TagResource.go index 70a223d44ad..a3899b0f971 100644 --- a/service/organizations/api_op_TagResource.go +++ b/service/organizations/api_op_TagResource.go @@ -86,6 +86,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_UntagResource.go b/service/organizations/api_op_UntagResource.go index 4422412a864..23f6692bac2 100644 --- a/service/organizations/api_op_UntagResource.go +++ b/service/organizations/api_op_UntagResource.go @@ -79,6 +79,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_UpdateOrganizationalUnit.go b/service/organizations/api_op_UpdateOrganizationalUnit.go index 0502ffa10ad..03ec49ff34a 100644 --- a/service/organizations/api_op_UpdateOrganizationalUnit.go +++ b/service/organizations/api_op_UpdateOrganizationalUnit.go @@ -67,6 +67,9 @@ func addOperationUpdateOrganizationalUnitMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateOrganizationalUnitMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/api_op_UpdatePolicy.go b/service/organizations/api_op_UpdatePolicy.go index 728164a3db1..597986374ba 100644 --- a/service/organizations/api_op_UpdatePolicy.go +++ b/service/organizations/api_op_UpdatePolicy.go @@ -75,6 +75,9 @@ func addOperationUpdatePolicyMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdatePolicyMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/organizations/go.mod b/service/organizations/go.mod index f1ee8a3c98a..b4834635966 100644 --- a/service/organizations/go.mod +++ b/service/organizations/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/organizations go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/organizations/go.sum b/service/organizations/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/organizations/go.sum +++ b/service/organizations/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/outposts/api_client.go b/service/outposts/api_client.go index 76a12e9df29..c200b5c4bd9 100644 --- a/service/outposts/api_client.go +++ b/service/outposts/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/outposts/api_op_CreateOutpost.go b/service/outposts/api_op_CreateOutpost.go index abeeefb7b07..e0ef8549aa6 100644 --- a/service/outposts/api_op_CreateOutpost.go +++ b/service/outposts/api_op_CreateOutpost.go @@ -66,6 +66,9 @@ func addOperationCreateOutpostMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateOutpostMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/api_op_DeleteOutpost.go b/service/outposts/api_op_DeleteOutpost.go index bc4698d5617..1e8bf1e0aac 100644 --- a/service/outposts/api_op_DeleteOutpost.go +++ b/service/outposts/api_op_DeleteOutpost.go @@ -48,6 +48,9 @@ func addOperationDeleteOutpostMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteOutpostMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/api_op_DeleteSite.go b/service/outposts/api_op_DeleteSite.go index d487d24fd3c..43aa6b9fd6e 100644 --- a/service/outposts/api_op_DeleteSite.go +++ b/service/outposts/api_op_DeleteSite.go @@ -48,6 +48,9 @@ func addOperationDeleteSiteMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteSiteMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/api_op_GetOutpost.go b/service/outposts/api_op_GetOutpost.go index cc38fac4694..60fea703d81 100644 --- a/service/outposts/api_op_GetOutpost.go +++ b/service/outposts/api_op_GetOutpost.go @@ -53,6 +53,9 @@ func addOperationGetOutpostMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetOutpostMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/api_op_GetOutpostInstanceTypes.go b/service/outposts/api_op_GetOutpostInstanceTypes.go index c3afafdc070..bc173ef9ff2 100644 --- a/service/outposts/api_op_GetOutpostInstanceTypes.go +++ b/service/outposts/api_op_GetOutpostInstanceTypes.go @@ -68,6 +68,9 @@ func addOperationGetOutpostInstanceTypesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetOutpostInstanceTypesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/api_op_ListOutposts.go b/service/outposts/api_op_ListOutposts.go index 27759c53aed..7e1b618386c 100644 --- a/service/outposts/api_op_ListOutposts.go +++ b/service/outposts/api_op_ListOutposts.go @@ -57,6 +57,9 @@ func addOperationListOutpostsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListOutpostsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/api_op_ListSites.go b/service/outposts/api_op_ListSites.go index 9814d56c47c..34214783de2 100644 --- a/service/outposts/api_op_ListSites.go +++ b/service/outposts/api_op_ListSites.go @@ -57,6 +57,9 @@ func addOperationListSitesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListSitesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/outposts/go.mod b/service/outposts/go.mod index 802262c66ca..13fa4b6bb6b 100644 --- a/service/outposts/go.mod +++ b/service/outposts/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/outposts go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/outposts/go.sum b/service/outposts/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/outposts/go.sum +++ b/service/outposts/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/personalize/api_client.go b/service/personalize/api_client.go index 9fa0ffecf3c..989bc502a60 100644 --- a/service/personalize/api_client.go +++ b/service/personalize/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/personalize/api_op_CreateBatchInferenceJob.go b/service/personalize/api_op_CreateBatchInferenceJob.go index ca6c2637e51..6afa1ce444b 100644 --- a/service/personalize/api_op_CreateBatchInferenceJob.go +++ b/service/personalize/api_op_CreateBatchInferenceJob.go @@ -88,6 +88,9 @@ func addOperationCreateBatchInferenceJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateBatchInferenceJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateCampaign.go b/service/personalize/api_op_CreateCampaign.go index 054255739ee..8051e08103d 100644 --- a/service/personalize/api_op_CreateCampaign.go +++ b/service/personalize/api_op_CreateCampaign.go @@ -103,6 +103,9 @@ func addOperationCreateCampaignMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateCampaignMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateDataset.go b/service/personalize/api_op_CreateDataset.go index 257b7337e1f..878ed63845e 100644 --- a/service/personalize/api_op_CreateDataset.go +++ b/service/personalize/api_op_CreateDataset.go @@ -105,6 +105,9 @@ func addOperationCreateDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateDatasetGroup.go b/service/personalize/api_op_CreateDatasetGroup.go index 986e4e276ab..1b0e8714fff 100644 --- a/service/personalize/api_op_CreateDatasetGroup.go +++ b/service/personalize/api_op_CreateDatasetGroup.go @@ -102,6 +102,9 @@ func addOperationCreateDatasetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateDatasetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateDatasetImportJob.go b/service/personalize/api_op_CreateDatasetImportJob.go index e78895dab15..2a72c266db2 100644 --- a/service/personalize/api_op_CreateDatasetImportJob.go +++ b/service/personalize/api_op_CreateDatasetImportJob.go @@ -90,6 +90,9 @@ func addOperationCreateDatasetImportJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateDatasetImportJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateEventTracker.go b/service/personalize/api_op_CreateEventTracker.go index a71b7808878..552787d181c 100644 --- a/service/personalize/api_op_CreateEventTracker.go +++ b/service/personalize/api_op_CreateEventTracker.go @@ -89,6 +89,9 @@ func addOperationCreateEventTrackerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateEventTrackerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateFilter.go b/service/personalize/api_op_CreateFilter.go index 75ae9b7a709..37a142382d1 100644 --- a/service/personalize/api_op_CreateFilter.go +++ b/service/personalize/api_op_CreateFilter.go @@ -69,6 +69,9 @@ func addOperationCreateFilterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateFilterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateSchema.go b/service/personalize/api_op_CreateSchema.go index 27e4bf14a96..6c2609c55d5 100644 --- a/service/personalize/api_op_CreateSchema.go +++ b/service/personalize/api_op_CreateSchema.go @@ -67,6 +67,9 @@ func addOperationCreateSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateSolution.go b/service/personalize/api_op_CreateSolution.go index 9266c840597..0db470b1d4f 100644 --- a/service/personalize/api_op_CreateSolution.go +++ b/service/personalize/api_op_CreateSolution.go @@ -124,6 +124,9 @@ func addOperationCreateSolutionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationCreateSolutionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_CreateSolutionVersion.go b/service/personalize/api_op_CreateSolutionVersion.go index d1b53a68bc2..b0f16a7d110 100644 --- a/service/personalize/api_op_CreateSolutionVersion.go +++ b/service/personalize/api_op_CreateSolutionVersion.go @@ -90,6 +90,9 @@ func addOperationCreateSolutionVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateSolutionVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteCampaign.go b/service/personalize/api_op_DeleteCampaign.go index 3e6ab701015..7c540b1fa8d 100644 --- a/service/personalize/api_op_DeleteCampaign.go +++ b/service/personalize/api_op_DeleteCampaign.go @@ -52,6 +52,9 @@ func addOperationDeleteCampaignMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteCampaignMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteDataset.go b/service/personalize/api_op_DeleteDataset.go index 081f9c3dd23..53871a56986 100644 --- a/service/personalize/api_op_DeleteDataset.go +++ b/service/personalize/api_op_DeleteDataset.go @@ -50,6 +50,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteDatasetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteDatasetGroup.go b/service/personalize/api_op_DeleteDatasetGroup.go index 89df3571a9e..092359f2787 100644 --- a/service/personalize/api_op_DeleteDatasetGroup.go +++ b/service/personalize/api_op_DeleteDatasetGroup.go @@ -56,6 +56,9 @@ func addOperationDeleteDatasetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteDatasetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteEventTracker.go b/service/personalize/api_op_DeleteEventTracker.go index ec422c3ce4a..d32974157c9 100644 --- a/service/personalize/api_op_DeleteEventTracker.go +++ b/service/personalize/api_op_DeleteEventTracker.go @@ -50,6 +50,9 @@ func addOperationDeleteEventTrackerMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteEventTrackerMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteFilter.go b/service/personalize/api_op_DeleteFilter.go index af48ec50f17..188f939a694 100644 --- a/service/personalize/api_op_DeleteFilter.go +++ b/service/personalize/api_op_DeleteFilter.go @@ -48,6 +48,9 @@ func addOperationDeleteFilterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteFilterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteSchema.go b/service/personalize/api_op_DeleteSchema.go index 65e40a4331c..f9c6e3f554d 100644 --- a/service/personalize/api_op_DeleteSchema.go +++ b/service/personalize/api_op_DeleteSchema.go @@ -49,6 +49,9 @@ func addOperationDeleteSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DeleteSolution.go b/service/personalize/api_op_DeleteSolution.go index 9b938be384d..17b7a7ca422 100644 --- a/service/personalize/api_op_DeleteSolution.go +++ b/service/personalize/api_op_DeleteSolution.go @@ -53,6 +53,9 @@ func addOperationDeleteSolutionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteSolutionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeAlgorithm.go b/service/personalize/api_op_DescribeAlgorithm.go index bb08412b6c3..3bd9c52ad6e 100644 --- a/service/personalize/api_op_DescribeAlgorithm.go +++ b/service/personalize/api_op_DescribeAlgorithm.go @@ -53,6 +53,9 @@ func addOperationDescribeAlgorithmMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeAlgorithmMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeBatchInferenceJob.go b/service/personalize/api_op_DescribeBatchInferenceJob.go index 6a5e1b69ea3..341b464590a 100644 --- a/service/personalize/api_op_DescribeBatchInferenceJob.go +++ b/service/personalize/api_op_DescribeBatchInferenceJob.go @@ -55,6 +55,9 @@ func addOperationDescribeBatchInferenceJobMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeBatchInferenceJobMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeCampaign.go b/service/personalize/api_op_DescribeCampaign.go index 8ab202f91f1..4fed50f2f4f 100644 --- a/service/personalize/api_op_DescribeCampaign.go +++ b/service/personalize/api_op_DescribeCampaign.go @@ -63,6 +63,9 @@ func addOperationDescribeCampaignMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeCampaignMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeDataset.go b/service/personalize/api_op_DescribeDataset.go index 61bae3bdbb1..a53750492e0 100644 --- a/service/personalize/api_op_DescribeDataset.go +++ b/service/personalize/api_op_DescribeDataset.go @@ -54,6 +54,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeDatasetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeDatasetGroup.go b/service/personalize/api_op_DescribeDatasetGroup.go index b1b77b37185..98b254c744b 100644 --- a/service/personalize/api_op_DescribeDatasetGroup.go +++ b/service/personalize/api_op_DescribeDatasetGroup.go @@ -54,6 +54,9 @@ func addOperationDescribeDatasetGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeDatasetGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeDatasetImportJob.go b/service/personalize/api_op_DescribeDatasetImportJob.go index 5b01fd2261b..113b1df0255 100644 --- a/service/personalize/api_op_DescribeDatasetImportJob.go +++ b/service/personalize/api_op_DescribeDatasetImportJob.go @@ -64,6 +64,9 @@ func addOperationDescribeDatasetImportJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeDatasetImportJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeEventTracker.go b/service/personalize/api_op_DescribeEventTracker.go index 3bd92c00480..f1a85cba609 100644 --- a/service/personalize/api_op_DescribeEventTracker.go +++ b/service/personalize/api_op_DescribeEventTracker.go @@ -55,6 +55,9 @@ func addOperationDescribeEventTrackerMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeEventTrackerMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeFeatureTransformation.go b/service/personalize/api_op_DescribeFeatureTransformation.go index 1fe4eb3630b..52af4a57d8a 100644 --- a/service/personalize/api_op_DescribeFeatureTransformation.go +++ b/service/personalize/api_op_DescribeFeatureTransformation.go @@ -53,6 +53,9 @@ func addOperationDescribeFeatureTransformationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeFeatureTransformationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeFilter.go b/service/personalize/api_op_DescribeFilter.go index 1d322c65bce..d6576a9b117 100644 --- a/service/personalize/api_op_DescribeFilter.go +++ b/service/personalize/api_op_DescribeFilter.go @@ -53,6 +53,9 @@ func addOperationDescribeFilterMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeFilterMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeRecipe.go b/service/personalize/api_op_DescribeRecipe.go index 9462e3d12fa..2f903f853c6 100644 --- a/service/personalize/api_op_DescribeRecipe.go +++ b/service/personalize/api_op_DescribeRecipe.go @@ -69,6 +69,9 @@ func addOperationDescribeRecipeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeRecipeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeSchema.go b/service/personalize/api_op_DescribeSchema.go index d4abe3d58d3..0c1f7c6b878 100644 --- a/service/personalize/api_op_DescribeSchema.go +++ b/service/personalize/api_op_DescribeSchema.go @@ -53,6 +53,9 @@ func addOperationDescribeSchemaMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeSchemaMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeSolution.go b/service/personalize/api_op_DescribeSolution.go index b523d740e33..20040542d9e 100644 --- a/service/personalize/api_op_DescribeSolution.go +++ b/service/personalize/api_op_DescribeSolution.go @@ -53,6 +53,9 @@ func addOperationDescribeSolutionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeSolutionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_DescribeSolutionVersion.go b/service/personalize/api_op_DescribeSolutionVersion.go index cf8369fa0e8..0ce196495c1 100644 --- a/service/personalize/api_op_DescribeSolutionVersion.go +++ b/service/personalize/api_op_DescribeSolutionVersion.go @@ -54,6 +54,9 @@ func addOperationDescribeSolutionVersionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeSolutionVersionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_GetSolutionMetrics.go b/service/personalize/api_op_GetSolutionMetrics.go index 5426f44e6fc..7538cb35713 100644 --- a/service/personalize/api_op_GetSolutionMetrics.go +++ b/service/personalize/api_op_GetSolutionMetrics.go @@ -55,6 +55,9 @@ func addOperationGetSolutionMetricsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetSolutionMetricsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListBatchInferenceJobs.go b/service/personalize/api_op_ListBatchInferenceJobs.go index c3dda5a04a6..c4fbc541f7b 100644 --- a/service/personalize/api_op_ListBatchInferenceJobs.go +++ b/service/personalize/api_op_ListBatchInferenceJobs.go @@ -64,6 +64,9 @@ func addOperationListBatchInferenceJobsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListBatchInferenceJobsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListCampaigns.go b/service/personalize/api_op_ListCampaigns.go index 3c02c99208c..9b132160d17 100644 --- a/service/personalize/api_op_ListCampaigns.go +++ b/service/personalize/api_op_ListCampaigns.go @@ -66,6 +66,9 @@ func addOperationListCampaignsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListCampaignsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListDatasetGroups.go b/service/personalize/api_op_ListDatasetGroups.go index 8393833fd44..0e255241e1d 100644 --- a/service/personalize/api_op_ListDatasetGroups.go +++ b/service/personalize/api_op_ListDatasetGroups.go @@ -60,6 +60,9 @@ func addOperationListDatasetGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListDatasetGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListDatasetImportJobs.go b/service/personalize/api_op_ListDatasetImportJobs.go index 344af80fa36..80b37fda080 100644 --- a/service/personalize/api_op_ListDatasetImportJobs.go +++ b/service/personalize/api_op_ListDatasetImportJobs.go @@ -67,6 +67,9 @@ func addOperationListDatasetImportJobsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDatasetImportJobsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListDatasets.go b/service/personalize/api_op_ListDatasets.go index f51770604bb..49eec666327 100644 --- a/service/personalize/api_op_ListDatasets.go +++ b/service/personalize/api_op_ListDatasets.go @@ -64,6 +64,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListDatasetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListEventTrackers.go b/service/personalize/api_op_ListEventTrackers.go index 38b2396dc0d..db3c6fb7903 100644 --- a/service/personalize/api_op_ListEventTrackers.go +++ b/service/personalize/api_op_ListEventTrackers.go @@ -64,6 +64,9 @@ func addOperationListEventTrackersMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListEventTrackersMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListFilters.go b/service/personalize/api_op_ListFilters.go index 02c739e7b6e..9de404f861a 100644 --- a/service/personalize/api_op_ListFilters.go +++ b/service/personalize/api_op_ListFilters.go @@ -61,6 +61,9 @@ func addOperationListFiltersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListFiltersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListRecipes.go b/service/personalize/api_op_ListRecipes.go index 5939694dbc3..ae62a1e3f59 100644 --- a/service/personalize/api_op_ListRecipes.go +++ b/service/personalize/api_op_ListRecipes.go @@ -62,6 +62,9 @@ func addOperationListRecipesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListRecipesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListSchemas.go b/service/personalize/api_op_ListSchemas.go index 1422bbf2a96..e9b55e61eb6 100644 --- a/service/personalize/api_op_ListSchemas.go +++ b/service/personalize/api_op_ListSchemas.go @@ -60,6 +60,9 @@ func addOperationListSchemasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListSchemasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListSolutionVersions.go b/service/personalize/api_op_ListSolutionVersions.go index 8509d0a4baa..dc1e6dc7ac9 100644 --- a/service/personalize/api_op_ListSolutionVersions.go +++ b/service/personalize/api_op_ListSolutionVersions.go @@ -65,6 +65,9 @@ func addOperationListSolutionVersionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListSolutionVersionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_ListSolutions.go b/service/personalize/api_op_ListSolutions.go index eaf25555479..a5b8de012e7 100644 --- a/service/personalize/api_op_ListSolutions.go +++ b/service/personalize/api_op_ListSolutions.go @@ -65,6 +65,9 @@ func addOperationListSolutionsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListSolutionsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/api_op_UpdateCampaign.go b/service/personalize/api_op_UpdateCampaign.go index 891d94f857b..0cb8f45b989 100644 --- a/service/personalize/api_op_UpdateCampaign.go +++ b/service/personalize/api_op_UpdateCampaign.go @@ -68,6 +68,9 @@ func addOperationUpdateCampaignMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateCampaignMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalize/go.mod b/service/personalize/go.mod index d6b5ca778b8..d5ea632a752 100644 --- a/service/personalize/go.mod +++ b/service/personalize/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/personalize go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalize/go.sum b/service/personalize/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/personalize/go.sum +++ b/service/personalize/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/personalizeevents/api_client.go b/service/personalizeevents/api_client.go index 9f7dfd7fade..7c1efe27fb8 100644 --- a/service/personalizeevents/api_client.go +++ b/service/personalizeevents/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/personalizeevents/api_op_PutEvents.go b/service/personalizeevents/api_op_PutEvents.go index 252dee77742..6c67fbae650 100644 --- a/service/personalizeevents/api_op_PutEvents.go +++ b/service/personalizeevents/api_op_PutEvents.go @@ -68,6 +68,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalizeevents/api_op_PutItems.go b/service/personalizeevents/api_op_PutItems.go index 295979ebd0c..58ef12a0ee6 100644 --- a/service/personalizeevents/api_op_PutItems.go +++ b/service/personalizeevents/api_op_PutItems.go @@ -56,6 +56,9 @@ func addOperationPutItemsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPutItemsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalizeevents/api_op_PutUsers.go b/service/personalizeevents/api_op_PutUsers.go index fe503871068..5a0c2e1ae08 100644 --- a/service/personalizeevents/api_op_PutUsers.go +++ b/service/personalizeevents/api_op_PutUsers.go @@ -56,6 +56,9 @@ func addOperationPutUsersMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPutUsersMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalizeevents/go.mod b/service/personalizeevents/go.mod index feeb77fd2d4..f2d120d994f 100644 --- a/service/personalizeevents/go.mod +++ b/service/personalizeevents/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/personalizeevents go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalizeevents/go.sum b/service/personalizeevents/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/personalizeevents/go.sum +++ b/service/personalizeevents/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/personalizeruntime/api_client.go b/service/personalizeruntime/api_client.go index c33f54b0212..49bbe2b9e47 100644 --- a/service/personalizeruntime/api_client.go +++ b/service/personalizeruntime/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/personalizeruntime/api_op_GetPersonalizedRanking.go b/service/personalizeruntime/api_op_GetPersonalizedRanking.go index 6b8695ba9cc..3d9c4e19a80 100644 --- a/service/personalizeruntime/api_op_GetPersonalizedRanking.go +++ b/service/personalizeruntime/api_op_GetPersonalizedRanking.go @@ -82,6 +82,9 @@ func addOperationGetPersonalizedRankingMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetPersonalizedRankingMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalizeruntime/api_op_GetRecommendations.go b/service/personalizeruntime/api_op_GetRecommendations.go index f00201ce189..c0c1ea38f95 100644 --- a/service/personalizeruntime/api_op_GetRecommendations.go +++ b/service/personalizeruntime/api_op_GetRecommendations.go @@ -90,6 +90,9 @@ func addOperationGetRecommendationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetRecommendationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/personalizeruntime/go.mod b/service/personalizeruntime/go.mod index 4b4066459d2..688a3edf73f 100644 --- a/service/personalizeruntime/go.mod +++ b/service/personalizeruntime/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/personalizeruntime go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalizeruntime/go.sum b/service/personalizeruntime/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/personalizeruntime/go.sum +++ b/service/personalizeruntime/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pi/api_client.go b/service/pi/api_client.go index be8d8b778e8..179dd8d7f2f 100644 --- a/service/pi/api_client.go +++ b/service/pi/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/pi/api_op_DescribeDimensionKeys.go b/service/pi/api_op_DescribeDimensionKeys.go index 203d5f38b7c..3f6dab2e585 100644 --- a/service/pi/api_op_DescribeDimensionKeys.go +++ b/service/pi/api_op_DescribeDimensionKeys.go @@ -162,6 +162,9 @@ func addOperationDescribeDimensionKeysMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationDescribeDimensionKeysMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pi/api_op_GetResourceMetrics.go b/service/pi/api_op_GetResourceMetrics.go index 9a4798b0e23..2d825b76726 100644 --- a/service/pi/api_op_GetResourceMetrics.go +++ b/service/pi/api_op_GetResourceMetrics.go @@ -140,6 +140,9 @@ func addOperationGetResourceMetricsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -182,6 +185,9 @@ func addOperationGetResourceMetricsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pi/go.mod b/service/pi/go.mod index 6c073288c1e..984cd4c9bc2 100644 --- a/service/pi/go.mod +++ b/service/pi/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/pi go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pi/go.sum b/service/pi/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/pi/go.sum +++ b/service/pi/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pinpoint/api_client.go b/service/pinpoint/api_client.go index a1176443f25..a547bf5ddb0 100644 --- a/service/pinpoint/api_client.go +++ b/service/pinpoint/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/pinpoint/api_op_CreateApp.go b/service/pinpoint/api_op_CreateApp.go index d09cd3e003b..8a283af60d3 100644 --- a/service/pinpoint/api_op_CreateApp.go +++ b/service/pinpoint/api_op_CreateApp.go @@ -56,6 +56,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateCampaign.go b/service/pinpoint/api_op_CreateCampaign.go index 0a96ce891d4..e038f2b6075 100644 --- a/service/pinpoint/api_op_CreateCampaign.go +++ b/service/pinpoint/api_op_CreateCampaign.go @@ -63,6 +63,9 @@ func addOperationCreateCampaignMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateCampaignMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateEmailTemplate.go b/service/pinpoint/api_op_CreateEmailTemplate.go index cc8e71ab577..48009a700df 100644 --- a/service/pinpoint/api_op_CreateEmailTemplate.go +++ b/service/pinpoint/api_op_CreateEmailTemplate.go @@ -64,6 +64,9 @@ func addOperationCreateEmailTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateEmailTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateExportJob.go b/service/pinpoint/api_op_CreateExportJob.go index 73f2076c8c5..2d00a89f2bf 100644 --- a/service/pinpoint/api_op_CreateExportJob.go +++ b/service/pinpoint/api_op_CreateExportJob.go @@ -65,6 +65,9 @@ func addOperationCreateExportJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateExportJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateImportJob.go b/service/pinpoint/api_op_CreateImportJob.go index dfd93eecf34..6ca4dbe2000 100644 --- a/service/pinpoint/api_op_CreateImportJob.go +++ b/service/pinpoint/api_op_CreateImportJob.go @@ -65,6 +65,9 @@ func addOperationCreateImportJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateImportJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateJourney.go b/service/pinpoint/api_op_CreateJourney.go index fe99a3e953e..42d5c64dfea 100644 --- a/service/pinpoint/api_op_CreateJourney.go +++ b/service/pinpoint/api_op_CreateJourney.go @@ -62,6 +62,9 @@ func addOperationCreateJourneyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateJourneyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreatePushTemplate.go b/service/pinpoint/api_op_CreatePushTemplate.go index dbcc91490d3..ff81fa817b8 100644 --- a/service/pinpoint/api_op_CreatePushTemplate.go +++ b/service/pinpoint/api_op_CreatePushTemplate.go @@ -65,6 +65,9 @@ func addOperationCreatePushTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreatePushTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateRecommenderConfiguration.go b/service/pinpoint/api_op_CreateRecommenderConfiguration.go index 7f0024e70d7..cea17d2491a 100644 --- a/service/pinpoint/api_op_CreateRecommenderConfiguration.go +++ b/service/pinpoint/api_op_CreateRecommenderConfiguration.go @@ -57,6 +57,9 @@ func addOperationCreateRecommenderConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateRecommenderConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateSegment.go b/service/pinpoint/api_op_CreateSegment.go index 8d5744bb32b..9e044dfb1eb 100644 --- a/service/pinpoint/api_op_CreateSegment.go +++ b/service/pinpoint/api_op_CreateSegment.go @@ -66,6 +66,9 @@ func addOperationCreateSegmentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateSegmentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateSmsTemplate.go b/service/pinpoint/api_op_CreateSmsTemplate.go index 62ef7cff5a2..1ba84b44803 100644 --- a/service/pinpoint/api_op_CreateSmsTemplate.go +++ b/service/pinpoint/api_op_CreateSmsTemplate.go @@ -64,6 +64,9 @@ func addOperationCreateSmsTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateSmsTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_CreateVoiceTemplate.go b/service/pinpoint/api_op_CreateVoiceTemplate.go index adb692b1c08..f38a4af7d9a 100644 --- a/service/pinpoint/api_op_CreateVoiceTemplate.go +++ b/service/pinpoint/api_op_CreateVoiceTemplate.go @@ -64,6 +64,9 @@ func addOperationCreateVoiceTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateVoiceTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteAdmChannel.go b/service/pinpoint/api_op_DeleteAdmChannel.go index 1d70b3f8004..dfb7c1b4893 100644 --- a/service/pinpoint/api_op_DeleteAdmChannel.go +++ b/service/pinpoint/api_op_DeleteAdmChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteAdmChannelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteAdmChannelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteApnsChannel.go b/service/pinpoint/api_op_DeleteApnsChannel.go index 514998e44db..1aebd341015 100644 --- a/service/pinpoint/api_op_DeleteApnsChannel.go +++ b/service/pinpoint/api_op_DeleteApnsChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteApnsChannelMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteApnsChannelMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteApnsSandboxChannel.go b/service/pinpoint/api_op_DeleteApnsSandboxChannel.go index d134f0b916d..e0376ccce06 100644 --- a/service/pinpoint/api_op_DeleteApnsSandboxChannel.go +++ b/service/pinpoint/api_op_DeleteApnsSandboxChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteApnsSandboxChannelMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteApnsSandboxChannelMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteApnsVoipChannel.go b/service/pinpoint/api_op_DeleteApnsVoipChannel.go index 7eff0b51b19..75875be3a9e 100644 --- a/service/pinpoint/api_op_DeleteApnsVoipChannel.go +++ b/service/pinpoint/api_op_DeleteApnsVoipChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteApnsVoipChannelMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteApnsVoipChannelMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go b/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go index c261cef6302..2a589c777f0 100644 --- a/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go +++ b/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteApnsVoipSandboxChannelMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteApnsVoipSandboxChannelMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteApp.go b/service/pinpoint/api_op_DeleteApp.go index 767d23825bb..796fa0d8654 100644 --- a/service/pinpoint/api_op_DeleteApp.go +++ b/service/pinpoint/api_op_DeleteApp.go @@ -56,6 +56,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteBaiduChannel.go b/service/pinpoint/api_op_DeleteBaiduChannel.go index 87d8c057dc7..f1173746d58 100644 --- a/service/pinpoint/api_op_DeleteBaiduChannel.go +++ b/service/pinpoint/api_op_DeleteBaiduChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteBaiduChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteBaiduChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteCampaign.go b/service/pinpoint/api_op_DeleteCampaign.go index 91f66ebc958..c0552966b48 100644 --- a/service/pinpoint/api_op_DeleteCampaign.go +++ b/service/pinpoint/api_op_DeleteCampaign.go @@ -62,6 +62,9 @@ func addOperationDeleteCampaignMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteCampaignMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteEmailChannel.go b/service/pinpoint/api_op_DeleteEmailChannel.go index 69c7ad6af40..1cb2fd31bd8 100644 --- a/service/pinpoint/api_op_DeleteEmailChannel.go +++ b/service/pinpoint/api_op_DeleteEmailChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteEmailChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteEmailChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteEmailTemplate.go b/service/pinpoint/api_op_DeleteEmailTemplate.go index 428941ae7a6..1c2e7a9ef60 100644 --- a/service/pinpoint/api_op_DeleteEmailTemplate.go +++ b/service/pinpoint/api_op_DeleteEmailTemplate.go @@ -80,6 +80,9 @@ func addOperationDeleteEmailTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteEmailTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteEndpoint.go b/service/pinpoint/api_op_DeleteEndpoint.go index 587a76d1c4d..0fd07d7e523 100644 --- a/service/pinpoint/api_op_DeleteEndpoint.go +++ b/service/pinpoint/api_op_DeleteEndpoint.go @@ -61,6 +61,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteEventStream.go b/service/pinpoint/api_op_DeleteEventStream.go index 8a6bf7bcf11..823f14ecb19 100644 --- a/service/pinpoint/api_op_DeleteEventStream.go +++ b/service/pinpoint/api_op_DeleteEventStream.go @@ -57,6 +57,9 @@ func addOperationDeleteEventStreamMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteEventStreamMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteGcmChannel.go b/service/pinpoint/api_op_DeleteGcmChannel.go index 083b497379c..8443170ba3a 100644 --- a/service/pinpoint/api_op_DeleteGcmChannel.go +++ b/service/pinpoint/api_op_DeleteGcmChannel.go @@ -60,6 +60,9 @@ func addOperationDeleteGcmChannelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteGcmChannelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteJourney.go b/service/pinpoint/api_op_DeleteJourney.go index 169f32eb610..2eb953a40bd 100644 --- a/service/pinpoint/api_op_DeleteJourney.go +++ b/service/pinpoint/api_op_DeleteJourney.go @@ -62,6 +62,9 @@ func addOperationDeleteJourneyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteJourneyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeletePushTemplate.go b/service/pinpoint/api_op_DeletePushTemplate.go index 6c3c031a452..f5795f55888 100644 --- a/service/pinpoint/api_op_DeletePushTemplate.go +++ b/service/pinpoint/api_op_DeletePushTemplate.go @@ -80,6 +80,9 @@ func addOperationDeletePushTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeletePushTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteRecommenderConfiguration.go b/service/pinpoint/api_op_DeleteRecommenderConfiguration.go index 8ee220eae44..08250c5bf93 100644 --- a/service/pinpoint/api_op_DeleteRecommenderConfiguration.go +++ b/service/pinpoint/api_op_DeleteRecommenderConfiguration.go @@ -57,6 +57,9 @@ func addOperationDeleteRecommenderConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteRecommenderConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteSegment.go b/service/pinpoint/api_op_DeleteSegment.go index 747ee41fe32..2a50ccf0bda 100644 --- a/service/pinpoint/api_op_DeleteSegment.go +++ b/service/pinpoint/api_op_DeleteSegment.go @@ -62,6 +62,9 @@ func addOperationDeleteSegmentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteSegmentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteSmsChannel.go b/service/pinpoint/api_op_DeleteSmsChannel.go index 5a07e18a044..ca7c4b08c05 100644 --- a/service/pinpoint/api_op_DeleteSmsChannel.go +++ b/service/pinpoint/api_op_DeleteSmsChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteSmsChannelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteSmsChannelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteSmsTemplate.go b/service/pinpoint/api_op_DeleteSmsTemplate.go index 263640c2a6c..752820e804b 100644 --- a/service/pinpoint/api_op_DeleteSmsTemplate.go +++ b/service/pinpoint/api_op_DeleteSmsTemplate.go @@ -79,6 +79,9 @@ func addOperationDeleteSmsTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteSmsTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteUserEndpoints.go b/service/pinpoint/api_op_DeleteUserEndpoints.go index 6073d85ca59..c244abb9120 100644 --- a/service/pinpoint/api_op_DeleteUserEndpoints.go +++ b/service/pinpoint/api_op_DeleteUserEndpoints.go @@ -61,6 +61,9 @@ func addOperationDeleteUserEndpointsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteUserEndpointsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteVoiceChannel.go b/service/pinpoint/api_op_DeleteVoiceChannel.go index d46205ecb56..c690f7d77e9 100644 --- a/service/pinpoint/api_op_DeleteVoiceChannel.go +++ b/service/pinpoint/api_op_DeleteVoiceChannel.go @@ -58,6 +58,9 @@ func addOperationDeleteVoiceChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteVoiceChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_DeleteVoiceTemplate.go b/service/pinpoint/api_op_DeleteVoiceTemplate.go index dcfb6f8010f..93edd41d64e 100644 --- a/service/pinpoint/api_op_DeleteVoiceTemplate.go +++ b/service/pinpoint/api_op_DeleteVoiceTemplate.go @@ -80,6 +80,9 @@ func addOperationDeleteVoiceTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteVoiceTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetAdmChannel.go b/service/pinpoint/api_op_GetAdmChannel.go index 0babb12cac0..5635620bee6 100644 --- a/service/pinpoint/api_op_GetAdmChannel.go +++ b/service/pinpoint/api_op_GetAdmChannel.go @@ -58,6 +58,9 @@ func addOperationGetAdmChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetAdmChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApnsChannel.go b/service/pinpoint/api_op_GetApnsChannel.go index 7b8e02ee085..16b06e2d122 100644 --- a/service/pinpoint/api_op_GetApnsChannel.go +++ b/service/pinpoint/api_op_GetApnsChannel.go @@ -58,6 +58,9 @@ func addOperationGetApnsChannelMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetApnsChannelMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApnsSandboxChannel.go b/service/pinpoint/api_op_GetApnsSandboxChannel.go index 9c476477d6d..6b104e39be9 100644 --- a/service/pinpoint/api_op_GetApnsSandboxChannel.go +++ b/service/pinpoint/api_op_GetApnsSandboxChannel.go @@ -58,6 +58,9 @@ func addOperationGetApnsSandboxChannelMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetApnsSandboxChannelMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApnsVoipChannel.go b/service/pinpoint/api_op_GetApnsVoipChannel.go index f2abe1e364f..b6d27bbf969 100644 --- a/service/pinpoint/api_op_GetApnsVoipChannel.go +++ b/service/pinpoint/api_op_GetApnsVoipChannel.go @@ -58,6 +58,9 @@ func addOperationGetApnsVoipChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetApnsVoipChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go b/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go index 92c8d81574a..241de0ac832 100644 --- a/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go +++ b/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go @@ -58,6 +58,9 @@ func addOperationGetApnsVoipSandboxChannelMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetApnsVoipSandboxChannelMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApp.go b/service/pinpoint/api_op_GetApp.go index b0c5bfb1590..a358ac5e44b 100644 --- a/service/pinpoint/api_op_GetApp.go +++ b/service/pinpoint/api_op_GetApp.go @@ -56,6 +56,9 @@ func addOperationGetAppMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetAppMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApplicationDateRangeKpi.go b/service/pinpoint/api_op_GetApplicationDateRangeKpi.go index d9b3039a177..44475ccde33 100644 --- a/service/pinpoint/api_op_GetApplicationDateRangeKpi.go +++ b/service/pinpoint/api_op_GetApplicationDateRangeKpi.go @@ -92,6 +92,9 @@ func addOperationGetApplicationDateRangeKpiMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetApplicationDateRangeKpiMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApplicationSettings.go b/service/pinpoint/api_op_GetApplicationSettings.go index fe87dce9b51..f72b31126f6 100644 --- a/service/pinpoint/api_op_GetApplicationSettings.go +++ b/service/pinpoint/api_op_GetApplicationSettings.go @@ -57,6 +57,9 @@ func addOperationGetApplicationSettingsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetApplicationSettingsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetApps.go b/service/pinpoint/api_op_GetApps.go index 31ca1107071..ba643a3d603 100644 --- a/service/pinpoint/api_op_GetApps.go +++ b/service/pinpoint/api_op_GetApps.go @@ -59,6 +59,9 @@ func addOperationGetAppsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetAppsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetBaiduChannel.go b/service/pinpoint/api_op_GetBaiduChannel.go index c96ad20a9f5..c4ac6f9fb6b 100644 --- a/service/pinpoint/api_op_GetBaiduChannel.go +++ b/service/pinpoint/api_op_GetBaiduChannel.go @@ -58,6 +58,9 @@ func addOperationGetBaiduChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetBaiduChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetCampaign.go b/service/pinpoint/api_op_GetCampaign.go index 8092c33ae88..dc7b20f6c02 100644 --- a/service/pinpoint/api_op_GetCampaign.go +++ b/service/pinpoint/api_op_GetCampaign.go @@ -63,6 +63,9 @@ func addOperationGetCampaignMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetCampaignMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetCampaignActivities.go b/service/pinpoint/api_op_GetCampaignActivities.go index 6150f93d843..8eb0437d325 100644 --- a/service/pinpoint/api_op_GetCampaignActivities.go +++ b/service/pinpoint/api_op_GetCampaignActivities.go @@ -69,6 +69,9 @@ func addOperationGetCampaignActivitiesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetCampaignActivitiesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetCampaignDateRangeKpi.go b/service/pinpoint/api_op_GetCampaignDateRangeKpi.go index 84fccf16032..6ada4150f3b 100644 --- a/service/pinpoint/api_op_GetCampaignDateRangeKpi.go +++ b/service/pinpoint/api_op_GetCampaignDateRangeKpi.go @@ -97,6 +97,9 @@ func addOperationGetCampaignDateRangeKpiMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetCampaignDateRangeKpiMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetCampaignVersion.go b/service/pinpoint/api_op_GetCampaignVersion.go index 50c428c29cb..5728c8b0fde 100644 --- a/service/pinpoint/api_op_GetCampaignVersion.go +++ b/service/pinpoint/api_op_GetCampaignVersion.go @@ -68,6 +68,9 @@ func addOperationGetCampaignVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetCampaignVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetCampaignVersions.go b/service/pinpoint/api_op_GetCampaignVersions.go index 5441536c13d..d393412df1d 100644 --- a/service/pinpoint/api_op_GetCampaignVersions.go +++ b/service/pinpoint/api_op_GetCampaignVersions.go @@ -71,6 +71,9 @@ func addOperationGetCampaignVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetCampaignVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetCampaigns.go b/service/pinpoint/api_op_GetCampaigns.go index 8661df0c60e..c5494d555d5 100644 --- a/service/pinpoint/api_op_GetCampaigns.go +++ b/service/pinpoint/api_op_GetCampaigns.go @@ -66,6 +66,9 @@ func addOperationGetCampaignsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetCampaignsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetChannels.go b/service/pinpoint/api_op_GetChannels.go index 7131f235002..464abff7ec2 100644 --- a/service/pinpoint/api_op_GetChannels.go +++ b/service/pinpoint/api_op_GetChannels.go @@ -58,6 +58,9 @@ func addOperationGetChannelsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetChannelsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetEmailChannel.go b/service/pinpoint/api_op_GetEmailChannel.go index ff52bfe95ba..2fd561b23ee 100644 --- a/service/pinpoint/api_op_GetEmailChannel.go +++ b/service/pinpoint/api_op_GetEmailChannel.go @@ -58,6 +58,9 @@ func addOperationGetEmailChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetEmailChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetEmailTemplate.go b/service/pinpoint/api_op_GetEmailTemplate.go index 2f66149c87e..925b21b1f59 100644 --- a/service/pinpoint/api_op_GetEmailTemplate.go +++ b/service/pinpoint/api_op_GetEmailTemplate.go @@ -81,6 +81,9 @@ func addOperationGetEmailTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetEmailTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetEndpoint.go b/service/pinpoint/api_op_GetEndpoint.go index 0d1cbbe991d..9d877553cd6 100644 --- a/service/pinpoint/api_op_GetEndpoint.go +++ b/service/pinpoint/api_op_GetEndpoint.go @@ -62,6 +62,9 @@ func addOperationGetEndpointMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetEndpointMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetEventStream.go b/service/pinpoint/api_op_GetEventStream.go index 6482fcb614a..78a43c3f62c 100644 --- a/service/pinpoint/api_op_GetEventStream.go +++ b/service/pinpoint/api_op_GetEventStream.go @@ -57,6 +57,9 @@ func addOperationGetEventStreamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetEventStreamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetExportJob.go b/service/pinpoint/api_op_GetExportJob.go index 60c6be901bb..cc8003fe91e 100644 --- a/service/pinpoint/api_op_GetExportJob.go +++ b/service/pinpoint/api_op_GetExportJob.go @@ -65,6 +65,9 @@ func addOperationGetExportJobMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetExportJobMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetExportJobs.go b/service/pinpoint/api_op_GetExportJobs.go index d0d8f105647..1d5c30021bf 100644 --- a/service/pinpoint/api_op_GetExportJobs.go +++ b/service/pinpoint/api_op_GetExportJobs.go @@ -67,6 +67,9 @@ func addOperationGetExportJobsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetExportJobsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetGcmChannel.go b/service/pinpoint/api_op_GetGcmChannel.go index c98d6cd02c1..c4d6c0ec096 100644 --- a/service/pinpoint/api_op_GetGcmChannel.go +++ b/service/pinpoint/api_op_GetGcmChannel.go @@ -60,6 +60,9 @@ func addOperationGetGcmChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetGcmChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetImportJob.go b/service/pinpoint/api_op_GetImportJob.go index 4393e73f22b..1f46a662867 100644 --- a/service/pinpoint/api_op_GetImportJob.go +++ b/service/pinpoint/api_op_GetImportJob.go @@ -65,6 +65,9 @@ func addOperationGetImportJobMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetImportJobMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetImportJobs.go b/service/pinpoint/api_op_GetImportJobs.go index 2f0690d8f61..d52c72b9e8d 100644 --- a/service/pinpoint/api_op_GetImportJobs.go +++ b/service/pinpoint/api_op_GetImportJobs.go @@ -67,6 +67,9 @@ func addOperationGetImportJobsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetImportJobsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetJourney.go b/service/pinpoint/api_op_GetJourney.go index 512e36e2ce6..01c0cfcaa37 100644 --- a/service/pinpoint/api_op_GetJourney.go +++ b/service/pinpoint/api_op_GetJourney.go @@ -63,6 +63,9 @@ func addOperationGetJourneyMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetJourneyMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetJourneyDateRangeKpi.go b/service/pinpoint/api_op_GetJourneyDateRangeKpi.go index fae07fadcbc..048bbf4d0fd 100644 --- a/service/pinpoint/api_op_GetJourneyDateRangeKpi.go +++ b/service/pinpoint/api_op_GetJourneyDateRangeKpi.go @@ -98,6 +98,9 @@ func addOperationGetJourneyDateRangeKpiMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationGetJourneyDateRangeKpiMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go b/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go index 4a00c725419..fe628553a43 100644 --- a/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go +++ b/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go @@ -78,6 +78,9 @@ func addOperationGetJourneyExecutionActivityMetricsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetJourneyExecutionActivityMetricsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetJourneyExecutionMetrics.go b/service/pinpoint/api_op_GetJourneyExecutionMetrics.go index 9aa0c4099ab..28b036b0215 100644 --- a/service/pinpoint/api_op_GetJourneyExecutionMetrics.go +++ b/service/pinpoint/api_op_GetJourneyExecutionMetrics.go @@ -72,6 +72,9 @@ func addOperationGetJourneyExecutionMetricsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetJourneyExecutionMetricsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetPushTemplate.go b/service/pinpoint/api_op_GetPushTemplate.go index a3800ce30df..c53f48e7756 100644 --- a/service/pinpoint/api_op_GetPushTemplate.go +++ b/service/pinpoint/api_op_GetPushTemplate.go @@ -81,6 +81,9 @@ func addOperationGetPushTemplateMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetPushTemplateMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetRecommenderConfiguration.go b/service/pinpoint/api_op_GetRecommenderConfiguration.go index e75ededde86..0af4ebbd934 100644 --- a/service/pinpoint/api_op_GetRecommenderConfiguration.go +++ b/service/pinpoint/api_op_GetRecommenderConfiguration.go @@ -58,6 +58,9 @@ func addOperationGetRecommenderConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetRecommenderConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetRecommenderConfigurations.go b/service/pinpoint/api_op_GetRecommenderConfigurations.go index fd480b1b9ee..9b46611ac9c 100644 --- a/service/pinpoint/api_op_GetRecommenderConfigurations.go +++ b/service/pinpoint/api_op_GetRecommenderConfigurations.go @@ -60,6 +60,9 @@ func addOperationGetRecommenderConfigurationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetRecommenderConfigurationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSegment.go b/service/pinpoint/api_op_GetSegment.go index 0b06dbb9c4f..bf64822a829 100644 --- a/service/pinpoint/api_op_GetSegment.go +++ b/service/pinpoint/api_op_GetSegment.go @@ -63,6 +63,9 @@ func addOperationGetSegmentMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetSegmentMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSegmentExportJobs.go b/service/pinpoint/api_op_GetSegmentExportJobs.go index 88396a8f891..973c0abb4af 100644 --- a/service/pinpoint/api_op_GetSegmentExportJobs.go +++ b/service/pinpoint/api_op_GetSegmentExportJobs.go @@ -72,6 +72,9 @@ func addOperationGetSegmentExportJobsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetSegmentExportJobsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSegmentImportJobs.go b/service/pinpoint/api_op_GetSegmentImportJobs.go index a05a9c4152a..9da20a3de39 100644 --- a/service/pinpoint/api_op_GetSegmentImportJobs.go +++ b/service/pinpoint/api_op_GetSegmentImportJobs.go @@ -72,6 +72,9 @@ func addOperationGetSegmentImportJobsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetSegmentImportJobsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSegmentVersion.go b/service/pinpoint/api_op_GetSegmentVersion.go index eb563b2d658..bd54d3e5160 100644 --- a/service/pinpoint/api_op_GetSegmentVersion.go +++ b/service/pinpoint/api_op_GetSegmentVersion.go @@ -68,6 +68,9 @@ func addOperationGetSegmentVersionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetSegmentVersionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSegmentVersions.go b/service/pinpoint/api_op_GetSegmentVersions.go index 26412194e86..e0dfa3ef24a 100644 --- a/service/pinpoint/api_op_GetSegmentVersions.go +++ b/service/pinpoint/api_op_GetSegmentVersions.go @@ -71,6 +71,9 @@ func addOperationGetSegmentVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetSegmentVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSegments.go b/service/pinpoint/api_op_GetSegments.go index b326fc5c4cc..2b62c55587f 100644 --- a/service/pinpoint/api_op_GetSegments.go +++ b/service/pinpoint/api_op_GetSegments.go @@ -66,6 +66,9 @@ func addOperationGetSegmentsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetSegmentsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSmsChannel.go b/service/pinpoint/api_op_GetSmsChannel.go index 0165df0fd65..88e0d3273fb 100644 --- a/service/pinpoint/api_op_GetSmsChannel.go +++ b/service/pinpoint/api_op_GetSmsChannel.go @@ -58,6 +58,9 @@ func addOperationGetSmsChannelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetSmsChannelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetSmsTemplate.go b/service/pinpoint/api_op_GetSmsTemplate.go index f2b53b25460..7492785c007 100644 --- a/service/pinpoint/api_op_GetSmsTemplate.go +++ b/service/pinpoint/api_op_GetSmsTemplate.go @@ -81,6 +81,9 @@ func addOperationGetSmsTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetSmsTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetUserEndpoints.go b/service/pinpoint/api_op_GetUserEndpoints.go index 795eb1812c3..5eb78b7ef10 100644 --- a/service/pinpoint/api_op_GetUserEndpoints.go +++ b/service/pinpoint/api_op_GetUserEndpoints.go @@ -62,6 +62,9 @@ func addOperationGetUserEndpointsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetUserEndpointsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetVoiceChannel.go b/service/pinpoint/api_op_GetVoiceChannel.go index 719c9ac15b9..68d07b51175 100644 --- a/service/pinpoint/api_op_GetVoiceChannel.go +++ b/service/pinpoint/api_op_GetVoiceChannel.go @@ -58,6 +58,9 @@ func addOperationGetVoiceChannelMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetVoiceChannelMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_GetVoiceTemplate.go b/service/pinpoint/api_op_GetVoiceTemplate.go index 5c22a57351b..87f4b8990eb 100644 --- a/service/pinpoint/api_op_GetVoiceTemplate.go +++ b/service/pinpoint/api_op_GetVoiceTemplate.go @@ -81,6 +81,9 @@ func addOperationGetVoiceTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetVoiceTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_ListJourneys.go b/service/pinpoint/api_op_ListJourneys.go index c0deee06e0a..8b6432bcf05 100644 --- a/service/pinpoint/api_op_ListJourneys.go +++ b/service/pinpoint/api_op_ListJourneys.go @@ -66,6 +66,9 @@ func addOperationListJourneysMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListJourneysMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_ListTagsForResource.go b/service/pinpoint/api_op_ListTagsForResource.go index ac368b4d2f2..eef700a6b6e 100644 --- a/service/pinpoint/api_op_ListTagsForResource.go +++ b/service/pinpoint/api_op_ListTagsForResource.go @@ -57,6 +57,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_ListTemplateVersions.go b/service/pinpoint/api_op_ListTemplateVersions.go index a9c384f1817..28286b0924a 100644 --- a/service/pinpoint/api_op_ListTemplateVersions.go +++ b/service/pinpoint/api_op_ListTemplateVersions.go @@ -73,6 +73,9 @@ func addOperationListTemplateVersionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListTemplateVersionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_ListTemplates.go b/service/pinpoint/api_op_ListTemplates.go index 7bd080eb791..b9967307c62 100644 --- a/service/pinpoint/api_op_ListTemplates.go +++ b/service/pinpoint/api_op_ListTemplates.go @@ -71,6 +71,9 @@ func addOperationListTemplatesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTemplatesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_PhoneNumberValidate.go b/service/pinpoint/api_op_PhoneNumberValidate.go index 4d283fe931b..20d1c0a7f48 100644 --- a/service/pinpoint/api_op_PhoneNumberValidate.go +++ b/service/pinpoint/api_op_PhoneNumberValidate.go @@ -55,6 +55,9 @@ func addOperationPhoneNumberValidateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationPhoneNumberValidateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_PutEventStream.go b/service/pinpoint/api_op_PutEventStream.go index 4fed3e91640..b2c7e81a6a0 100644 --- a/service/pinpoint/api_op_PutEventStream.go +++ b/service/pinpoint/api_op_PutEventStream.go @@ -65,6 +65,9 @@ func addOperationPutEventStreamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationPutEventStreamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_PutEvents.go b/service/pinpoint/api_op_PutEvents.go index c37c39c748e..13d2d5a3bb1 100644 --- a/service/pinpoint/api_op_PutEvents.go +++ b/service/pinpoint/api_op_PutEvents.go @@ -63,6 +63,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPutEventsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_RemoveAttributes.go b/service/pinpoint/api_op_RemoveAttributes.go index 997795cec0b..5b31d6dea90 100644 --- a/service/pinpoint/api_op_RemoveAttributes.go +++ b/service/pinpoint/api_op_RemoveAttributes.go @@ -82,6 +82,9 @@ func addOperationRemoveAttributesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationRemoveAttributesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_SendMessages.go b/service/pinpoint/api_op_SendMessages.go index 387ef6bb133..e232e2fcaa8 100644 --- a/service/pinpoint/api_op_SendMessages.go +++ b/service/pinpoint/api_op_SendMessages.go @@ -62,6 +62,9 @@ func addOperationSendMessagesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationSendMessagesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_SendUsersMessages.go b/service/pinpoint/api_op_SendUsersMessages.go index 2e7d540e2bf..6fa726b7b4c 100644 --- a/service/pinpoint/api_op_SendUsersMessages.go +++ b/service/pinpoint/api_op_SendUsersMessages.go @@ -62,6 +62,9 @@ func addOperationSendUsersMessagesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationSendUsersMessagesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_TagResource.go b/service/pinpoint/api_op_TagResource.go index d3aeaca6206..fa5947ce56f 100644 --- a/service/pinpoint/api_op_TagResource.go +++ b/service/pinpoint/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UntagResource.go b/service/pinpoint/api_op_UntagResource.go index 4537d0ab6f3..1eb10be0e9c 100644 --- a/service/pinpoint/api_op_UntagResource.go +++ b/service/pinpoint/api_op_UntagResource.go @@ -56,6 +56,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateAdmChannel.go b/service/pinpoint/api_op_UpdateAdmChannel.go index e16066ee441..795a504d3f6 100644 --- a/service/pinpoint/api_op_UpdateAdmChannel.go +++ b/service/pinpoint/api_op_UpdateAdmChannel.go @@ -64,6 +64,9 @@ func addOperationUpdateAdmChannelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateAdmChannelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateApnsChannel.go b/service/pinpoint/api_op_UpdateApnsChannel.go index be41a88de64..97e33bed079 100644 --- a/service/pinpoint/api_op_UpdateApnsChannel.go +++ b/service/pinpoint/api_op_UpdateApnsChannel.go @@ -64,6 +64,9 @@ func addOperationUpdateApnsChannelMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateApnsChannelMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateApnsSandboxChannel.go b/service/pinpoint/api_op_UpdateApnsSandboxChannel.go index 14c17f721ea..228ab248da3 100644 --- a/service/pinpoint/api_op_UpdateApnsSandboxChannel.go +++ b/service/pinpoint/api_op_UpdateApnsSandboxChannel.go @@ -64,6 +64,9 @@ func addOperationUpdateApnsSandboxChannelMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateApnsSandboxChannelMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateApnsVoipChannel.go b/service/pinpoint/api_op_UpdateApnsVoipChannel.go index 7cc14503d80..343da2fa927 100644 --- a/service/pinpoint/api_op_UpdateApnsVoipChannel.go +++ b/service/pinpoint/api_op_UpdateApnsVoipChannel.go @@ -64,6 +64,9 @@ func addOperationUpdateApnsVoipChannelMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateApnsVoipChannelMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go b/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go index 495041b39fa..7a7292d1716 100644 --- a/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go +++ b/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go @@ -64,6 +64,9 @@ func addOperationUpdateApnsVoipSandboxChannelMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateApnsVoipSandboxChannelMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateApplicationSettings.go b/service/pinpoint/api_op_UpdateApplicationSettings.go index 59b4ab69702..73304be7e86 100644 --- a/service/pinpoint/api_op_UpdateApplicationSettings.go +++ b/service/pinpoint/api_op_UpdateApplicationSettings.go @@ -62,6 +62,9 @@ func addOperationUpdateApplicationSettingsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateApplicationSettingsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateBaiduChannel.go b/service/pinpoint/api_op_UpdateBaiduChannel.go index a42becdd622..cb12c766c98 100644 --- a/service/pinpoint/api_op_UpdateBaiduChannel.go +++ b/service/pinpoint/api_op_UpdateBaiduChannel.go @@ -64,6 +64,9 @@ func addOperationUpdateBaiduChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateBaiduChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateCampaign.go b/service/pinpoint/api_op_UpdateCampaign.go index bbd4e0b601f..c386ef90a12 100644 --- a/service/pinpoint/api_op_UpdateCampaign.go +++ b/service/pinpoint/api_op_UpdateCampaign.go @@ -67,6 +67,9 @@ func addOperationUpdateCampaignMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateCampaignMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateEmailChannel.go b/service/pinpoint/api_op_UpdateEmailChannel.go index 818d48daec4..2d85b69c059 100644 --- a/service/pinpoint/api_op_UpdateEmailChannel.go +++ b/service/pinpoint/api_op_UpdateEmailChannel.go @@ -63,6 +63,9 @@ func addOperationUpdateEmailChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateEmailChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateEmailTemplate.go b/service/pinpoint/api_op_UpdateEmailTemplate.go index deab169e718..4d9837bed73 100644 --- a/service/pinpoint/api_op_UpdateEmailTemplate.go +++ b/service/pinpoint/api_op_UpdateEmailTemplate.go @@ -95,6 +95,9 @@ func addOperationUpdateEmailTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdateEmailTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateEndpoint.go b/service/pinpoint/api_op_UpdateEndpoint.go index 18831d36138..cdc068927be 100644 --- a/service/pinpoint/api_op_UpdateEndpoint.go +++ b/service/pinpoint/api_op_UpdateEndpoint.go @@ -70,6 +70,9 @@ func addOperationUpdateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateEndpointsBatch.go b/service/pinpoint/api_op_UpdateEndpointsBatch.go index cd4f5dbd49d..96ee798146b 100644 --- a/service/pinpoint/api_op_UpdateEndpointsBatch.go +++ b/service/pinpoint/api_op_UpdateEndpointsBatch.go @@ -66,6 +66,9 @@ func addOperationUpdateEndpointsBatchMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateEndpointsBatchMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateGcmChannel.go b/service/pinpoint/api_op_UpdateGcmChannel.go index cf17e5b0c55..c1d17451d40 100644 --- a/service/pinpoint/api_op_UpdateGcmChannel.go +++ b/service/pinpoint/api_op_UpdateGcmChannel.go @@ -67,6 +67,9 @@ func addOperationUpdateGcmChannelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateGcmChannelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateJourney.go b/service/pinpoint/api_op_UpdateJourney.go index 250a28cec0e..ac6d16bd48a 100644 --- a/service/pinpoint/api_op_UpdateJourney.go +++ b/service/pinpoint/api_op_UpdateJourney.go @@ -67,6 +67,9 @@ func addOperationUpdateJourneyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateJourneyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateJourneyState.go b/service/pinpoint/api_op_UpdateJourneyState.go index cefd3679d09..94c9e34a053 100644 --- a/service/pinpoint/api_op_UpdateJourneyState.go +++ b/service/pinpoint/api_op_UpdateJourneyState.go @@ -67,6 +67,9 @@ func addOperationUpdateJourneyStateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateJourneyStateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdatePushTemplate.go b/service/pinpoint/api_op_UpdatePushTemplate.go index 46afe107c53..06a8f11a7f1 100644 --- a/service/pinpoint/api_op_UpdatePushTemplate.go +++ b/service/pinpoint/api_op_UpdatePushTemplate.go @@ -95,6 +95,9 @@ func addOperationUpdatePushTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdatePushTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateRecommenderConfiguration.go b/service/pinpoint/api_op_UpdateRecommenderConfiguration.go index e156ae34233..797b44a1533 100644 --- a/service/pinpoint/api_op_UpdateRecommenderConfiguration.go +++ b/service/pinpoint/api_op_UpdateRecommenderConfiguration.go @@ -63,6 +63,9 @@ func addOperationUpdateRecommenderConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateRecommenderConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateSegment.go b/service/pinpoint/api_op_UpdateSegment.go index c6aee066138..45db7940e3f 100644 --- a/service/pinpoint/api_op_UpdateSegment.go +++ b/service/pinpoint/api_op_UpdateSegment.go @@ -71,6 +71,9 @@ func addOperationUpdateSegmentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateSegmentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateSmsChannel.go b/service/pinpoint/api_op_UpdateSmsChannel.go index e2761e50451..3b86e33ffc4 100644 --- a/service/pinpoint/api_op_UpdateSmsChannel.go +++ b/service/pinpoint/api_op_UpdateSmsChannel.go @@ -63,6 +63,9 @@ func addOperationUpdateSmsChannelMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateSmsChannelMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateSmsTemplate.go b/service/pinpoint/api_op_UpdateSmsTemplate.go index 66ffa148d33..cd7c2a13441 100644 --- a/service/pinpoint/api_op_UpdateSmsTemplate.go +++ b/service/pinpoint/api_op_UpdateSmsTemplate.go @@ -95,6 +95,9 @@ func addOperationUpdateSmsTemplateMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdateSmsTemplateMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateTemplateActiveVersion.go b/service/pinpoint/api_op_UpdateTemplateActiveVersion.go index d04fa167e02..c78a22907f2 100644 --- a/service/pinpoint/api_op_UpdateTemplateActiveVersion.go +++ b/service/pinpoint/api_op_UpdateTemplateActiveVersion.go @@ -70,6 +70,9 @@ func addOperationUpdateTemplateActiveVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateTemplateActiveVersionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateVoiceChannel.go b/service/pinpoint/api_op_UpdateVoiceChannel.go index 817368a5072..42d7a68327a 100644 --- a/service/pinpoint/api_op_UpdateVoiceChannel.go +++ b/service/pinpoint/api_op_UpdateVoiceChannel.go @@ -63,6 +63,9 @@ func addOperationUpdateVoiceChannelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateVoiceChannelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/api_op_UpdateVoiceTemplate.go b/service/pinpoint/api_op_UpdateVoiceTemplate.go index 81b311b423e..d862f5d079e 100644 --- a/service/pinpoint/api_op_UpdateVoiceTemplate.go +++ b/service/pinpoint/api_op_UpdateVoiceTemplate.go @@ -95,6 +95,9 @@ func addOperationUpdateVoiceTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdateVoiceTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpoint/go.mod b/service/pinpoint/go.mod index 99ea269e3b5..75bfedbeee5 100644 --- a/service/pinpoint/go.mod +++ b/service/pinpoint/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/pinpoint go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpoint/go.sum b/service/pinpoint/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/pinpoint/go.sum +++ b/service/pinpoint/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pinpointemail/api_client.go b/service/pinpointemail/api_client.go index 20a357d2bc2..6955b56088c 100644 --- a/service/pinpointemail/api_client.go +++ b/service/pinpointemail/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/pinpointemail/api_op_CreateConfigurationSet.go b/service/pinpointemail/api_op_CreateConfigurationSet.go index 349e3e52cfb..e05d9bb85c0 100644 --- a/service/pinpointemail/api_op_CreateConfigurationSet.go +++ b/service/pinpointemail/api_op_CreateConfigurationSet.go @@ -76,6 +76,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go b/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go index cb88b5f7772..8d719fbf4cb 100644 --- a/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go +++ b/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go @@ -68,6 +68,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_CreateDedicatedIpPool.go b/service/pinpointemail/api_op_CreateDedicatedIpPool.go index 49f56a17c49..c6f7180e5bd 100644 --- a/service/pinpointemail/api_op_CreateDedicatedIpPool.go +++ b/service/pinpointemail/api_op_CreateDedicatedIpPool.go @@ -60,6 +60,9 @@ func addOperationCreateDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go b/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go index a620d15c21f..eb54d7cee0d 100644 --- a/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go +++ b/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go @@ -94,6 +94,9 @@ func addOperationCreateDeliverabilityTestReportMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateDeliverabilityTestReportMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_CreateEmailIdentity.go b/service/pinpointemail/api_op_CreateEmailIdentity.go index cfbfe9448de..776339da16b 100644 --- a/service/pinpointemail/api_op_CreateEmailIdentity.go +++ b/service/pinpointemail/api_op_CreateEmailIdentity.go @@ -85,6 +85,9 @@ func addOperationCreateEmailIdentityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateEmailIdentityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_DeleteConfigurationSet.go b/service/pinpointemail/api_op_DeleteConfigurationSet.go index d379ab1b7cb..b3e641ac2e0 100644 --- a/service/pinpointemail/api_op_DeleteConfigurationSet.go +++ b/service/pinpointemail/api_op_DeleteConfigurationSet.go @@ -55,6 +55,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go b/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go index 4679fba43b4..1f15f59c0e9 100644 --- a/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go @@ -62,6 +62,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_DeleteDedicatedIpPool.go b/service/pinpointemail/api_op_DeleteDedicatedIpPool.go index f9353524680..59a4ba3ac25 100644 --- a/service/pinpointemail/api_op_DeleteDedicatedIpPool.go +++ b/service/pinpointemail/api_op_DeleteDedicatedIpPool.go @@ -51,6 +51,9 @@ func addOperationDeleteDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_DeleteEmailIdentity.go b/service/pinpointemail/api_op_DeleteEmailIdentity.go index 2e5319d44a8..e1852f47077 100644 --- a/service/pinpointemail/api_op_DeleteEmailIdentity.go +++ b/service/pinpointemail/api_op_DeleteEmailIdentity.go @@ -56,6 +56,9 @@ func addOperationDeleteEmailIdentityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteEmailIdentityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetAccount.go b/service/pinpointemail/api_op_GetAccount.go index 1fb01a3719e..d08fd6e7c21 100644 --- a/service/pinpointemail/api_op_GetAccount.go +++ b/service/pinpointemail/api_op_GetAccount.go @@ -89,6 +89,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetBlacklistReports.go b/service/pinpointemail/api_op_GetBlacklistReports.go index 1f8172f7d56..eda2d134444 100644 --- a/service/pinpointemail/api_op_GetBlacklistReports.go +++ b/service/pinpointemail/api_op_GetBlacklistReports.go @@ -61,6 +61,9 @@ func addOperationGetBlacklistReportsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetBlacklistReportsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetConfigurationSet.go b/service/pinpointemail/api_op_GetConfigurationSet.go index 31295fcdb25..6652b16f92f 100644 --- a/service/pinpointemail/api_op_GetConfigurationSet.go +++ b/service/pinpointemail/api_op_GetConfigurationSet.go @@ -82,6 +82,9 @@ func addOperationGetConfigurationSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetConfigurationSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go b/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go index 7a76fa82446..1063e2e433f 100644 --- a/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go +++ b/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go @@ -63,6 +63,9 @@ func addOperationGetConfigurationSetEventDestinationsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetConfigurationSetEventDestinationsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetDedicatedIp.go b/service/pinpointemail/api_op_GetDedicatedIp.go index 56214064f79..c8ae149a7c5 100644 --- a/service/pinpointemail/api_op_GetDedicatedIp.go +++ b/service/pinpointemail/api_op_GetDedicatedIp.go @@ -59,6 +59,9 @@ func addOperationGetDedicatedIpMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetDedicatedIpMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetDedicatedIps.go b/service/pinpointemail/api_op_GetDedicatedIps.go index a51f3b907f8..a5c99941a74 100644 --- a/service/pinpointemail/api_op_GetDedicatedIps.go +++ b/service/pinpointemail/api_op_GetDedicatedIps.go @@ -71,6 +71,9 @@ func addOperationGetDedicatedIpsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetDedicatedIpsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go b/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go index e6f07324777..51e85f00575 100644 --- a/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go +++ b/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go @@ -93,6 +93,9 @@ func addOperationGetDeliverabilityDashboardOptionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetDeliverabilityDashboardOptionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetDeliverabilityTestReport.go b/service/pinpointemail/api_op_GetDeliverabilityTestReport.go index c9dcf5a08d1..fa6667a0cd1 100644 --- a/service/pinpointemail/api_op_GetDeliverabilityTestReport.go +++ b/service/pinpointemail/api_op_GetDeliverabilityTestReport.go @@ -78,6 +78,9 @@ func addOperationGetDeliverabilityTestReportMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetDeliverabilityTestReportMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go b/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go index 45389e2ba12..fd8f91bbf1f 100644 --- a/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go +++ b/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go @@ -69,6 +69,9 @@ func addOperationGetDomainDeliverabilityCampaignMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetDomainDeliverabilityCampaignMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetDomainStatisticsReport.go b/service/pinpointemail/api_op_GetDomainStatisticsReport.go index e2bd5e9663e..6ccb122460c 100644 --- a/service/pinpointemail/api_op_GetDomainStatisticsReport.go +++ b/service/pinpointemail/api_op_GetDomainStatisticsReport.go @@ -82,6 +82,9 @@ func addOperationGetDomainStatisticsReportMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetDomainStatisticsReportMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_GetEmailIdentity.go b/service/pinpointemail/api_op_GetEmailIdentity.go index a154a770325..35cff4b557e 100644 --- a/service/pinpointemail/api_op_GetEmailIdentity.go +++ b/service/pinpointemail/api_op_GetEmailIdentity.go @@ -88,6 +88,9 @@ func addOperationGetEmailIdentityMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetEmailIdentityMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_ListConfigurationSets.go b/service/pinpointemail/api_op_ListConfigurationSets.go index 0ae098ae23a..f9fe14d886a 100644 --- a/service/pinpointemail/api_op_ListConfigurationSets.go +++ b/service/pinpointemail/api_op_ListConfigurationSets.go @@ -72,6 +72,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_ListDedicatedIpPools.go b/service/pinpointemail/api_op_ListDedicatedIpPools.go index 21c0d478b6a..26a32db2dc6 100644 --- a/service/pinpointemail/api_op_ListDedicatedIpPools.go +++ b/service/pinpointemail/api_op_ListDedicatedIpPools.go @@ -66,6 +66,9 @@ func addOperationListDedicatedIpPoolsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListDedicatedIpPoolsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_ListDeliverabilityTestReports.go b/service/pinpointemail/api_op_ListDeliverabilityTestReports.go index 19199cf060b..3ff846b0f46 100644 --- a/service/pinpointemail/api_op_ListDeliverabilityTestReports.go +++ b/service/pinpointemail/api_op_ListDeliverabilityTestReports.go @@ -75,6 +75,9 @@ func addOperationListDeliverabilityTestReportsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListDeliverabilityTestReportsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go b/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go index 907a47a8b65..25ebddc6a71 100644 --- a/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go +++ b/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go @@ -97,6 +97,9 @@ func addOperationListDomainDeliverabilityCampaignsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationListDomainDeliverabilityCampaignsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_ListEmailIdentities.go b/service/pinpointemail/api_op_ListEmailIdentities.go index 2fa3a6a65df..7ec4aaa4f59 100644 --- a/service/pinpointemail/api_op_ListEmailIdentities.go +++ b/service/pinpointemail/api_op_ListEmailIdentities.go @@ -75,6 +75,9 @@ func addOperationListEmailIdentitiesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListEmailIdentitiesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_ListTagsForResource.go b/service/pinpointemail/api_op_ListTagsForResource.go index 5d66a3c1c90..41aacb754af 100644 --- a/service/pinpointemail/api_op_ListTagsForResource.go +++ b/service/pinpointemail/api_op_ListTagsForResource.go @@ -62,6 +62,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go b/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go index d71088fc723..52a95f49b90 100644 --- a/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go +++ b/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go @@ -52,6 +52,9 @@ func addOperationPutAccountDedicatedIpWarmupAttributesMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationPutAccountDedicatedIpWarmupAttributesMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutAccountSendingAttributes.go b/service/pinpointemail/api_op_PutAccountSendingAttributes.go index fc8afcc984c..0d5c5c0aeee 100644 --- a/service/pinpointemail/api_op_PutAccountSendingAttributes.go +++ b/service/pinpointemail/api_op_PutAccountSendingAttributes.go @@ -52,6 +52,9 @@ func addOperationPutAccountSendingAttributesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationPutAccountSendingAttributesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go b/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go index b20bc15dc34..91b3a06ab69 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go @@ -66,6 +66,9 @@ func addOperationPutConfigurationSetDeliveryOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationPutConfigurationSetDeliveryOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go b/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go index 2d84e55cb99..160cc7c2d0d 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go @@ -58,6 +58,9 @@ func addOperationPutConfigurationSetReputationOptionsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutConfigurationSetReputationOptionsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go b/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go index bc620a51212..4e3266a10a3 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go @@ -58,6 +58,9 @@ func addOperationPutConfigurationSetSendingOptionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutConfigurationSetSendingOptionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go b/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go index b06ab8b319e..9917a295928 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go @@ -57,6 +57,9 @@ func addOperationPutConfigurationSetTrackingOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutConfigurationSetTrackingOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutDedicatedIpInPool.go b/service/pinpointemail/api_op_PutDedicatedIpInPool.go index 9df7f7313ee..97f7c746156 100644 --- a/service/pinpointemail/api_op_PutDedicatedIpInPool.go +++ b/service/pinpointemail/api_op_PutDedicatedIpInPool.go @@ -62,6 +62,9 @@ func addOperationPutDedicatedIpInPoolMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationPutDedicatedIpInPoolMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go b/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go index a4923c5973a..a065c83c51c 100644 --- a/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go +++ b/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go @@ -58,6 +58,9 @@ func addOperationPutDedicatedIpWarmupAttributesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutDedicatedIpWarmupAttributesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go b/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go index 31069990a2b..ed0daca5a47 100644 --- a/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go +++ b/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go @@ -73,6 +73,9 @@ func addOperationPutDeliverabilityDashboardOptionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationPutDeliverabilityDashboardOptionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go b/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go index b1c693e8521..46715a7265f 100644 --- a/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go +++ b/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go @@ -58,6 +58,9 @@ func addOperationPutEmailIdentityDkimAttributesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutEmailIdentityDkimAttributesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go b/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go index 179070a4948..569e12bde36 100644 --- a/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go +++ b/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go @@ -75,6 +75,9 @@ func addOperationPutEmailIdentityFeedbackAttributesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationPutEmailIdentityFeedbackAttributesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go b/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go index fa29a4e7f53..602b88bbbec 100644 --- a/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go +++ b/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go @@ -76,6 +76,9 @@ func addOperationPutEmailIdentityMailFromAttributesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationPutEmailIdentityMailFromAttributesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_SendEmail.go b/service/pinpointemail/api_op_SendEmail.go index 1457042b9fb..6d6e0b54cb4 100644 --- a/service/pinpointemail/api_op_SendEmail.go +++ b/service/pinpointemail/api_op_SendEmail.go @@ -97,6 +97,9 @@ func addOperationSendEmailMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationSendEmailMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_TagResource.go b/service/pinpointemail/api_op_TagResource.go index c6906de9f17..2d8555843d2 100644 --- a/service/pinpointemail/api_op_TagResource.go +++ b/service/pinpointemail/api_op_TagResource.go @@ -64,6 +64,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_UntagResource.go b/service/pinpointemail/api_op_UntagResource.go index 1ddeeb97370..c94d8902122 100644 --- a/service/pinpointemail/api_op_UntagResource.go +++ b/service/pinpointemail/api_op_UntagResource.go @@ -58,6 +58,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go b/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go index c205d2fc4e8..69f127d60ae 100644 --- a/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go @@ -70,6 +70,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointemail/go.mod b/service/pinpointemail/go.mod index ff475bb60e7..032d9e5913c 100644 --- a/service/pinpointemail/go.mod +++ b/service/pinpointemail/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/pinpointemail go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointemail/go.sum b/service/pinpointemail/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/pinpointemail/go.sum +++ b/service/pinpointemail/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pinpointsmsvoice/api_client.go b/service/pinpointsmsvoice/api_client.go index 42fcf1b9459..8f8edac1c10 100644 --- a/service/pinpointsmsvoice/api_client.go +++ b/service/pinpointsmsvoice/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go b/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go index f1524e3ab5c..4d36091dfb0 100644 --- a/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go +++ b/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go @@ -50,6 +50,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go b/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go index e8514364701..480f1fb7197 100644 --- a/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go +++ b/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go @@ -58,6 +58,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go b/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go index 44c3d16d3bf..accd77bb43e 100644 --- a/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go +++ b/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go @@ -50,6 +50,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go b/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go index cfc8b8ddb44..8f3371803a3 100644 --- a/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go @@ -55,6 +55,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go b/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go index e810b3b576e..8ebc9a0bca0 100644 --- a/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go +++ b/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go @@ -57,6 +57,9 @@ func addOperationGetConfigurationSetEventDestinationsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetConfigurationSetEventDestinationsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_ListConfigurationSets.go b/service/pinpointsmsvoice/api_op_ListConfigurationSets.go index d0d094cc706..9f8ba448a60 100644 --- a/service/pinpointsmsvoice/api_op_ListConfigurationSets.go +++ b/service/pinpointsmsvoice/api_op_ListConfigurationSets.go @@ -62,6 +62,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_SendVoiceMessage.go b/service/pinpointsmsvoice/api_op_SendVoiceMessage.go index d3d1b4d9426..91f0897ee38 100644 --- a/service/pinpointsmsvoice/api_op_SendVoiceMessage.go +++ b/service/pinpointsmsvoice/api_op_SendVoiceMessage.go @@ -71,6 +71,9 @@ func addOperationSendVoiceMessageMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationSendVoiceMessageMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go b/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go index 629140d01a4..cb6c8665d65 100644 --- a/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go @@ -62,6 +62,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pinpointsmsvoice/go.mod b/service/pinpointsmsvoice/go.mod index 3d8197b51c3..e5a61515f3c 100644 --- a/service/pinpointsmsvoice/go.mod +++ b/service/pinpointsmsvoice/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoice go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointsmsvoice/go.sum b/service/pinpointsmsvoice/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/pinpointsmsvoice/go.sum +++ b/service/pinpointsmsvoice/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/polly/api_client.go b/service/polly/api_client.go index c1d9ee2affe..f2813080952 100644 --- a/service/polly/api_client.go +++ b/service/polly/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/polly/api_op_DeleteLexicon.go b/service/polly/api_op_DeleteLexicon.go index 91640022a91..51806e9fe55 100644 --- a/service/polly/api_op_DeleteLexicon.go +++ b/service/polly/api_op_DeleteLexicon.go @@ -52,6 +52,9 @@ func addOperationDeleteLexiconMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteLexiconMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_DescribeVoices.go b/service/polly/api_op_DescribeVoices.go index 59bc7f1d1b2..86c3be62e57 100644 --- a/service/polly/api_op_DescribeVoices.go +++ b/service/polly/api_op_DescribeVoices.go @@ -83,6 +83,9 @@ func addOperationDescribeVoicesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeVoicesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_GetLexicon.go b/service/polly/api_op_GetLexicon.go index 16e39a328f4..5fd768ee613 100644 --- a/service/polly/api_op_GetLexicon.go +++ b/service/polly/api_op_GetLexicon.go @@ -60,6 +60,9 @@ func addOperationGetLexiconMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetLexiconMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_GetSpeechSynthesisTask.go b/service/polly/api_op_GetSpeechSynthesisTask.go index 6738d702b3f..3921afd0c27 100644 --- a/service/polly/api_op_GetSpeechSynthesisTask.go +++ b/service/polly/api_op_GetSpeechSynthesisTask.go @@ -56,6 +56,9 @@ func addOperationGetSpeechSynthesisTaskMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetSpeechSynthesisTaskMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_ListLexicons.go b/service/polly/api_op_ListLexicons.go index b8d06fa7d9b..abdd6fe2d90 100644 --- a/service/polly/api_op_ListLexicons.go +++ b/service/polly/api_op_ListLexicons.go @@ -58,6 +58,9 @@ func addOperationListLexiconsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListLexiconsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_ListSpeechSynthesisTasks.go b/service/polly/api_op_ListSpeechSynthesisTasks.go index c20717da9ff..d47b21fd654 100644 --- a/service/polly/api_op_ListSpeechSynthesisTasks.go +++ b/service/polly/api_op_ListSpeechSynthesisTasks.go @@ -66,6 +66,9 @@ func addOperationListSpeechSynthesisTasksMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListSpeechSynthesisTasksMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_PutLexicon.go b/service/polly/api_op_PutLexicon.go index 4a87699ce82..00555b3e037 100644 --- a/service/polly/api_op_PutLexicon.go +++ b/service/polly/api_op_PutLexicon.go @@ -60,6 +60,9 @@ func addOperationPutLexiconMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutLexiconMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_StartSpeechSynthesisTask.go b/service/polly/api_op_StartSpeechSynthesisTask.go index aa7026aed90..5ad199d1e9d 100644 --- a/service/polly/api_op_StartSpeechSynthesisTask.go +++ b/service/polly/api_op_StartSpeechSynthesisTask.go @@ -118,6 +118,9 @@ func addOperationStartSpeechSynthesisTaskMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationStartSpeechSynthesisTaskMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/api_op_SynthesizeSpeech.go b/service/polly/api_op_SynthesizeSpeech.go index e459e51c767..e882766fcbb 100644 --- a/service/polly/api_op_SynthesizeSpeech.go +++ b/service/polly/api_op_SynthesizeSpeech.go @@ -131,6 +131,9 @@ func addOperationSynthesizeSpeechMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationSynthesizeSpeechMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/polly/go.mod b/service/polly/go.mod index 6370d8d89de..21e39359281 100644 --- a/service/polly/go.mod +++ b/service/polly/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/polly go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/polly/go.sum b/service/polly/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/polly/go.sum +++ b/service/polly/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pricing/api_client.go b/service/pricing/api_client.go index 3adc5441e28..24cce2dae9f 100644 --- a/service/pricing/api_client.go +++ b/service/pricing/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/pricing/api_op_DescribeServices.go b/service/pricing/api_op_DescribeServices.go index 5daa9c2dd33..a5f2e47ef25 100644 --- a/service/pricing/api_op_DescribeServices.go +++ b/service/pricing/api_op_DescribeServices.go @@ -74,6 +74,9 @@ func addOperationDescribeServicesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeServicesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pricing/api_op_GetAttributeValues.go b/service/pricing/api_op_GetAttributeValues.go index 448928dcae4..14857232392 100644 --- a/service/pricing/api_op_GetAttributeValues.go +++ b/service/pricing/api_op_GetAttributeValues.go @@ -76,6 +76,9 @@ func addOperationGetAttributeValuesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetAttributeValuesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pricing/api_op_GetProducts.go b/service/pricing/api_op_GetProducts.go index 8557eacb6a4..c22b8cd963b 100644 --- a/service/pricing/api_op_GetProducts.go +++ b/service/pricing/api_op_GetProducts.go @@ -72,6 +72,9 @@ func addOperationGetProductsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetProductsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/pricing/go.mod b/service/pricing/go.mod index 922ef0269a7..1758b6f9d4d 100644 --- a/service/pricing/go.mod +++ b/service/pricing/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/pricing go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pricing/go.sum b/service/pricing/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/pricing/go.sum +++ b/service/pricing/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/qldb/api_client.go b/service/qldb/api_client.go index bd3675effb1..10dbb967ded 100644 --- a/service/qldb/api_client.go +++ b/service/qldb/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/qldb/api_op_CancelJournalKinesisStream.go b/service/qldb/api_op_CancelJournalKinesisStream.go index b1d1c47c560..b5af3482c32 100644 --- a/service/qldb/api_op_CancelJournalKinesisStream.go +++ b/service/qldb/api_op_CancelJournalKinesisStream.go @@ -60,6 +60,9 @@ func addOperationCancelJournalKinesisStreamMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCancelJournalKinesisStreamMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_CreateLedger.go b/service/qldb/api_op_CreateLedger.go index f09b512097a..080cbc53092 100644 --- a/service/qldb/api_op_CreateLedger.go +++ b/service/qldb/api_op_CreateLedger.go @@ -96,6 +96,9 @@ func addOperationCreateLedgerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateLedgerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_DeleteLedger.go b/service/qldb/api_op_DeleteLedger.go index e3f120e88ee..36298443c9d 100644 --- a/service/qldb/api_op_DeleteLedger.go +++ b/service/qldb/api_op_DeleteLedger.go @@ -53,6 +53,9 @@ func addOperationDeleteLedgerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteLedgerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_DescribeJournalKinesisStream.go b/service/qldb/api_op_DescribeJournalKinesisStream.go index c29c19f6c02..648416db83b 100644 --- a/service/qldb/api_op_DescribeJournalKinesisStream.go +++ b/service/qldb/api_op_DescribeJournalKinesisStream.go @@ -61,6 +61,9 @@ func addOperationDescribeJournalKinesisStreamMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeJournalKinesisStreamMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_DescribeJournalS3Export.go b/service/qldb/api_op_DescribeJournalS3Export.go index cb48da41586..2835596cbc5 100644 --- a/service/qldb/api_op_DescribeJournalS3Export.go +++ b/service/qldb/api_op_DescribeJournalS3Export.go @@ -68,6 +68,9 @@ func addOperationDescribeJournalS3ExportMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeJournalS3ExportMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_DescribeLedger.go b/service/qldb/api_op_DescribeLedger.go index 5b1c1399df5..db6caf30c77 100644 --- a/service/qldb/api_op_DescribeLedger.go +++ b/service/qldb/api_op_DescribeLedger.go @@ -74,6 +74,9 @@ func addOperationDescribeLedgerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeLedgerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_ExportJournalToS3.go b/service/qldb/api_op_ExportJournalToS3.go index 43bfb1f3b02..e3e5f6ed2b0 100644 --- a/service/qldb/api_op_ExportJournalToS3.go +++ b/service/qldb/api_op_ExportJournalToS3.go @@ -101,6 +101,9 @@ func addOperationExportJournalToS3Middlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationExportJournalToS3Middlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_GetBlock.go b/service/qldb/api_op_GetBlock.go index 4baf8856305..20d1ca3d415 100644 --- a/service/qldb/api_op_GetBlock.go +++ b/service/qldb/api_op_GetBlock.go @@ -80,6 +80,9 @@ func addOperationGetBlockMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetBlockMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_GetDigest.go b/service/qldb/api_op_GetDigest.go index 0ea918ee07d..9a2d347f27a 100644 --- a/service/qldb/api_op_GetDigest.go +++ b/service/qldb/api_op_GetDigest.go @@ -62,6 +62,9 @@ func addOperationGetDigestMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetDigestMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_GetRevision.go b/service/qldb/api_op_GetRevision.go index 72aaa48180d..c99a3071989 100644 --- a/service/qldb/api_op_GetRevision.go +++ b/service/qldb/api_op_GetRevision.go @@ -79,6 +79,9 @@ func addOperationGetRevisionMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetRevisionMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go b/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go index fee44c1d687..0c57a89e561 100644 --- a/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go +++ b/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go @@ -77,6 +77,9 @@ func addOperationListJournalKinesisStreamsForLedgerMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListJournalKinesisStreamsForLedgerMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_ListJournalS3Exports.go b/service/qldb/api_op_ListJournalS3Exports.go index fdcee136c1c..e6c0d74b00b 100644 --- a/service/qldb/api_op_ListJournalS3Exports.go +++ b/service/qldb/api_op_ListJournalS3Exports.go @@ -72,6 +72,9 @@ func addOperationListJournalS3ExportsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListJournalS3ExportsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_ListJournalS3ExportsForLedger.go b/service/qldb/api_op_ListJournalS3ExportsForLedger.go index 8d305c6ebd8..4bc962701eb 100644 --- a/service/qldb/api_op_ListJournalS3ExportsForLedger.go +++ b/service/qldb/api_op_ListJournalS3ExportsForLedger.go @@ -79,6 +79,9 @@ func addOperationListJournalS3ExportsForLedgerMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListJournalS3ExportsForLedgerMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_ListLedgers.go b/service/qldb/api_op_ListLedgers.go index 1ebc0a3bd63..da472e08710 100644 --- a/service/qldb/api_op_ListLedgers.go +++ b/service/qldb/api_op_ListLedgers.go @@ -71,6 +71,9 @@ func addOperationListLedgersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListLedgersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_ListTagsForResource.go b/service/qldb/api_op_ListTagsForResource.go index 2844c2d44a3..b6afd4f3c95 100644 --- a/service/qldb/api_op_ListTagsForResource.go +++ b/service/qldb/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_StreamJournalToKinesis.go b/service/qldb/api_op_StreamJournalToKinesis.go index b5a45a2daf7..b95dbde6649 100644 --- a/service/qldb/api_op_StreamJournalToKinesis.go +++ b/service/qldb/api_op_StreamJournalToKinesis.go @@ -98,6 +98,9 @@ func addOperationStreamJournalToKinesisMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationStreamJournalToKinesisMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_TagResource.go b/service/qldb/api_op_TagResource.go index 316ab3a3be3..0a397d2a09d 100644 --- a/service/qldb/api_op_TagResource.go +++ b/service/qldb/api_op_TagResource.go @@ -59,6 +59,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_UntagResource.go b/service/qldb/api_op_UntagResource.go index 513d1a1c9f3..ea5338eae35 100644 --- a/service/qldb/api_op_UntagResource.go +++ b/service/qldb/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/api_op_UpdateLedger.go b/service/qldb/api_op_UpdateLedger.go index ff65449b30b..92e07a71214 100644 --- a/service/qldb/api_op_UpdateLedger.go +++ b/service/qldb/api_op_UpdateLedger.go @@ -83,6 +83,9 @@ func addOperationUpdateLedgerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationUpdateLedgerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldb/go.mod b/service/qldb/go.mod index 0a1bc89aa09..a9dc7bf4824 100644 --- a/service/qldb/go.mod +++ b/service/qldb/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/qldb go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qldb/go.sum b/service/qldb/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/qldb/go.sum +++ b/service/qldb/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/qldbsession/api_client.go b/service/qldbsession/api_client.go index 21391d35b0c..579ec4661e9 100644 --- a/service/qldbsession/api_client.go +++ b/service/qldbsession/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/qldbsession/api_op_SendCommand.go b/service/qldbsession/api_op_SendCommand.go index ca6c7c99c72..a57588550f3 100644 --- a/service/qldbsession/api_op_SendCommand.go +++ b/service/qldbsession/api_op_SendCommand.go @@ -112,6 +112,9 @@ func addOperationSendCommandMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationSendCommandMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/qldbsession/go.mod b/service/qldbsession/go.mod index 48b7c3f016e..06de95c3887 100644 --- a/service/qldbsession/go.mod +++ b/service/qldbsession/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/qldbsession go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qldbsession/go.sum b/service/qldbsession/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/qldbsession/go.sum +++ b/service/qldbsession/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/quicksight/api_client.go b/service/quicksight/api_client.go index e1f3e17a3ba..3d428ca90ec 100644 --- a/service/quicksight/api_client.go +++ b/service/quicksight/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/quicksight/api_op_CancelIngestion.go b/service/quicksight/api_op_CancelIngestion.go index 54eb1c347db..c7efe6e3d61 100644 --- a/service/quicksight/api_op_CancelIngestion.go +++ b/service/quicksight/api_op_CancelIngestion.go @@ -71,6 +71,9 @@ func addOperationCancelIngestionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCancelIngestionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateAccountCustomization.go b/service/quicksight/api_op_CreateAccountCustomization.go index 4eb4ac123cc..b51a2639943 100644 --- a/service/quicksight/api_op_CreateAccountCustomization.go +++ b/service/quicksight/api_op_CreateAccountCustomization.go @@ -103,6 +103,9 @@ func addOperationCreateAccountCustomizationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateAccountCustomizationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateAnalysis.go b/service/quicksight/api_op_CreateAnalysis.go index 3927da13476..32e2e478556 100644 --- a/service/quicksight/api_op_CreateAnalysis.go +++ b/service/quicksight/api_op_CreateAnalysis.go @@ -103,6 +103,9 @@ func addOperationCreateAnalysisMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateAnalysisMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateDashboard.go b/service/quicksight/api_op_CreateDashboard.go index 6d8ebc26d94..064e911da21 100644 --- a/service/quicksight/api_op_CreateDashboard.go +++ b/service/quicksight/api_op_CreateDashboard.go @@ -138,6 +138,9 @@ func addOperationCreateDashboardMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationCreateDashboardMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateDataSet.go b/service/quicksight/api_op_CreateDataSet.go index 84f5b2ca6a4..298eda43e0e 100644 --- a/service/quicksight/api_op_CreateDataSet.go +++ b/service/quicksight/api_op_CreateDataSet.go @@ -110,6 +110,9 @@ func addOperationCreateDataSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationCreateDataSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateDataSource.go b/service/quicksight/api_op_CreateDataSource.go index 4ad479df2fb..8a6585f0f3c 100644 --- a/service/quicksight/api_op_CreateDataSource.go +++ b/service/quicksight/api_op_CreateDataSource.go @@ -107,6 +107,9 @@ func addOperationCreateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationCreateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateGroup.go b/service/quicksight/api_op_CreateGroup.go index 377f866267a..174e781b68e 100644 --- a/service/quicksight/api_op_CreateGroup.go +++ b/service/quicksight/api_op_CreateGroup.go @@ -76,6 +76,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateGroupMembership.go b/service/quicksight/api_op_CreateGroupMembership.go index d854a55f9dc..0c615e053c0 100644 --- a/service/quicksight/api_op_CreateGroupMembership.go +++ b/service/quicksight/api_op_CreateGroupMembership.go @@ -75,6 +75,9 @@ func addOperationCreateGroupMembershipMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreateGroupMembershipMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateIAMPolicyAssignment.go b/service/quicksight/api_op_CreateIAMPolicyAssignment.go index b58290c1f9a..dabad5e4776 100644 --- a/service/quicksight/api_op_CreateIAMPolicyAssignment.go +++ b/service/quicksight/api_op_CreateIAMPolicyAssignment.go @@ -117,6 +117,9 @@ func addOperationCreateIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationCreateIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateIngestion.go b/service/quicksight/api_op_CreateIngestion.go index c651f5b432e..c2dd5f11e0f 100644 --- a/service/quicksight/api_op_CreateIngestion.go +++ b/service/quicksight/api_op_CreateIngestion.go @@ -81,6 +81,9 @@ func addOperationCreateIngestionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateIngestionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateNamespace.go b/service/quicksight/api_op_CreateNamespace.go index e480f9342c9..58309dde051 100644 --- a/service/quicksight/api_op_CreateNamespace.go +++ b/service/quicksight/api_op_CreateNamespace.go @@ -97,6 +97,9 @@ func addOperationCreateNamespaceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateNamespaceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateTemplate.go b/service/quicksight/api_op_CreateTemplate.go index 13031498843..5c9aa45c122 100644 --- a/service/quicksight/api_op_CreateTemplate.go +++ b/service/quicksight/api_op_CreateTemplate.go @@ -112,6 +112,9 @@ func addOperationCreateTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationCreateTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateTemplateAlias.go b/service/quicksight/api_op_CreateTemplateAlias.go index 8c84e5f7e9b..c9136746230 100644 --- a/service/quicksight/api_op_CreateTemplateAlias.go +++ b/service/quicksight/api_op_CreateTemplateAlias.go @@ -77,6 +77,9 @@ func addOperationCreateTemplateAliasMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateTemplateAliasMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateTheme.go b/service/quicksight/api_op_CreateTheme.go index b730ec769ac..70ec6a3f47e 100644 --- a/service/quicksight/api_op_CreateTheme.go +++ b/service/quicksight/api_op_CreateTheme.go @@ -108,6 +108,9 @@ func addOperationCreateThemeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateThemeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_CreateThemeAlias.go b/service/quicksight/api_op_CreateThemeAlias.go index 0f21d755a8c..121705e4fe7 100644 --- a/service/quicksight/api_op_CreateThemeAlias.go +++ b/service/quicksight/api_op_CreateThemeAlias.go @@ -76,6 +76,9 @@ func addOperationCreateThemeAliasMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateThemeAliasMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteAccountCustomization.go b/service/quicksight/api_op_DeleteAccountCustomization.go index f35365f2c83..2025f518fac 100644 --- a/service/quicksight/api_op_DeleteAccountCustomization.go +++ b/service/quicksight/api_op_DeleteAccountCustomization.go @@ -60,6 +60,9 @@ func addOperationDeleteAccountCustomizationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteAccountCustomizationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteAnalysis.go b/service/quicksight/api_op_DeleteAnalysis.go index 99f20b0cec2..80f568a2888 100644 --- a/service/quicksight/api_op_DeleteAnalysis.go +++ b/service/quicksight/api_op_DeleteAnalysis.go @@ -91,6 +91,9 @@ func addOperationDeleteAnalysisMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDeleteAnalysisMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteDashboard.go b/service/quicksight/api_op_DeleteDashboard.go index 4fc555d0d96..a919298cbc0 100644 --- a/service/quicksight/api_op_DeleteDashboard.go +++ b/service/quicksight/api_op_DeleteDashboard.go @@ -70,6 +70,9 @@ func addOperationDeleteDashboardMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteDashboardMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteDataSet.go b/service/quicksight/api_op_DeleteDataSet.go index bf77f9e8c5f..af74c7b5237 100644 --- a/service/quicksight/api_op_DeleteDataSet.go +++ b/service/quicksight/api_op_DeleteDataSet.go @@ -68,6 +68,9 @@ func addOperationDeleteDataSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteDataSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteDataSource.go b/service/quicksight/api_op_DeleteDataSource.go index 806d5269129..3736f2d7fdc 100644 --- a/service/quicksight/api_op_DeleteDataSource.go +++ b/service/quicksight/api_op_DeleteDataSource.go @@ -69,6 +69,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteGroup.go b/service/quicksight/api_op_DeleteGroup.go index 9c797641472..37f0f290dd9 100644 --- a/service/quicksight/api_op_DeleteGroup.go +++ b/service/quicksight/api_op_DeleteGroup.go @@ -66,6 +66,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteGroupMembership.go b/service/quicksight/api_op_DeleteGroupMembership.go index a77b880de93..b015ca3d682 100644 --- a/service/quicksight/api_op_DeleteGroupMembership.go +++ b/service/quicksight/api_op_DeleteGroupMembership.go @@ -71,6 +71,9 @@ func addOperationDeleteGroupMembershipMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteGroupMembershipMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteIAMPolicyAssignment.go b/service/quicksight/api_op_DeleteIAMPolicyAssignment.go index 5d3b6d5e153..6876c497f41 100644 --- a/service/quicksight/api_op_DeleteIAMPolicyAssignment.go +++ b/service/quicksight/api_op_DeleteIAMPolicyAssignment.go @@ -68,6 +68,9 @@ func addOperationDeleteIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteNamespace.go b/service/quicksight/api_op_DeleteNamespace.go index 9239fa5099f..94dbddc7bb0 100644 --- a/service/quicksight/api_op_DeleteNamespace.go +++ b/service/quicksight/api_op_DeleteNamespace.go @@ -64,6 +64,9 @@ func addOperationDeleteNamespaceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteNamespaceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteTemplate.go b/service/quicksight/api_op_DeleteTemplate.go index dcc47fa8992..216d2e295a3 100644 --- a/service/quicksight/api_op_DeleteTemplate.go +++ b/service/quicksight/api_op_DeleteTemplate.go @@ -70,6 +70,9 @@ func addOperationDeleteTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteTemplateAlias.go b/service/quicksight/api_op_DeleteTemplateAlias.go index 83d1913c22f..ee74fdd5807 100644 --- a/service/quicksight/api_op_DeleteTemplateAlias.go +++ b/service/quicksight/api_op_DeleteTemplateAlias.go @@ -78,6 +78,9 @@ func addOperationDeleteTemplateAliasMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteTemplateAliasMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteTheme.go b/service/quicksight/api_op_DeleteTheme.go index 1041444e7fd..7eb03496feb 100644 --- a/service/quicksight/api_op_DeleteTheme.go +++ b/service/quicksight/api_op_DeleteTheme.go @@ -71,6 +71,9 @@ func addOperationDeleteThemeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteThemeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteThemeAlias.go b/service/quicksight/api_op_DeleteThemeAlias.go index 6dc582f056f..d69201a3430 100644 --- a/service/quicksight/api_op_DeleteThemeAlias.go +++ b/service/quicksight/api_op_DeleteThemeAlias.go @@ -76,6 +76,9 @@ func addOperationDeleteThemeAliasMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDeleteThemeAliasMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteUser.go b/service/quicksight/api_op_DeleteUser.go index cec860df340..3f251b19b23 100644 --- a/service/quicksight/api_op_DeleteUser.go +++ b/service/quicksight/api_op_DeleteUser.go @@ -68,6 +68,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DeleteUserByPrincipalId.go b/service/quicksight/api_op_DeleteUserByPrincipalId.go index f94097409c7..f23949ed375 100644 --- a/service/quicksight/api_op_DeleteUserByPrincipalId.go +++ b/service/quicksight/api_op_DeleteUserByPrincipalId.go @@ -67,6 +67,9 @@ func addOperationDeleteUserByPrincipalIdMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteUserByPrincipalIdMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeAccountCustomization.go b/service/quicksight/api_op_DescribeAccountCustomization.go index f640a895b4b..fe05a53a86d 100644 --- a/service/quicksight/api_op_DescribeAccountCustomization.go +++ b/service/quicksight/api_op_DescribeAccountCustomization.go @@ -127,6 +127,9 @@ func addOperationDescribeAccountCustomizationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationDescribeAccountCustomizationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeAccountSettings.go b/service/quicksight/api_op_DescribeAccountSettings.go index fd24acd3501..5be5b6a8e72 100644 --- a/service/quicksight/api_op_DescribeAccountSettings.go +++ b/service/quicksight/api_op_DescribeAccountSettings.go @@ -66,6 +66,9 @@ func addOperationDescribeAccountSettingsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeAccountSettingsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeAnalysis.go b/service/quicksight/api_op_DescribeAnalysis.go index 8873731cf2b..60daec0471a 100644 --- a/service/quicksight/api_op_DescribeAnalysis.go +++ b/service/quicksight/api_op_DescribeAnalysis.go @@ -67,6 +67,9 @@ func addOperationDescribeAnalysisMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeAnalysisMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeAnalysisPermissions.go b/service/quicksight/api_op_DescribeAnalysisPermissions.go index 4484ad6b6a4..329e57b9628 100644 --- a/service/quicksight/api_op_DescribeAnalysisPermissions.go +++ b/service/quicksight/api_op_DescribeAnalysisPermissions.go @@ -74,6 +74,9 @@ func addOperationDescribeAnalysisPermissionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeAnalysisPermissionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeDashboard.go b/service/quicksight/api_op_DescribeDashboard.go index 1c3944137e9..8938886d253 100644 --- a/service/quicksight/api_op_DescribeDashboard.go +++ b/service/quicksight/api_op_DescribeDashboard.go @@ -71,6 +71,9 @@ func addOperationDescribeDashboardMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeDashboardMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeDashboardPermissions.go b/service/quicksight/api_op_DescribeDashboardPermissions.go index 5a6073d19d3..601601e3ad1 100644 --- a/service/quicksight/api_op_DescribeDashboardPermissions.go +++ b/service/quicksight/api_op_DescribeDashboardPermissions.go @@ -71,6 +71,9 @@ func addOperationDescribeDashboardPermissionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeDashboardPermissionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeDataSet.go b/service/quicksight/api_op_DescribeDataSet.go index a5116470e44..f535e92f6e2 100644 --- a/service/quicksight/api_op_DescribeDataSet.go +++ b/service/quicksight/api_op_DescribeDataSet.go @@ -65,6 +65,9 @@ func addOperationDescribeDataSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeDataSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeDataSetPermissions.go b/service/quicksight/api_op_DescribeDataSetPermissions.go index 15081783c1f..55db365d292 100644 --- a/service/quicksight/api_op_DescribeDataSetPermissions.go +++ b/service/quicksight/api_op_DescribeDataSetPermissions.go @@ -73,6 +73,9 @@ func addOperationDescribeDataSetPermissionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeDataSetPermissionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeDataSource.go b/service/quicksight/api_op_DescribeDataSource.go index b041c6a7716..499dc2d3c89 100644 --- a/service/quicksight/api_op_DescribeDataSource.go +++ b/service/quicksight/api_op_DescribeDataSource.go @@ -65,6 +65,9 @@ func addOperationDescribeDataSourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeDataSourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeDataSourcePermissions.go b/service/quicksight/api_op_DescribeDataSourcePermissions.go index 47e6a4b2951..0365fe7c1fb 100644 --- a/service/quicksight/api_op_DescribeDataSourcePermissions.go +++ b/service/quicksight/api_op_DescribeDataSourcePermissions.go @@ -72,6 +72,9 @@ func addOperationDescribeDataSourcePermissionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeDataSourcePermissionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeGroup.go b/service/quicksight/api_op_DescribeGroup.go index 697b30eeaa7..3d9e0a18b3f 100644 --- a/service/quicksight/api_op_DescribeGroup.go +++ b/service/quicksight/api_op_DescribeGroup.go @@ -70,6 +70,9 @@ func addOperationDescribeGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeIAMPolicyAssignment.go b/service/quicksight/api_op_DescribeIAMPolicyAssignment.go index 19865566141..cae6f3b5793 100644 --- a/service/quicksight/api_op_DescribeIAMPolicyAssignment.go +++ b/service/quicksight/api_op_DescribeIAMPolicyAssignment.go @@ -71,6 +71,9 @@ func addOperationDescribeIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeIngestion.go b/service/quicksight/api_op_DescribeIngestion.go index 9224b9cfb69..cfdfc9a9a3d 100644 --- a/service/quicksight/api_op_DescribeIngestion.go +++ b/service/quicksight/api_op_DescribeIngestion.go @@ -69,6 +69,9 @@ func addOperationDescribeIngestionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeIngestionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeNamespace.go b/service/quicksight/api_op_DescribeNamespace.go index aa91c151733..d8a9780b1b0 100644 --- a/service/quicksight/api_op_DescribeNamespace.go +++ b/service/quicksight/api_op_DescribeNamespace.go @@ -69,6 +69,9 @@ func addOperationDescribeNamespaceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeNamespaceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeTemplate.go b/service/quicksight/api_op_DescribeTemplate.go index 2c09b4c5157..53c15ceed16 100644 --- a/service/quicksight/api_op_DescribeTemplate.go +++ b/service/quicksight/api_op_DescribeTemplate.go @@ -74,6 +74,9 @@ func addOperationDescribeTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeTemplateAlias.go b/service/quicksight/api_op_DescribeTemplateAlias.go index 11e2bae7389..aa2444f76db 100644 --- a/service/quicksight/api_op_DescribeTemplateAlias.go +++ b/service/quicksight/api_op_DescribeTemplateAlias.go @@ -73,6 +73,9 @@ func addOperationDescribeTemplateAliasMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeTemplateAliasMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeTemplatePermissions.go b/service/quicksight/api_op_DescribeTemplatePermissions.go index c5611b22f97..ae49f68c3f0 100644 --- a/service/quicksight/api_op_DescribeTemplatePermissions.go +++ b/service/quicksight/api_op_DescribeTemplatePermissions.go @@ -70,6 +70,9 @@ func addOperationDescribeTemplatePermissionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeTemplatePermissionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeTheme.go b/service/quicksight/api_op_DescribeTheme.go index fe82605c3e4..47d6a09458d 100644 --- a/service/quicksight/api_op_DescribeTheme.go +++ b/service/quicksight/api_op_DescribeTheme.go @@ -74,6 +74,9 @@ func addOperationDescribeThemeMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeThemeMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeThemeAlias.go b/service/quicksight/api_op_DescribeThemeAlias.go index 24351ccfa4f..f3b7a4ee0e4 100644 --- a/service/quicksight/api_op_DescribeThemeAlias.go +++ b/service/quicksight/api_op_DescribeThemeAlias.go @@ -69,6 +69,9 @@ func addOperationDescribeThemeAliasMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeThemeAliasMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeThemePermissions.go b/service/quicksight/api_op_DescribeThemePermissions.go index 85fb35e27fb..f0163fd63d2 100644 --- a/service/quicksight/api_op_DescribeThemePermissions.go +++ b/service/quicksight/api_op_DescribeThemePermissions.go @@ -70,6 +70,9 @@ func addOperationDescribeThemePermissionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeThemePermissionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_DescribeUser.go b/service/quicksight/api_op_DescribeUser.go index 588f6b0b02d..11de7102af6 100644 --- a/service/quicksight/api_op_DescribeUser.go +++ b/service/quicksight/api_op_DescribeUser.go @@ -70,6 +70,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_GetDashboardEmbedUrl.go b/service/quicksight/api_op_GetDashboardEmbedUrl.go index d99fea32b67..682fb89ba31 100644 --- a/service/quicksight/api_op_GetDashboardEmbedUrl.go +++ b/service/quicksight/api_op_GetDashboardEmbedUrl.go @@ -121,6 +121,9 @@ func addOperationGetDashboardEmbedUrlMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationGetDashboardEmbedUrlMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_GetSessionEmbedUrl.go b/service/quicksight/api_op_GetSessionEmbedUrl.go index 57c95657b4d..8f03bef2505 100644 --- a/service/quicksight/api_op_GetSessionEmbedUrl.go +++ b/service/quicksight/api_op_GetSessionEmbedUrl.go @@ -119,6 +119,9 @@ func addOperationGetSessionEmbedUrlMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationGetSessionEmbedUrlMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListAnalyses.go b/service/quicksight/api_op_ListAnalyses.go index dc38a995257..0e3caeaa765 100644 --- a/service/quicksight/api_op_ListAnalyses.go +++ b/service/quicksight/api_op_ListAnalyses.go @@ -68,6 +68,9 @@ func addOperationListAnalysesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListAnalysesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListDashboardVersions.go b/service/quicksight/api_op_ListDashboardVersions.go index 767732e3e4e..fbfd5a7dd5e 100644 --- a/service/quicksight/api_op_ListDashboardVersions.go +++ b/service/quicksight/api_op_ListDashboardVersions.go @@ -74,6 +74,9 @@ func addOperationListDashboardVersionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListDashboardVersionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListDashboards.go b/service/quicksight/api_op_ListDashboards.go index 6c2f2a3b2fb..d6674af774a 100644 --- a/service/quicksight/api_op_ListDashboards.go +++ b/service/quicksight/api_op_ListDashboards.go @@ -69,6 +69,9 @@ func addOperationListDashboardsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListDashboardsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListDataSets.go b/service/quicksight/api_op_ListDataSets.go index d87f94bd731..7d2df7b4e9a 100644 --- a/service/quicksight/api_op_ListDataSets.go +++ b/service/quicksight/api_op_ListDataSets.go @@ -69,6 +69,9 @@ func addOperationListDataSetsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListDataSetsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListDataSources.go b/service/quicksight/api_op_ListDataSources.go index a8856928e9a..d971d54be3f 100644 --- a/service/quicksight/api_op_ListDataSources.go +++ b/service/quicksight/api_op_ListDataSources.go @@ -68,6 +68,9 @@ func addOperationListDataSourcesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListDataSourcesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListGroupMemberships.go b/service/quicksight/api_op_ListGroupMemberships.go index 7c42ea9b7c9..362e62dc581 100644 --- a/service/quicksight/api_op_ListGroupMemberships.go +++ b/service/quicksight/api_op_ListGroupMemberships.go @@ -79,6 +79,9 @@ func addOperationListGroupMembershipsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListGroupMembershipsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListGroups.go b/service/quicksight/api_op_ListGroups.go index 0862951cd65..58066cf1b6b 100644 --- a/service/quicksight/api_op_ListGroups.go +++ b/service/quicksight/api_op_ListGroups.go @@ -74,6 +74,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListIAMPolicyAssignments.go b/service/quicksight/api_op_ListIAMPolicyAssignments.go index 79a3d2b1745..d65e8da2293 100644 --- a/service/quicksight/api_op_ListIAMPolicyAssignments.go +++ b/service/quicksight/api_op_ListIAMPolicyAssignments.go @@ -76,6 +76,9 @@ func addOperationListIAMPolicyAssignmentsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListIAMPolicyAssignmentsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go b/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go index 020280615c1..17b10f4cebd 100644 --- a/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go +++ b/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go @@ -80,6 +80,9 @@ func addOperationListIAMPolicyAssignmentsForUserMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListIAMPolicyAssignmentsForUserMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListIngestions.go b/service/quicksight/api_op_ListIngestions.go index 3168057f672..728228700bd 100644 --- a/service/quicksight/api_op_ListIngestions.go +++ b/service/quicksight/api_op_ListIngestions.go @@ -73,6 +73,9 @@ func addOperationListIngestionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListIngestionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListNamespaces.go b/service/quicksight/api_op_ListNamespaces.go index 7ae861b3448..2f0c949e20c 100644 --- a/service/quicksight/api_op_ListNamespaces.go +++ b/service/quicksight/api_op_ListNamespaces.go @@ -71,6 +71,9 @@ func addOperationListNamespacesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListNamespacesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListTagsForResource.go b/service/quicksight/api_op_ListTagsForResource.go index e4a71151ee0..05f649cbd94 100644 --- a/service/quicksight/api_op_ListTagsForResource.go +++ b/service/quicksight/api_op_ListTagsForResource.go @@ -60,6 +60,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListTemplateAliases.go b/service/quicksight/api_op_ListTemplateAliases.go index 7b62d94d032..2009b4cad3f 100644 --- a/service/quicksight/api_op_ListTemplateAliases.go +++ b/service/quicksight/api_op_ListTemplateAliases.go @@ -74,6 +74,9 @@ func addOperationListTemplateAliasesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListTemplateAliasesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListTemplateVersions.go b/service/quicksight/api_op_ListTemplateVersions.go index ec0b9ddb677..d7637420bf4 100644 --- a/service/quicksight/api_op_ListTemplateVersions.go +++ b/service/quicksight/api_op_ListTemplateVersions.go @@ -74,6 +74,9 @@ func addOperationListTemplateVersionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListTemplateVersionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListTemplates.go b/service/quicksight/api_op_ListTemplates.go index ebd52e5260f..c95722f9d9a 100644 --- a/service/quicksight/api_op_ListTemplates.go +++ b/service/quicksight/api_op_ListTemplates.go @@ -68,6 +68,9 @@ func addOperationListTemplatesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTemplatesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListThemeAliases.go b/service/quicksight/api_op_ListThemeAliases.go index 40481823d0e..7db2642c773 100644 --- a/service/quicksight/api_op_ListThemeAliases.go +++ b/service/quicksight/api_op_ListThemeAliases.go @@ -73,6 +73,9 @@ func addOperationListThemeAliasesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListThemeAliasesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListThemeVersions.go b/service/quicksight/api_op_ListThemeVersions.go index 3934bf3edef..af2f5db2a10 100644 --- a/service/quicksight/api_op_ListThemeVersions.go +++ b/service/quicksight/api_op_ListThemeVersions.go @@ -73,6 +73,9 @@ func addOperationListThemeVersionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListThemeVersionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListThemes.go b/service/quicksight/api_op_ListThemes.go index fdfb059b923..be66b726ad5 100644 --- a/service/quicksight/api_op_ListThemes.go +++ b/service/quicksight/api_op_ListThemes.go @@ -80,6 +80,9 @@ func addOperationListThemesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListThemesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListUserGroups.go b/service/quicksight/api_op_ListUserGroups.go index a07531ca0f8..34b6e8f5c17 100644 --- a/service/quicksight/api_op_ListUserGroups.go +++ b/service/quicksight/api_op_ListUserGroups.go @@ -80,6 +80,9 @@ func addOperationListUserGroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListUserGroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_ListUsers.go b/service/quicksight/api_op_ListUsers.go index 0350e0a2240..45117bf49a4 100644 --- a/service/quicksight/api_op_ListUsers.go +++ b/service/quicksight/api_op_ListUsers.go @@ -74,6 +74,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_RegisterUser.go b/service/quicksight/api_op_RegisterUser.go index 5b67c5b1af8..7adb15d9cc8 100644 --- a/service/quicksight/api_op_RegisterUser.go +++ b/service/quicksight/api_op_RegisterUser.go @@ -150,6 +150,9 @@ func addOperationRegisterUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationRegisterUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_RestoreAnalysis.go b/service/quicksight/api_op_RestoreAnalysis.go index e2c00a33771..751db579833 100644 --- a/service/quicksight/api_op_RestoreAnalysis.go +++ b/service/quicksight/api_op_RestoreAnalysis.go @@ -66,6 +66,9 @@ func addOperationRestoreAnalysisMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRestoreAnalysisMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_SearchAnalyses.go b/service/quicksight/api_op_SearchAnalyses.go index c7308dc151a..fa399b2105d 100644 --- a/service/quicksight/api_op_SearchAnalyses.go +++ b/service/quicksight/api_op_SearchAnalyses.go @@ -73,6 +73,9 @@ func addOperationSearchAnalysesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSearchAnalysesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_SearchDashboards.go b/service/quicksight/api_op_SearchDashboards.go index 34d6ed5dc8c..726eb5ed832 100644 --- a/service/quicksight/api_op_SearchDashboards.go +++ b/service/quicksight/api_op_SearchDashboards.go @@ -77,6 +77,9 @@ func addOperationSearchDashboardsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationSearchDashboardsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_TagResource.go b/service/quicksight/api_op_TagResource.go index 949e241fc83..cf99cb4d284 100644 --- a/service/quicksight/api_op_TagResource.go +++ b/service/quicksight/api_op_TagResource.go @@ -80,6 +80,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UntagResource.go b/service/quicksight/api_op_UntagResource.go index 663c8742eba..f451443ea69 100644 --- a/service/quicksight/api_op_UntagResource.go +++ b/service/quicksight/api_op_UntagResource.go @@ -61,6 +61,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateAccountCustomization.go b/service/quicksight/api_op_UpdateAccountCustomization.go index fef65b53bbb..74fea36bce2 100644 --- a/service/quicksight/api_op_UpdateAccountCustomization.go +++ b/service/quicksight/api_op_UpdateAccountCustomization.go @@ -84,6 +84,9 @@ func addOperationUpdateAccountCustomizationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateAccountCustomizationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateAccountSettings.go b/service/quicksight/api_op_UpdateAccountSettings.go index e65f79d4610..773aa23193c 100644 --- a/service/quicksight/api_op_UpdateAccountSettings.go +++ b/service/quicksight/api_op_UpdateAccountSettings.go @@ -68,6 +68,9 @@ func addOperationUpdateAccountSettingsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateAccountSettingsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateAnalysis.go b/service/quicksight/api_op_UpdateAnalysis.go index 49e04df307a..aec62f97c00 100644 --- a/service/quicksight/api_op_UpdateAnalysis.go +++ b/service/quicksight/api_op_UpdateAnalysis.go @@ -93,6 +93,9 @@ func addOperationUpdateAnalysisMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationUpdateAnalysisMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateAnalysisPermissions.go b/service/quicksight/api_op_UpdateAnalysisPermissions.go index a8089a2f22f..7ff68f1e919 100644 --- a/service/quicksight/api_op_UpdateAnalysisPermissions.go +++ b/service/quicksight/api_op_UpdateAnalysisPermissions.go @@ -81,6 +81,9 @@ func addOperationUpdateAnalysisPermissionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdateAnalysisPermissionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDashboard.go b/service/quicksight/api_op_UpdateDashboard.go index 93684b4ac90..e5cca0c5827 100644 --- a/service/quicksight/api_op_UpdateDashboard.go +++ b/service/quicksight/api_op_UpdateDashboard.go @@ -123,6 +123,9 @@ func addOperationUpdateDashboardMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationUpdateDashboardMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDashboardPermissions.go b/service/quicksight/api_op_UpdateDashboardPermissions.go index 86b313bbd92..746f1e671b7 100644 --- a/service/quicksight/api_op_UpdateDashboardPermissions.go +++ b/service/quicksight/api_op_UpdateDashboardPermissions.go @@ -77,6 +77,9 @@ func addOperationUpdateDashboardPermissionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateDashboardPermissionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDashboardPublishedVersion.go b/service/quicksight/api_op_UpdateDashboardPublishedVersion.go index 0e7a44caa3e..ee6f4d141a7 100644 --- a/service/quicksight/api_op_UpdateDashboardPublishedVersion.go +++ b/service/quicksight/api_op_UpdateDashboardPublishedVersion.go @@ -71,6 +71,9 @@ func addOperationUpdateDashboardPublishedVersionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateDashboardPublishedVersionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDataSet.go b/service/quicksight/api_op_UpdateDataSet.go index 3c222b662bd..006a0ca0dc3 100644 --- a/service/quicksight/api_op_UpdateDataSet.go +++ b/service/quicksight/api_op_UpdateDataSet.go @@ -103,6 +103,9 @@ func addOperationUpdateDataSetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationUpdateDataSetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDataSetPermissions.go b/service/quicksight/api_op_UpdateDataSetPermissions.go index 277c3539289..aabd4cdda6a 100644 --- a/service/quicksight/api_op_UpdateDataSetPermissions.go +++ b/service/quicksight/api_op_UpdateDataSetPermissions.go @@ -76,6 +76,9 @@ func addOperationUpdateDataSetPermissionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateDataSetPermissionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDataSource.go b/service/quicksight/api_op_UpdateDataSource.go index 385f8db8f0a..50bce6b9850 100644 --- a/service/quicksight/api_op_UpdateDataSource.go +++ b/service/quicksight/api_op_UpdateDataSource.go @@ -92,6 +92,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateDataSourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateDataSourcePermissions.go b/service/quicksight/api_op_UpdateDataSourcePermissions.go index aa82f406118..3200c168fe9 100644 --- a/service/quicksight/api_op_UpdateDataSourcePermissions.go +++ b/service/quicksight/api_op_UpdateDataSourcePermissions.go @@ -75,6 +75,9 @@ func addOperationUpdateDataSourcePermissionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateDataSourcePermissionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateGroup.go b/service/quicksight/api_op_UpdateGroup.go index 3d71d1caf0c..d7134bd1f68 100644 --- a/service/quicksight/api_op_UpdateGroup.go +++ b/service/quicksight/api_op_UpdateGroup.go @@ -73,6 +73,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateIAMPolicyAssignment.go b/service/quicksight/api_op_UpdateIAMPolicyAssignment.go index b02e1a60196..94317d041e6 100644 --- a/service/quicksight/api_op_UpdateIAMPolicyAssignment.go +++ b/service/quicksight/api_op_UpdateIAMPolicyAssignment.go @@ -113,6 +113,9 @@ func addOperationUpdateIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationUpdateIAMPolicyAssignmentMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateTemplate.go b/service/quicksight/api_op_UpdateTemplate.go index a06e03ed676..bbbeb7a9bfc 100644 --- a/service/quicksight/api_op_UpdateTemplate.go +++ b/service/quicksight/api_op_UpdateTemplate.go @@ -97,6 +97,9 @@ func addOperationUpdateTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationUpdateTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateTemplateAlias.go b/service/quicksight/api_op_UpdateTemplateAlias.go index 9edf9fb2262..cc804ea02b0 100644 --- a/service/quicksight/api_op_UpdateTemplateAlias.go +++ b/service/quicksight/api_op_UpdateTemplateAlias.go @@ -77,6 +77,9 @@ func addOperationUpdateTemplateAliasMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateTemplateAliasMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateTemplatePermissions.go b/service/quicksight/api_op_UpdateTemplatePermissions.go index 07c105224ed..ccc797cf9ab 100644 --- a/service/quicksight/api_op_UpdateTemplatePermissions.go +++ b/service/quicksight/api_op_UpdateTemplatePermissions.go @@ -76,6 +76,9 @@ func addOperationUpdateTemplatePermissionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateTemplatePermissionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateTheme.go b/service/quicksight/api_op_UpdateTheme.go index 46fe94ac65d..d88b5582f83 100644 --- a/service/quicksight/api_op_UpdateTheme.go +++ b/service/quicksight/api_op_UpdateTheme.go @@ -90,6 +90,9 @@ func addOperationUpdateThemeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationUpdateThemeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateThemeAlias.go b/service/quicksight/api_op_UpdateThemeAlias.go index 49f7e43972a..32267d2f132 100644 --- a/service/quicksight/api_op_UpdateThemeAlias.go +++ b/service/quicksight/api_op_UpdateThemeAlias.go @@ -74,6 +74,9 @@ func addOperationUpdateThemeAliasMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateThemeAliasMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateThemePermissions.go b/service/quicksight/api_op_UpdateThemePermissions.go index 6d2f338f9cb..252f98ed10a 100644 --- a/service/quicksight/api_op_UpdateThemePermissions.go +++ b/service/quicksight/api_op_UpdateThemePermissions.go @@ -124,6 +124,9 @@ func addOperationUpdateThemePermissionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateThemePermissionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/api_op_UpdateUser.go b/service/quicksight/api_op_UpdateUser.go index e559d102dd3..9a101db6b8f 100644 --- a/service/quicksight/api_op_UpdateUser.go +++ b/service/quicksight/api_op_UpdateUser.go @@ -124,6 +124,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/quicksight/go.mod b/service/quicksight/go.mod index 44cf37f2175..3b415c4d9a3 100644 --- a/service/quicksight/go.mod +++ b/service/quicksight/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/quicksight go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/quicksight/go.sum b/service/quicksight/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/quicksight/go.sum +++ b/service/quicksight/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ram/api_client.go b/service/ram/api_client.go index e9405f54f02..5bb1af7763b 100644 --- a/service/ram/api_client.go +++ b/service/ram/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ram/api_op_AcceptResourceShareInvitation.go b/service/ram/api_op_AcceptResourceShareInvitation.go index 11fb8f15e9d..1d72273ac79 100644 --- a/service/ram/api_op_AcceptResourceShareInvitation.go +++ b/service/ram/api_op_AcceptResourceShareInvitation.go @@ -61,6 +61,9 @@ func addOperationAcceptResourceShareInvitationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAcceptResourceShareInvitationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_AssociateResourceShare.go b/service/ram/api_op_AssociateResourceShare.go index 550317f6901..76f1848040c 100644 --- a/service/ram/api_op_AssociateResourceShare.go +++ b/service/ram/api_op_AssociateResourceShare.go @@ -68,6 +68,9 @@ func addOperationAssociateResourceShareMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAssociateResourceShareMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_AssociateResourceSharePermission.go b/service/ram/api_op_AssociateResourceSharePermission.go index 00417ff67a0..8e32fe14181 100644 --- a/service/ram/api_op_AssociateResourceSharePermission.go +++ b/service/ram/api_op_AssociateResourceSharePermission.go @@ -70,6 +70,9 @@ func addOperationAssociateResourceSharePermissionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAssociateResourceSharePermissionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_CreateResourceShare.go b/service/ram/api_op_CreateResourceShare.go index 8e7cec931f1..540a9e2ef46 100644 --- a/service/ram/api_op_CreateResourceShare.go +++ b/service/ram/api_op_CreateResourceShare.go @@ -81,6 +81,9 @@ func addOperationCreateResourceShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateResourceShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_DeleteResourceShare.go b/service/ram/api_op_DeleteResourceShare.go index 2f5378471bb..ff0c29533fd 100644 --- a/service/ram/api_op_DeleteResourceShare.go +++ b/service/ram/api_op_DeleteResourceShare.go @@ -60,6 +60,9 @@ func addOperationDeleteResourceShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteResourceShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_DisassociateResourceShare.go b/service/ram/api_op_DisassociateResourceShare.go index 4e5d559da5b..4232273c9b1 100644 --- a/service/ram/api_op_DisassociateResourceShare.go +++ b/service/ram/api_op_DisassociateResourceShare.go @@ -68,6 +68,9 @@ func addOperationDisassociateResourceShareMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDisassociateResourceShareMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_DisassociateResourceSharePermission.go b/service/ram/api_op_DisassociateResourceSharePermission.go index 5d7febbcdcc..5e317c44ffb 100644 --- a/service/ram/api_op_DisassociateResourceSharePermission.go +++ b/service/ram/api_op_DisassociateResourceSharePermission.go @@ -65,6 +65,9 @@ func addOperationDisassociateResourceSharePermissionMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDisassociateResourceSharePermissionMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_EnableSharingWithAwsOrganization.go b/service/ram/api_op_EnableSharingWithAwsOrganization.go index 13d10f273ca..513ff9489c1 100644 --- a/service/ram/api_op_EnableSharingWithAwsOrganization.go +++ b/service/ram/api_op_EnableSharingWithAwsOrganization.go @@ -48,6 +48,9 @@ func addOperationEnableSharingWithAwsOrganizationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationEnableSharingWithAwsOrganizationMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_GetPermission.go b/service/ram/api_op_GetPermission.go index 1a9431dfe7d..a0dce2cbcbd 100644 --- a/service/ram/api_op_GetPermission.go +++ b/service/ram/api_op_GetPermission.go @@ -56,6 +56,9 @@ func addOperationGetPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_GetResourcePolicies.go b/service/ram/api_op_GetResourcePolicies.go index e52bd274736..f3e6e23f789 100644 --- a/service/ram/api_op_GetResourcePolicies.go +++ b/service/ram/api_op_GetResourcePolicies.go @@ -66,6 +66,9 @@ func addOperationGetResourcePoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetResourcePoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_GetResourceShareAssociations.go b/service/ram/api_op_GetResourceShareAssociations.go index 4213c0c4fe2..b12ebfa2c18 100644 --- a/service/ram/api_op_GetResourceShareAssociations.go +++ b/service/ram/api_op_GetResourceShareAssociations.go @@ -80,6 +80,9 @@ func addOperationGetResourceShareAssociationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetResourceShareAssociationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_GetResourceShareInvitations.go b/service/ram/api_op_GetResourceShareInvitations.go index 355235f2280..0a4543494e1 100644 --- a/service/ram/api_op_GetResourceShareInvitations.go +++ b/service/ram/api_op_GetResourceShareInvitations.go @@ -65,6 +65,9 @@ func addOperationGetResourceShareInvitationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetResourceShareInvitationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_GetResourceShares.go b/service/ram/api_op_GetResourceShares.go index f3bdad990d7..7a90129ef37 100644 --- a/service/ram/api_op_GetResourceShares.go +++ b/service/ram/api_op_GetResourceShares.go @@ -77,6 +77,9 @@ func addOperationGetResourceSharesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetResourceSharesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_ListPendingInvitationResources.go b/service/ram/api_op_ListPendingInvitationResources.go index c26b0fca1f5..7a838c73cac 100644 --- a/service/ram/api_op_ListPendingInvitationResources.go +++ b/service/ram/api_op_ListPendingInvitationResources.go @@ -65,6 +65,9 @@ func addOperationListPendingInvitationResourcesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListPendingInvitationResourcesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_ListPermissions.go b/service/ram/api_op_ListPermissions.go index 8c2c4253da5..47ca4124da8 100644 --- a/service/ram/api_op_ListPermissions.go +++ b/service/ram/api_op_ListPermissions.go @@ -63,6 +63,9 @@ func addOperationListPermissionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListPermissionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_ListPrincipals.go b/service/ram/api_op_ListPrincipals.go index 2fadee28cb7..a8f7927a8ef 100644 --- a/service/ram/api_op_ListPrincipals.go +++ b/service/ram/api_op_ListPrincipals.go @@ -82,6 +82,9 @@ func addOperationListPrincipalsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListPrincipalsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_ListResourceSharePermissions.go b/service/ram/api_op_ListResourceSharePermissions.go index fc0c6fc9ed5..43796b1fb22 100644 --- a/service/ram/api_op_ListResourceSharePermissions.go +++ b/service/ram/api_op_ListResourceSharePermissions.go @@ -64,6 +64,9 @@ func addOperationListResourceSharePermissionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListResourceSharePermissionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_ListResourceTypes.go b/service/ram/api_op_ListResourceTypes.go index 24ad5b40bf0..0cf56c82eca 100644 --- a/service/ram/api_op_ListResourceTypes.go +++ b/service/ram/api_op_ListResourceTypes.go @@ -59,6 +59,9 @@ func addOperationListResourceTypesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListResourceTypesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_ListResources.go b/service/ram/api_op_ListResources.go index ca79d2fa2bc..9a838f9d712 100644 --- a/service/ram/api_op_ListResources.go +++ b/service/ram/api_op_ListResources.go @@ -82,6 +82,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go b/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go index 2c939257ffa..3ef56126a88 100644 --- a/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go +++ b/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go @@ -60,6 +60,9 @@ func addOperationPromoteResourceShareCreatedFromPolicyMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPromoteResourceShareCreatedFromPolicyMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_RejectResourceShareInvitation.go b/service/ram/api_op_RejectResourceShareInvitation.go index 4bf35fd24de..5b11aae8882 100644 --- a/service/ram/api_op_RejectResourceShareInvitation.go +++ b/service/ram/api_op_RejectResourceShareInvitation.go @@ -61,6 +61,9 @@ func addOperationRejectResourceShareInvitationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRejectResourceShareInvitationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_TagResource.go b/service/ram/api_op_TagResource.go index 53337390dc3..6371eef4548 100644 --- a/service/ram/api_op_TagResource.go +++ b/service/ram/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_UntagResource.go b/service/ram/api_op_UntagResource.go index 8ae4a769f59..5b385e644c3 100644 --- a/service/ram/api_op_UntagResource.go +++ b/service/ram/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/api_op_UpdateResourceShare.go b/service/ram/api_op_UpdateResourceShare.go index 732171f3d7e..664269b5e86 100644 --- a/service/ram/api_op_UpdateResourceShare.go +++ b/service/ram/api_op_UpdateResourceShare.go @@ -68,6 +68,9 @@ func addOperationUpdateResourceShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationUpdateResourceShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ram/go.mod b/service/ram/go.mod index 8b973b5fd00..93cbda3a548 100644 --- a/service/ram/go.mod +++ b/service/ram/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ram go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ram/go.sum b/service/ram/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ram/go.sum +++ b/service/ram/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/rds/api_client.go b/service/rds/api_client.go index ea11023fd69..885bf6d58fa 100644 --- a/service/rds/api_client.go +++ b/service/rds/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/rds/api_op_AddRoleToDBCluster.go b/service/rds/api_op_AddRoleToDBCluster.go index e358bae672a..503b977c1ce 100644 --- a/service/rds/api_op_AddRoleToDBCluster.go +++ b/service/rds/api_op_AddRoleToDBCluster.go @@ -62,6 +62,9 @@ func addOperationAddRoleToDBClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAddRoleToDBClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_AddRoleToDBInstance.go b/service/rds/api_op_AddRoleToDBInstance.go index 924f33ac0ee..13cad8836c6 100644 --- a/service/rds/api_op_AddRoleToDBInstance.go +++ b/service/rds/api_op_AddRoleToDBInstance.go @@ -61,6 +61,9 @@ func addOperationAddRoleToDBInstanceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAddRoleToDBInstanceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_AddSourceIdentifierToSubscription.go b/service/rds/api_op_AddSourceIdentifierToSubscription.go index dba9005b3f9..2377df64139 100644 --- a/service/rds/api_op_AddSourceIdentifierToSubscription.go +++ b/service/rds/api_op_AddSourceIdentifierToSubscription.go @@ -80,6 +80,9 @@ func addOperationAddSourceIdentifierToSubscriptionMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationAddSourceIdentifierToSubscriptionMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_AddTagsToResource.go b/service/rds/api_op_AddTagsToResource.go index b34091e41f9..dc1712852e7 100644 --- a/service/rds/api_op_AddTagsToResource.go +++ b/service/rds/api_op_AddTagsToResource.go @@ -62,6 +62,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ApplyPendingMaintenanceAction.go b/service/rds/api_op_ApplyPendingMaintenanceAction.go index 779c254c798..e733d78fa65 100644 --- a/service/rds/api_op_ApplyPendingMaintenanceAction.go +++ b/service/rds/api_op_ApplyPendingMaintenanceAction.go @@ -79,6 +79,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationApplyPendingMaintenanceActionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go b/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go index 42e0bdd04d5..de26f91c4ff 100644 --- a/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go +++ b/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go @@ -86,6 +86,9 @@ func addOperationAuthorizeDBSecurityGroupIngressMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationAuthorizeDBSecurityGroupIngressMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_BacktrackDBCluster.go b/service/rds/api_op_BacktrackDBCluster.go index c4a93a4faa4..2d02f0eb94f 100644 --- a/service/rds/api_op_BacktrackDBCluster.go +++ b/service/rds/api_op_BacktrackDBCluster.go @@ -128,6 +128,9 @@ func addOperationBacktrackDBClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationBacktrackDBClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CancelExportTask.go b/service/rds/api_op_CancelExportTask.go index 8b08e631d9e..10d4291ab09 100644 --- a/service/rds/api_op_CancelExportTask.go +++ b/service/rds/api_op_CancelExportTask.go @@ -120,6 +120,9 @@ func addOperationCancelExportTaskMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationCancelExportTaskMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CopyDBClusterParameterGroup.go b/service/rds/api_op_CopyDBClusterParameterGroup.go index 2801a17d659..7c2e0c8460d 100644 --- a/service/rds/api_op_CopyDBClusterParameterGroup.go +++ b/service/rds/api_op_CopyDBClusterParameterGroup.go @@ -99,6 +99,9 @@ func addOperationCopyDBClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCopyDBClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CopyDBClusterSnapshot.go b/service/rds/api_op_CopyDBClusterSnapshot.go index 4efa0c778fd..29fedc93546 100644 --- a/service/rds/api_op_CopyDBClusterSnapshot.go +++ b/service/rds/api_op_CopyDBClusterSnapshot.go @@ -232,6 +232,9 @@ func addOperationCopyDBClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -277,6 +280,9 @@ func addOperationCopyDBClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CopyDBParameterGroup.go b/service/rds/api_op_CopyDBParameterGroup.go index e8095342381..020055e28fa 100644 --- a/service/rds/api_op_CopyDBParameterGroup.go +++ b/service/rds/api_op_CopyDBParameterGroup.go @@ -92,6 +92,9 @@ func addOperationCopyDBParameterGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCopyDBParameterGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CopyDBSnapshot.go b/service/rds/api_op_CopyDBSnapshot.go index df66bb2cfea..a9db750f7ee 100644 --- a/service/rds/api_op_CopyDBSnapshot.go +++ b/service/rds/api_op_CopyDBSnapshot.go @@ -185,6 +185,9 @@ func addOperationCopyDBSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -230,6 +233,9 @@ func addOperationCopyDBSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CopyOptionGroup.go b/service/rds/api_op_CopyOptionGroup.go index 5548ff90a40..036b88ee1a3 100644 --- a/service/rds/api_op_CopyOptionGroup.go +++ b/service/rds/api_op_CopyOptionGroup.go @@ -85,6 +85,9 @@ func addOperationCopyOptionGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCopyOptionGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateCustomAvailabilityZone.go b/service/rds/api_op_CreateCustomAvailabilityZone.go index 99e727f4be3..fdc941b2313 100644 --- a/service/rds/api_op_CreateCustomAvailabilityZone.go +++ b/service/rds/api_op_CreateCustomAvailabilityZone.go @@ -73,6 +73,9 @@ func addOperationCreateCustomAvailabilityZoneMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateCustomAvailabilityZoneMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBCluster.go b/service/rds/api_op_CreateDBCluster.go index e4bf3137bd1..4d2638c8d11 100644 --- a/service/rds/api_op_CreateDBCluster.go +++ b/service/rds/api_op_CreateDBCluster.go @@ -369,6 +369,9 @@ func addOperationCreateDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -414,6 +417,9 @@ func addOperationCreateDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBClusterEndpoint.go b/service/rds/api_op_CreateDBClusterEndpoint.go index b008543408d..0f7b5bbd4d1 100644 --- a/service/rds/api_op_CreateDBClusterEndpoint.go +++ b/service/rds/api_op_CreateDBClusterEndpoint.go @@ -127,6 +127,9 @@ func addOperationCreateDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBClusterParameterGroup.go b/service/rds/api_op_CreateDBClusterParameterGroup.go index b604855db18..ae354d83fb1 100644 --- a/service/rds/api_op_CreateDBClusterParameterGroup.go +++ b/service/rds/api_op_CreateDBClusterParameterGroup.go @@ -102,6 +102,9 @@ func addOperationCreateDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBClusterSnapshot.go b/service/rds/api_op_CreateDBClusterSnapshot.go index 58ad680378f..52cee39626c 100644 --- a/service/rds/api_op_CreateDBClusterSnapshot.go +++ b/service/rds/api_op_CreateDBClusterSnapshot.go @@ -83,6 +83,9 @@ func addOperationCreateDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBInstance.go b/service/rds/api_op_CreateDBInstance.go index 1fa7e264846..98434bcc891 100644 --- a/service/rds/api_op_CreateDBInstance.go +++ b/service/rds/api_op_CreateDBInstance.go @@ -663,6 +663,9 @@ func addOperationCreateDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -705,6 +708,9 @@ func addOperationCreateDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBInstanceReadReplica.go b/service/rds/api_op_CreateDBInstanceReadReplica.go index 9737068f89c..c0059984b7e 100644 --- a/service/rds/api_op_CreateDBInstanceReadReplica.go +++ b/service/rds/api_op_CreateDBInstanceReadReplica.go @@ -379,6 +379,9 @@ func addOperationCreateDBInstanceReadReplicaMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -424,6 +427,9 @@ func addOperationCreateDBInstanceReadReplicaMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBParameterGroup.go b/service/rds/api_op_CreateDBParameterGroup.go index 34b681e6ce4..a1d491291ea 100644 --- a/service/rds/api_op_CreateDBParameterGroup.go +++ b/service/rds/api_op_CreateDBParameterGroup.go @@ -100,6 +100,9 @@ func addOperationCreateDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationCreateDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBProxy.go b/service/rds/api_op_CreateDBProxy.go index dea74eca7a9..59f9cdc83ff 100644 --- a/service/rds/api_op_CreateDBProxy.go +++ b/service/rds/api_op_CreateDBProxy.go @@ -106,6 +106,9 @@ func addOperationCreateDBProxyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationCreateDBProxyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBSecurityGroup.go b/service/rds/api_op_CreateDBSecurityGroup.go index 261a238de85..67ef73a1c4d 100644 --- a/service/rds/api_op_CreateDBSecurityGroup.go +++ b/service/rds/api_op_CreateDBSecurityGroup.go @@ -78,6 +78,9 @@ func addOperationCreateDBSecurityGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateDBSecurityGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBSnapshot.go b/service/rds/api_op_CreateDBSnapshot.go index 524f24052e5..050da837070 100644 --- a/service/rds/api_op_CreateDBSnapshot.go +++ b/service/rds/api_op_CreateDBSnapshot.go @@ -82,6 +82,9 @@ func addOperationCreateDBSnapshotMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateDBSnapshotMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateDBSubnetGroup.go b/service/rds/api_op_CreateDBSubnetGroup.go index 1ab3fb69047..df93280549f 100644 --- a/service/rds/api_op_CreateDBSubnetGroup.go +++ b/service/rds/api_op_CreateDBSubnetGroup.go @@ -71,6 +71,9 @@ func addOperationCreateDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateEventSubscription.go b/service/rds/api_op_CreateEventSubscription.go index 0f37ec232b7..cb96b4c2589 100644 --- a/service/rds/api_op_CreateEventSubscription.go +++ b/service/rds/api_op_CreateEventSubscription.go @@ -131,6 +131,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateGlobalCluster.go b/service/rds/api_op_CreateGlobalCluster.go index 7823a6ed8ad..c07196ea26c 100644 --- a/service/rds/api_op_CreateGlobalCluster.go +++ b/service/rds/api_op_CreateGlobalCluster.go @@ -80,6 +80,9 @@ func addOperationCreateGlobalClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateGlobalClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_CreateOptionGroup.go b/service/rds/api_op_CreateOptionGroup.go index 9cd31f02eef..fd7b328627f 100644 --- a/service/rds/api_op_CreateOptionGroup.go +++ b/service/rds/api_op_CreateOptionGroup.go @@ -84,6 +84,9 @@ func addOperationCreateOptionGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateOptionGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteCustomAvailabilityZone.go b/service/rds/api_op_DeleteCustomAvailabilityZone.go index 86181ce1365..cbf14f42e4f 100644 --- a/service/rds/api_op_DeleteCustomAvailabilityZone.go +++ b/service/rds/api_op_DeleteCustomAvailabilityZone.go @@ -59,6 +59,9 @@ func addOperationDeleteCustomAvailabilityZoneMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteCustomAvailabilityZoneMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBCluster.go b/service/rds/api_op_DeleteDBCluster.go index 2c3dd19c770..c8929cfca66 100644 --- a/service/rds/api_op_DeleteDBCluster.go +++ b/service/rds/api_op_DeleteDBCluster.go @@ -86,6 +86,9 @@ func addOperationDeleteDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDeleteDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBClusterEndpoint.go b/service/rds/api_op_DeleteDBClusterEndpoint.go index 93c404d5681..d989b417f4d 100644 --- a/service/rds/api_op_DeleteDBClusterEndpoint.go +++ b/service/rds/api_op_DeleteDBClusterEndpoint.go @@ -104,6 +104,9 @@ func addOperationDeleteDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDeleteDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBClusterParameterGroup.go b/service/rds/api_op_DeleteDBClusterParameterGroup.go index 7a88dcf6df9..62f03a78d5c 100644 --- a/service/rds/api_op_DeleteDBClusterParameterGroup.go +++ b/service/rds/api_op_DeleteDBClusterParameterGroup.go @@ -61,6 +61,9 @@ func addOperationDeleteDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBClusterSnapshot.go b/service/rds/api_op_DeleteDBClusterSnapshot.go index b67e63777c9..82c66af15fe 100644 --- a/service/rds/api_op_DeleteDBClusterSnapshot.go +++ b/service/rds/api_op_DeleteDBClusterSnapshot.go @@ -61,6 +61,9 @@ func addOperationDeleteDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteDBClusterSnapshotMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBInstance.go b/service/rds/api_op_DeleteDBInstance.go index 9e6cf512b2a..236c9a0338e 100644 --- a/service/rds/api_op_DeleteDBInstance.go +++ b/service/rds/api_op_DeleteDBInstance.go @@ -112,6 +112,9 @@ func addOperationDeleteDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationDeleteDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go b/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go index e3b8968877d..3528bffbe35 100644 --- a/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go +++ b/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go @@ -58,6 +58,9 @@ func addOperationDeleteDBInstanceAutomatedBackupMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteDBInstanceAutomatedBackupMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBParameterGroup.go b/service/rds/api_op_DeleteDBParameterGroup.go index 273e8382ea0..416b725100b 100644 --- a/service/rds/api_op_DeleteDBParameterGroup.go +++ b/service/rds/api_op_DeleteDBParameterGroup.go @@ -58,6 +58,9 @@ func addOperationDeleteDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBProxy.go b/service/rds/api_op_DeleteDBProxy.go index 0ecca10d4b6..0bd8d4221b4 100644 --- a/service/rds/api_op_DeleteDBProxy.go +++ b/service/rds/api_op_DeleteDBProxy.go @@ -53,6 +53,9 @@ func addOperationDeleteDBProxyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteDBProxyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBSecurityGroup.go b/service/rds/api_op_DeleteDBSecurityGroup.go index 337fa5e4b72..e5dc9968630 100644 --- a/service/rds/api_op_DeleteDBSecurityGroup.go +++ b/service/rds/api_op_DeleteDBSecurityGroup.go @@ -61,6 +61,9 @@ func addOperationDeleteDBSecurityGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteDBSecurityGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBSnapshot.go b/service/rds/api_op_DeleteDBSnapshot.go index 964cdd66bd8..9fb4623afdf 100644 --- a/service/rds/api_op_DeleteDBSnapshot.go +++ b/service/rds/api_op_DeleteDBSnapshot.go @@ -57,6 +57,9 @@ func addOperationDeleteDBSnapshotMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDBSnapshotMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteDBSubnetGroup.go b/service/rds/api_op_DeleteDBSubnetGroup.go index a2ba64d6aca..9f961d73aae 100644 --- a/service/rds/api_op_DeleteDBSubnetGroup.go +++ b/service/rds/api_op_DeleteDBSubnetGroup.go @@ -52,6 +52,9 @@ func addOperationDeleteDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteEventSubscription.go b/service/rds/api_op_DeleteEventSubscription.go index d2de917b65e..06f2e4bba98 100644 --- a/service/rds/api_op_DeleteEventSubscription.go +++ b/service/rds/api_op_DeleteEventSubscription.go @@ -55,6 +55,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteGlobalCluster.go b/service/rds/api_op_DeleteGlobalCluster.go index 3aa01b2f7da..33c0c20d756 100644 --- a/service/rds/api_op_DeleteGlobalCluster.go +++ b/service/rds/api_op_DeleteGlobalCluster.go @@ -55,6 +55,9 @@ func addOperationDeleteGlobalClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteGlobalClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteInstallationMedia.go b/service/rds/api_op_DeleteInstallationMedia.go index a4367d50872..5d794cebd3a 100644 --- a/service/rds/api_op_DeleteInstallationMedia.go +++ b/service/rds/api_op_DeleteInstallationMedia.go @@ -78,6 +78,9 @@ func addOperationDeleteInstallationMediaMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteInstallationMediaMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeleteOptionGroup.go b/service/rds/api_op_DeleteOptionGroup.go index 74ef453f5d1..521e19b3737 100644 --- a/service/rds/api_op_DeleteOptionGroup.go +++ b/service/rds/api_op_DeleteOptionGroup.go @@ -50,6 +50,9 @@ func addOperationDeleteOptionGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteOptionGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DeregisterDBProxyTargets.go b/service/rds/api_op_DeregisterDBProxyTargets.go index e1604af6c57..273f91a6ba8 100644 --- a/service/rds/api_op_DeregisterDBProxyTargets.go +++ b/service/rds/api_op_DeregisterDBProxyTargets.go @@ -58,6 +58,9 @@ func addOperationDeregisterDBProxyTargetsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeregisterDBProxyTargetsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeAccountAttributes.go b/service/rds/api_op_DescribeAccountAttributes.go index 23e43282f2e..9cf436895bb 100644 --- a/service/rds/api_op_DescribeAccountAttributes.go +++ b/service/rds/api_op_DescribeAccountAttributes.go @@ -54,6 +54,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeCertificates.go b/service/rds/api_op_DescribeCertificates.go index 8f460d812bd..02e9150eb49 100644 --- a/service/rds/api_op_DescribeCertificates.go +++ b/service/rds/api_op_DescribeCertificates.go @@ -77,6 +77,9 @@ func addOperationDescribeCertificatesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeCertificatesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeCustomAvailabilityZones.go b/service/rds/api_op_DescribeCustomAvailabilityZones.go index bd758fb871f..df24db31691 100644 --- a/service/rds/api_op_DescribeCustomAvailabilityZones.go +++ b/service/rds/api_op_DescribeCustomAvailabilityZones.go @@ -76,6 +76,9 @@ func addOperationDescribeCustomAvailabilityZonesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeCustomAvailabilityZonesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusterBacktracks.go b/service/rds/api_op_DescribeDBClusterBacktracks.go index 3d054815c83..2f1711893e6 100644 --- a/service/rds/api_op_DescribeDBClusterBacktracks.go +++ b/service/rds/api_op_DescribeDBClusterBacktracks.go @@ -121,6 +121,9 @@ func addOperationDescribeDBClusterBacktracksMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationDescribeDBClusterBacktracksMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusterEndpoints.go b/service/rds/api_op_DescribeDBClusterEndpoints.go index 7e49db5422a..0d9681181bb 100644 --- a/service/rds/api_op_DescribeDBClusterEndpoints.go +++ b/service/rds/api_op_DescribeDBClusterEndpoints.go @@ -85,6 +85,9 @@ func addOperationDescribeDBClusterEndpointsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeDBClusterEndpointsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusterParameterGroups.go b/service/rds/api_op_DescribeDBClusterParameterGroups.go index a3672436f60..f84dc99feff 100644 --- a/service/rds/api_op_DescribeDBClusterParameterGroups.go +++ b/service/rds/api_op_DescribeDBClusterParameterGroups.go @@ -83,6 +83,9 @@ func addOperationDescribeDBClusterParameterGroupsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeDBClusterParameterGroupsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusterParameters.go b/service/rds/api_op_DescribeDBClusterParameters.go index 3ef0953637f..a73045aa160 100644 --- a/service/rds/api_op_DescribeDBClusterParameters.go +++ b/service/rds/api_op_DescribeDBClusterParameters.go @@ -86,6 +86,9 @@ func addOperationDescribeDBClusterParametersMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeDBClusterParametersMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go b/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go index b287bab68ed..098aa2cfebc 100644 --- a/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go +++ b/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go @@ -67,6 +67,9 @@ func addOperationDescribeDBClusterSnapshotAttributesMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeDBClusterSnapshotAttributesMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusterSnapshots.go b/service/rds/api_op_DescribeDBClusterSnapshots.go index 87c151f8bfd..56c7b66371c 100644 --- a/service/rds/api_op_DescribeDBClusterSnapshots.go +++ b/service/rds/api_op_DescribeDBClusterSnapshots.go @@ -143,6 +143,9 @@ func addOperationDescribeDBClusterSnapshotsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -185,6 +188,9 @@ func addOperationDescribeDBClusterSnapshotsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBClusters.go b/service/rds/api_op_DescribeDBClusters.go index 659d35a6244..397080eb6d2 100644 --- a/service/rds/api_op_DescribeDBClusters.go +++ b/service/rds/api_op_DescribeDBClusters.go @@ -88,6 +88,9 @@ func addOperationDescribeDBClustersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeDBClustersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBEngineVersions.go b/service/rds/api_op_DescribeDBEngineVersions.go index d18b7a8be12..435eea58454 100644 --- a/service/rds/api_op_DescribeDBEngineVersions.go +++ b/service/rds/api_op_DescribeDBEngineVersions.go @@ -101,6 +101,9 @@ func addOperationDescribeDBEngineVersionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeDBEngineVersionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go b/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go index fbf063f6fd5..eb11ea070e8 100644 --- a/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go +++ b/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go @@ -108,6 +108,9 @@ func addOperationDescribeDBInstanceAutomatedBackupsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeDBInstanceAutomatedBackupsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBInstances.go b/service/rds/api_op_DescribeDBInstances.go index 7d062728384..b9325754ab9 100644 --- a/service/rds/api_op_DescribeDBInstances.go +++ b/service/rds/api_op_DescribeDBInstances.go @@ -102,6 +102,9 @@ func addOperationDescribeDBInstancesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationDescribeDBInstancesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBLogFiles.go b/service/rds/api_op_DescribeDBLogFiles.go index a0854751e3b..f799b4fd1cc 100644 --- a/service/rds/api_op_DescribeDBLogFiles.go +++ b/service/rds/api_op_DescribeDBLogFiles.go @@ -86,6 +86,9 @@ func addOperationDescribeDBLogFilesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeDBLogFilesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBParameterGroups.go b/service/rds/api_op_DescribeDBParameterGroups.go index 372fea701ba..7f0b4601d4c 100644 --- a/service/rds/api_op_DescribeDBParameterGroups.go +++ b/service/rds/api_op_DescribeDBParameterGroups.go @@ -78,6 +78,9 @@ func addOperationDescribeDBParameterGroupsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeDBParameterGroupsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBParameters.go b/service/rds/api_op_DescribeDBParameters.go index f629c36bdbb..e79eef71955 100644 --- a/service/rds/api_op_DescribeDBParameters.go +++ b/service/rds/api_op_DescribeDBParameters.go @@ -81,6 +81,9 @@ func addOperationDescribeDBParametersMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeDBParametersMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBProxies.go b/service/rds/api_op_DescribeDBProxies.go index 2a478467c0c..15941f74a81 100644 --- a/service/rds/api_op_DescribeDBProxies.go +++ b/service/rds/api_op_DescribeDBProxies.go @@ -70,6 +70,9 @@ func addOperationDescribeDBProxiesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeDBProxiesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBProxyTargetGroups.go b/service/rds/api_op_DescribeDBProxyTargetGroups.go index 10539b4bd97..056e4ad94a7 100644 --- a/service/rds/api_op_DescribeDBProxyTargetGroups.go +++ b/service/rds/api_op_DescribeDBProxyTargetGroups.go @@ -77,6 +77,9 @@ func addOperationDescribeDBProxyTargetGroupsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeDBProxyTargetGroupsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBProxyTargets.go b/service/rds/api_op_DescribeDBProxyTargets.go index 32cac3db737..f2ef0ab06b6 100644 --- a/service/rds/api_op_DescribeDBProxyTargets.go +++ b/service/rds/api_op_DescribeDBProxyTargets.go @@ -76,6 +76,9 @@ func addOperationDescribeDBProxyTargetsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeDBProxyTargetsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBSecurityGroups.go b/service/rds/api_op_DescribeDBSecurityGroups.go index a08a9929842..478be788ef1 100644 --- a/service/rds/api_op_DescribeDBSecurityGroups.go +++ b/service/rds/api_op_DescribeDBSecurityGroups.go @@ -75,6 +75,9 @@ func addOperationDescribeDBSecurityGroupsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeDBSecurityGroupsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBSnapshotAttributes.go b/service/rds/api_op_DescribeDBSnapshotAttributes.go index a0571c40445..70f2dd2a7ef 100644 --- a/service/rds/api_op_DescribeDBSnapshotAttributes.go +++ b/service/rds/api_op_DescribeDBSnapshotAttributes.go @@ -65,6 +65,9 @@ func addOperationDescribeDBSnapshotAttributesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeDBSnapshotAttributesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBSnapshots.go b/service/rds/api_op_DescribeDBSnapshots.go index d2b35d5fa80..4aee3087886 100644 --- a/service/rds/api_op_DescribeDBSnapshots.go +++ b/service/rds/api_op_DescribeDBSnapshots.go @@ -152,6 +152,9 @@ func addOperationDescribeDBSnapshotsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationDescribeDBSnapshotsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeDBSubnetGroups.go b/service/rds/api_op_DescribeDBSubnetGroups.go index c12b57a6d49..bdf811da758 100644 --- a/service/rds/api_op_DescribeDBSubnetGroups.go +++ b/service/rds/api_op_DescribeDBSubnetGroups.go @@ -76,6 +76,9 @@ func addOperationDescribeDBSubnetGroupsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeDBSubnetGroupsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeEngineDefaultClusterParameters.go b/service/rds/api_op_DescribeEngineDefaultClusterParameters.go index 405853ab695..74db04c180e 100644 --- a/service/rds/api_op_DescribeEngineDefaultClusterParameters.go +++ b/service/rds/api_op_DescribeEngineDefaultClusterParameters.go @@ -75,6 +75,9 @@ func addOperationDescribeEngineDefaultClusterParametersMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeEngineDefaultClusterParametersMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeEngineDefaultParameters.go b/service/rds/api_op_DescribeEngineDefaultParameters.go index a3c459a008c..92e2f140063 100644 --- a/service/rds/api_op_DescribeEngineDefaultParameters.go +++ b/service/rds/api_op_DescribeEngineDefaultParameters.go @@ -71,6 +71,9 @@ func addOperationDescribeEngineDefaultParametersMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeEngineDefaultParametersMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeEventCategories.go b/service/rds/api_op_DescribeEventCategories.go index e686e20a102..90facb8e3b3 100644 --- a/service/rds/api_op_DescribeEventCategories.go +++ b/service/rds/api_op_DescribeEventCategories.go @@ -62,6 +62,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeEventSubscriptions.go b/service/rds/api_op_DescribeEventSubscriptions.go index d9e348e1d87..58077516c0e 100644 --- a/service/rds/api_op_DescribeEventSubscriptions.go +++ b/service/rds/api_op_DescribeEventSubscriptions.go @@ -77,6 +77,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeEvents.go b/service/rds/api_op_DescribeEvents.go index 2cd4101903f..ec31909db69 100644 --- a/service/rds/api_op_DescribeEvents.go +++ b/service/rds/api_op_DescribeEvents.go @@ -125,6 +125,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeExportTasks.go b/service/rds/api_op_DescribeExportTasks.go index 3bedd42df37..f34c4982371 100644 --- a/service/rds/api_op_DescribeExportTasks.go +++ b/service/rds/api_op_DescribeExportTasks.go @@ -89,6 +89,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeExportTasksMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeGlobalClusters.go b/service/rds/api_op_DescribeGlobalClusters.go index a6089e4a7f8..a3541ea9228 100644 --- a/service/rds/api_op_DescribeGlobalClusters.go +++ b/service/rds/api_op_DescribeGlobalClusters.go @@ -83,6 +83,9 @@ func addOperationDescribeGlobalClustersMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeGlobalClustersMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeInstallationMedia.go b/service/rds/api_op_DescribeInstallationMedia.go index 3dbd698338a..172ee486c1e 100644 --- a/service/rds/api_op_DescribeInstallationMedia.go +++ b/service/rds/api_op_DescribeInstallationMedia.go @@ -80,6 +80,9 @@ func addOperationDescribeInstallationMediaMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeInstallationMediaMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeOptionGroupOptions.go b/service/rds/api_op_DescribeOptionGroupOptions.go index 290664199a5..7142748ff89 100644 --- a/service/rds/api_op_DescribeOptionGroupOptions.go +++ b/service/rds/api_op_DescribeOptionGroupOptions.go @@ -78,6 +78,9 @@ func addOperationDescribeOptionGroupOptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeOptionGroupOptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeOptionGroups.go b/service/rds/api_op_DescribeOptionGroups.go index 0c62d49e8ed..5d054577c6d 100644 --- a/service/rds/api_op_DescribeOptionGroups.go +++ b/service/rds/api_op_DescribeOptionGroups.go @@ -82,6 +82,9 @@ func addOperationDescribeOptionGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDescribeOptionGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeOrderableDBInstanceOptions.go b/service/rds/api_op_DescribeOrderableDBInstanceOptions.go index 5073afc03c0..038e515f6ba 100644 --- a/service/rds/api_op_DescribeOrderableDBInstanceOptions.go +++ b/service/rds/api_op_DescribeOrderableDBInstanceOptions.go @@ -97,6 +97,9 @@ func addOperationDescribeOrderableDBInstanceOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeOrderableDBInstanceOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribePendingMaintenanceActions.go b/service/rds/api_op_DescribePendingMaintenanceActions.go index b4dcb340ac7..74977e79824 100644 --- a/service/rds/api_op_DescribePendingMaintenanceActions.go +++ b/service/rds/api_op_DescribePendingMaintenanceActions.go @@ -85,6 +85,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribePendingMaintenanceActionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeReservedDBInstances.go b/service/rds/api_op_DescribeReservedDBInstances.go index 145574dce57..bddce01fc68 100644 --- a/service/rds/api_op_DescribeReservedDBInstances.go +++ b/service/rds/api_op_DescribeReservedDBInstances.go @@ -106,6 +106,9 @@ func addOperationDescribeReservedDBInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationDescribeReservedDBInstancesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeReservedDBInstancesOfferings.go b/service/rds/api_op_DescribeReservedDBInstancesOfferings.go index 1b72cdd5082..236d02d47ca 100644 --- a/service/rds/api_op_DescribeReservedDBInstancesOfferings.go +++ b/service/rds/api_op_DescribeReservedDBInstancesOfferings.go @@ -98,6 +98,9 @@ func addOperationDescribeReservedDBInstancesOfferingsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeReservedDBInstancesOfferingsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeSourceRegions.go b/service/rds/api_op_DescribeSourceRegions.go index 9bfe1a88c1b..5ccc1ff072b 100644 --- a/service/rds/api_op_DescribeSourceRegions.go +++ b/service/rds/api_op_DescribeSourceRegions.go @@ -78,6 +78,9 @@ func addOperationDescribeSourceRegionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeSourceRegionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DescribeValidDBInstanceModifications.go b/service/rds/api_op_DescribeValidDBInstanceModifications.go index 5e5d1a330c4..810528efa77 100644 --- a/service/rds/api_op_DescribeValidDBInstanceModifications.go +++ b/service/rds/api_op_DescribeValidDBInstanceModifications.go @@ -59,6 +59,9 @@ func addOperationDescribeValidDBInstanceModificationsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeValidDBInstanceModificationsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_DownloadDBLogFilePortion.go b/service/rds/api_op_DownloadDBLogFilePortion.go index a38f30e4f2b..5be517124b9 100644 --- a/service/rds/api_op_DownloadDBLogFilePortion.go +++ b/service/rds/api_op_DownloadDBLogFilePortion.go @@ -99,6 +99,9 @@ func addOperationDownloadDBLogFilePortionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDownloadDBLogFilePortionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_FailoverDBCluster.go b/service/rds/api_op_FailoverDBCluster.go index 7d4c29afc14..475896ef292 100644 --- a/service/rds/api_op_FailoverDBCluster.go +++ b/service/rds/api_op_FailoverDBCluster.go @@ -75,6 +75,9 @@ func addOperationFailoverDBClusterMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationFailoverDBClusterMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ImportInstallationMedia.go b/service/rds/api_op_ImportInstallationMedia.go index 155fa5eb85f..e273b25da1e 100644 --- a/service/rds/api_op_ImportInstallationMedia.go +++ b/service/rds/api_op_ImportInstallationMedia.go @@ -119,6 +119,9 @@ func addOperationImportInstallationMediaMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationImportInstallationMediaMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ListTagsForResource.go b/service/rds/api_op_ListTagsForResource.go index 236d00a2c45..1f06d60fc6d 100644 --- a/service/rds/api_op_ListTagsForResource.go +++ b/service/rds/api_op_ListTagsForResource.go @@ -65,6 +65,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyCertificates.go b/service/rds/api_op_ModifyCertificates.go index f0796cb41e0..a06185b0926 100644 --- a/service/rds/api_op_ModifyCertificates.go +++ b/service/rds/api_op_ModifyCertificates.go @@ -83,6 +83,9 @@ func addOperationModifyCertificatesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationModifyCertificatesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyCurrentDBClusterCapacity.go b/service/rds/api_op_ModifyCurrentDBClusterCapacity.go index f2a190cccaf..4db3c230d16 100644 --- a/service/rds/api_op_ModifyCurrentDBClusterCapacity.go +++ b/service/rds/api_op_ModifyCurrentDBClusterCapacity.go @@ -109,6 +109,9 @@ func addOperationModifyCurrentDBClusterCapacityMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationModifyCurrentDBClusterCapacityMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBCluster.go b/service/rds/api_op_ModifyDBCluster.go index 9fad31dab37..d5104fd1d07 100644 --- a/service/rds/api_op_ModifyDBCluster.go +++ b/service/rds/api_op_ModifyDBCluster.go @@ -245,6 +245,9 @@ func addOperationModifyDBClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -287,6 +290,9 @@ func addOperationModifyDBClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBClusterEndpoint.go b/service/rds/api_op_ModifyDBClusterEndpoint.go index 82be041324d..e6b83430b2f 100644 --- a/service/rds/api_op_ModifyDBClusterEndpoint.go +++ b/service/rds/api_op_ModifyDBClusterEndpoint.go @@ -115,6 +115,9 @@ func addOperationModifyDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationModifyDBClusterEndpointMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBClusterParameterGroup.go b/service/rds/api_op_ModifyDBClusterParameterGroup.go index b2799dc22f1..ed6af701899 100644 --- a/service/rds/api_op_ModifyDBClusterParameterGroup.go +++ b/service/rds/api_op_ModifyDBClusterParameterGroup.go @@ -93,6 +93,9 @@ func addOperationModifyDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationModifyDBClusterParameterGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go b/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go index 31389319841..2609fdd9bbb 100644 --- a/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go +++ b/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go @@ -98,6 +98,9 @@ func addOperationModifyDBClusterSnapshotAttributeMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationModifyDBClusterSnapshotAttributeMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBInstance.go b/service/rds/api_op_ModifyDBInstance.go index 36fb3014c54..8c2ddb1a628 100644 --- a/service/rds/api_op_ModifyDBInstance.go +++ b/service/rds/api_op_ModifyDBInstance.go @@ -469,6 +469,9 @@ func addOperationModifyDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -511,6 +514,9 @@ func addOperationModifyDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBParameterGroup.go b/service/rds/api_op_ModifyDBParameterGroup.go index c1e07166b0c..a3c04ce8fc3 100644 --- a/service/rds/api_op_ModifyDBParameterGroup.go +++ b/service/rds/api_op_ModifyDBParameterGroup.go @@ -85,6 +85,9 @@ func addOperationModifyDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationModifyDBParameterGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBProxy.go b/service/rds/api_op_ModifyDBProxy.go index f16c941ec60..d1a59facb97 100644 --- a/service/rds/api_op_ModifyDBProxy.go +++ b/service/rds/api_op_ModifyDBProxy.go @@ -87,6 +87,9 @@ func addOperationModifyDBProxyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationModifyDBProxyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBProxyTargetGroup.go b/service/rds/api_op_ModifyDBProxyTargetGroup.go index e005ebcac9e..ec31e47ed5f 100644 --- a/service/rds/api_op_ModifyDBProxyTargetGroup.go +++ b/service/rds/api_op_ModifyDBProxyTargetGroup.go @@ -67,6 +67,9 @@ func addOperationModifyDBProxyTargetGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationModifyDBProxyTargetGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBSnapshot.go b/service/rds/api_op_ModifyDBSnapshot.go index 6c841cd2877..a3778079d95 100644 --- a/service/rds/api_op_ModifyDBSnapshot.go +++ b/service/rds/api_op_ModifyDBSnapshot.go @@ -86,6 +86,9 @@ func addOperationModifyDBSnapshotMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationModifyDBSnapshotMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBSnapshotAttribute.go b/service/rds/api_op_ModifyDBSnapshotAttribute.go index afa2b05c6fe..0419cc57d2f 100644 --- a/service/rds/api_op_ModifyDBSnapshotAttribute.go +++ b/service/rds/api_op_ModifyDBSnapshotAttribute.go @@ -94,6 +94,9 @@ func addOperationModifyDBSnapshotAttributeMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationModifyDBSnapshotAttributeMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyDBSubnetGroup.go b/service/rds/api_op_ModifyDBSubnetGroup.go index 98d378f97ee..9b068e35491 100644 --- a/service/rds/api_op_ModifyDBSubnetGroup.go +++ b/service/rds/api_op_ModifyDBSubnetGroup.go @@ -66,6 +66,9 @@ func addOperationModifyDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationModifyDBSubnetGroupMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyEventSubscription.go b/service/rds/api_op_ModifyEventSubscription.go index 8c907e7af01..8256b8706e6 100644 --- a/service/rds/api_op_ModifyEventSubscription.go +++ b/service/rds/api_op_ModifyEventSubscription.go @@ -81,6 +81,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyGlobalCluster.go b/service/rds/api_op_ModifyGlobalCluster.go index c73d52d06a0..f66f4cd3227 100644 --- a/service/rds/api_op_ModifyGlobalCluster.go +++ b/service/rds/api_op_ModifyGlobalCluster.go @@ -79,6 +79,9 @@ func addOperationModifyGlobalClusterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationModifyGlobalClusterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ModifyOptionGroup.go b/service/rds/api_op_ModifyOptionGroup.go index c94aead7a0b..1a7f1edd8b4 100644 --- a/service/rds/api_op_ModifyOptionGroup.go +++ b/service/rds/api_op_ModifyOptionGroup.go @@ -68,6 +68,9 @@ func addOperationModifyOptionGroupMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationModifyOptionGroupMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_PromoteReadReplica.go b/service/rds/api_op_PromoteReadReplica.go index 5d1c75d6ec0..ce245e75b66 100644 --- a/service/rds/api_op_PromoteReadReplica.go +++ b/service/rds/api_op_PromoteReadReplica.go @@ -102,6 +102,9 @@ func addOperationPromoteReadReplicaMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationPromoteReadReplicaMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_PromoteReadReplicaDBCluster.go b/service/rds/api_op_PromoteReadReplicaDBCluster.go index 6fa50fc97a7..cd5a2a8ed63 100644 --- a/service/rds/api_op_PromoteReadReplicaDBCluster.go +++ b/service/rds/api_op_PromoteReadReplicaDBCluster.go @@ -63,6 +63,9 @@ func addOperationPromoteReadReplicaDBClusterMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPromoteReadReplicaDBClusterMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_PurchaseReservedDBInstancesOffering.go b/service/rds/api_op_PurchaseReservedDBInstancesOffering.go index 1d67b096193..481184a1e13 100644 --- a/service/rds/api_op_PurchaseReservedDBInstancesOffering.go +++ b/service/rds/api_op_PurchaseReservedDBInstancesOffering.go @@ -68,6 +68,9 @@ func addOperationPurchaseReservedDBInstancesOfferingMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationPurchaseReservedDBInstancesOfferingMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RebootDBInstance.go b/service/rds/api_op_RebootDBInstance.go index 64a1f52057c..82bbc6ac928 100644 --- a/service/rds/api_op_RebootDBInstance.go +++ b/service/rds/api_op_RebootDBInstance.go @@ -71,6 +71,9 @@ func addOperationRebootDBInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationRebootDBInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RegisterDBProxyTargets.go b/service/rds/api_op_RegisterDBProxyTargets.go index 2991fbe8e4c..e2acd1ecf3d 100644 --- a/service/rds/api_op_RegisterDBProxyTargets.go +++ b/service/rds/api_op_RegisterDBProxyTargets.go @@ -63,6 +63,9 @@ func addOperationRegisterDBProxyTargetsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRegisterDBProxyTargetsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RemoveFromGlobalCluster.go b/service/rds/api_op_RemoveFromGlobalCluster.go index f96489f696b..32565a30061 100644 --- a/service/rds/api_op_RemoveFromGlobalCluster.go +++ b/service/rds/api_op_RemoveFromGlobalCluster.go @@ -58,6 +58,9 @@ func addOperationRemoveFromGlobalClusterMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRemoveFromGlobalClusterMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RemoveRoleFromDBCluster.go b/service/rds/api_op_RemoveRoleFromDBCluster.go index 01db47830ed..659e0c50c0b 100644 --- a/service/rds/api_op_RemoveRoleFromDBCluster.go +++ b/service/rds/api_op_RemoveRoleFromDBCluster.go @@ -63,6 +63,9 @@ func addOperationRemoveRoleFromDBClusterMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRemoveRoleFromDBClusterMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RemoveRoleFromDBInstance.go b/service/rds/api_op_RemoveRoleFromDBInstance.go index 4b87032a9f5..3c5007590a2 100644 --- a/service/rds/api_op_RemoveRoleFromDBInstance.go +++ b/service/rds/api_op_RemoveRoleFromDBInstance.go @@ -62,6 +62,9 @@ func addOperationRemoveRoleFromDBInstanceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationRemoveRoleFromDBInstanceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go b/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go index ce5edf371fc..e11066acc4b 100644 --- a/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go +++ b/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go @@ -63,6 +63,9 @@ func addOperationRemoveSourceIdentifierFromSubscriptionMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationRemoveSourceIdentifierFromSubscriptionMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RemoveTagsFromResource.go b/service/rds/api_op_RemoveTagsFromResource.go index 6bae67d1eb3..c5bc8bbc584 100644 --- a/service/rds/api_op_RemoveTagsFromResource.go +++ b/service/rds/api_op_RemoveTagsFromResource.go @@ -61,6 +61,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ResetDBClusterParameterGroup.go b/service/rds/api_op_ResetDBClusterParameterGroup.go index e9cdbcba148..4dd12e7ad19 100644 --- a/service/rds/api_op_ResetDBClusterParameterGroup.go +++ b/service/rds/api_op_ResetDBClusterParameterGroup.go @@ -88,6 +88,9 @@ func addOperationResetDBClusterParameterGroupMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationResetDBClusterParameterGroupMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_ResetDBParameterGroup.go b/service/rds/api_op_ResetDBParameterGroup.go index 7a87bcb11a6..a161e87b569 100644 --- a/service/rds/api_op_ResetDBParameterGroup.go +++ b/service/rds/api_op_ResetDBParameterGroup.go @@ -83,6 +83,9 @@ func addOperationResetDBParameterGroupMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationResetDBParameterGroupMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RestoreDBClusterFromS3.go b/service/rds/api_op_RestoreDBClusterFromS3.go index fc1876f49e7..2bc01b09507 100644 --- a/service/rds/api_op_RestoreDBClusterFromS3.go +++ b/service/rds/api_op_RestoreDBClusterFromS3.go @@ -286,6 +286,9 @@ func addOperationRestoreDBClusterFromS3Middlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -328,6 +331,9 @@ func addOperationRestoreDBClusterFromS3Middlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RestoreDBClusterFromSnapshot.go b/service/rds/api_op_RestoreDBClusterFromSnapshot.go index 0a0d7a6f9ee..aee45794cc2 100644 --- a/service/rds/api_op_RestoreDBClusterFromSnapshot.go +++ b/service/rds/api_op_RestoreDBClusterFromSnapshot.go @@ -222,6 +222,9 @@ func addOperationRestoreDBClusterFromSnapshotMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -264,6 +267,9 @@ func addOperationRestoreDBClusterFromSnapshotMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RestoreDBClusterToPointInTime.go b/service/rds/api_op_RestoreDBClusterToPointInTime.go index defede630c2..ea53d929e11 100644 --- a/service/rds/api_op_RestoreDBClusterToPointInTime.go +++ b/service/rds/api_op_RestoreDBClusterToPointInTime.go @@ -225,6 +225,9 @@ func addOperationRestoreDBClusterToPointInTimeMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -267,6 +270,9 @@ func addOperationRestoreDBClusterToPointInTimeMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go b/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go index 0d5a2dd733d..32402a26bfb 100644 --- a/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go +++ b/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go @@ -277,6 +277,9 @@ func addOperationRestoreDBInstanceFromDBSnapshotMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -319,6 +322,9 @@ func addOperationRestoreDBInstanceFromDBSnapshotMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RestoreDBInstanceFromS3.go b/service/rds/api_op_RestoreDBInstanceFromS3.go index 2c7de00be6d..639fb49bb83 100644 --- a/service/rds/api_op_RestoreDBInstanceFromS3.go +++ b/service/rds/api_op_RestoreDBInstanceFromS3.go @@ -346,6 +346,9 @@ func addOperationRestoreDBInstanceFromS3Middlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -388,6 +391,9 @@ func addOperationRestoreDBInstanceFromS3Middlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RestoreDBInstanceToPointInTime.go b/service/rds/api_op_RestoreDBInstanceToPointInTime.go index fac82bbec0a..e6c86d17e10 100644 --- a/service/rds/api_op_RestoreDBInstanceToPointInTime.go +++ b/service/rds/api_op_RestoreDBInstanceToPointInTime.go @@ -279,6 +279,9 @@ func addOperationRestoreDBInstanceToPointInTimeMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -321,6 +324,9 @@ func addOperationRestoreDBInstanceToPointInTimeMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_RevokeDBSecurityGroupIngress.go b/service/rds/api_op_RevokeDBSecurityGroupIngress.go index 68a4cd07825..f53720c3129 100644 --- a/service/rds/api_op_RevokeDBSecurityGroupIngress.go +++ b/service/rds/api_op_RevokeDBSecurityGroupIngress.go @@ -80,6 +80,9 @@ func addOperationRevokeDBSecurityGroupIngressMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationRevokeDBSecurityGroupIngressMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StartActivityStream.go b/service/rds/api_op_StartActivityStream.go index 5bce56c051e..b44e22e1728 100644 --- a/service/rds/api_op_StartActivityStream.go +++ b/service/rds/api_op_StartActivityStream.go @@ -89,6 +89,9 @@ func addOperationStartActivityStreamMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationStartActivityStreamMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StartDBCluster.go b/service/rds/api_op_StartDBCluster.go index 91f95467731..61cc9f15feb 100644 --- a/service/rds/api_op_StartDBCluster.go +++ b/service/rds/api_op_StartDBCluster.go @@ -62,6 +62,9 @@ func addOperationStartDBClusterMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationStartDBClusterMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StartDBInstance.go b/service/rds/api_op_StartDBInstance.go index a989e4f7927..d20d223f534 100644 --- a/service/rds/api_op_StartDBInstance.go +++ b/service/rds/api_op_StartDBInstance.go @@ -61,6 +61,9 @@ func addOperationStartDBInstanceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationStartDBInstanceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StartExportTask.go b/service/rds/api_op_StartExportTask.go index 918ea574bf4..9ce1490b982 100644 --- a/service/rds/api_op_StartExportTask.go +++ b/service/rds/api_op_StartExportTask.go @@ -192,6 +192,9 @@ func addOperationStartExportTaskMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -234,6 +237,9 @@ func addOperationStartExportTaskMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StopActivityStream.go b/service/rds/api_op_StopActivityStream.go index c28ecd1e579..829a5139879 100644 --- a/service/rds/api_op_StopActivityStream.go +++ b/service/rds/api_op_StopActivityStream.go @@ -70,6 +70,9 @@ func addOperationStopActivityStreamMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationStopActivityStreamMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StopDBCluster.go b/service/rds/api_op_StopDBCluster.go index 10c82c7f4f5..b86a877fe9b 100644 --- a/service/rds/api_op_StopDBCluster.go +++ b/service/rds/api_op_StopDBCluster.go @@ -63,6 +63,9 @@ func addOperationStopDBClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopDBClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/api_op_StopDBInstance.go b/service/rds/api_op_StopDBInstance.go index 5ba7910b72c..541fe1edad8 100644 --- a/service/rds/api_op_StopDBInstance.go +++ b/service/rds/api_op_StopDBInstance.go @@ -67,6 +67,9 @@ func addOperationStopDBInstanceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationStopDBInstanceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rds/go.mod b/service/rds/go.mod index 2a044563eb6..9e53b5dc9a7 100644 --- a/service/rds/go.mod +++ b/service/rds/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v0.1.0 - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rds/go.sum b/service/rds/go.sum index 3555b0e4bad..8a4986a5fc4 100644 --- a/service/rds/go.sum +++ b/service/rds/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/rdsdata/api_client.go b/service/rdsdata/api_client.go index eb9d6786176..d6b16854d07 100644 --- a/service/rdsdata/api_client.go +++ b/service/rdsdata/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/rdsdata/api_op_BatchExecuteStatement.go b/service/rdsdata/api_op_BatchExecuteStatement.go index 1e0aa45a308..4adb9744c5f 100644 --- a/service/rdsdata/api_op_BatchExecuteStatement.go +++ b/service/rdsdata/api_op_BatchExecuteStatement.go @@ -97,6 +97,9 @@ func addOperationBatchExecuteStatementMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationBatchExecuteStatementMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rdsdata/api_op_BeginTransaction.go b/service/rdsdata/api_op_BeginTransaction.go index 8e691806aea..3f09cdda5ee 100644 --- a/service/rdsdata/api_op_BeginTransaction.go +++ b/service/rdsdata/api_op_BeginTransaction.go @@ -73,6 +73,9 @@ func addOperationBeginTransactionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationBeginTransactionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rdsdata/api_op_CommitTransaction.go b/service/rdsdata/api_op_CommitTransaction.go index e0c06ab5bf7..2135d0d0d71 100644 --- a/service/rdsdata/api_op_CommitTransaction.go +++ b/service/rdsdata/api_op_CommitTransaction.go @@ -65,6 +65,9 @@ func addOperationCommitTransactionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCommitTransactionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rdsdata/api_op_ExecuteSql.go b/service/rdsdata/api_op_ExecuteSql.go index 2d5be5570cf..70d77922bd2 100644 --- a/service/rdsdata/api_op_ExecuteSql.go +++ b/service/rdsdata/api_op_ExecuteSql.go @@ -77,6 +77,9 @@ func addOperationExecuteSqlMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationExecuteSqlMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rdsdata/api_op_ExecuteStatement.go b/service/rdsdata/api_op_ExecuteStatement.go index 93fc1cede40..c4d5c1719f0 100644 --- a/service/rdsdata/api_op_ExecuteStatement.go +++ b/service/rdsdata/api_op_ExecuteStatement.go @@ -112,6 +112,9 @@ func addOperationExecuteStatementMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationExecuteStatementMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rdsdata/api_op_RollbackTransaction.go b/service/rdsdata/api_op_RollbackTransaction.go index f09e1857ab9..d9b32718b27 100644 --- a/service/rdsdata/api_op_RollbackTransaction.go +++ b/service/rdsdata/api_op_RollbackTransaction.go @@ -67,6 +67,9 @@ func addOperationRollbackTransactionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRollbackTransactionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rdsdata/go.mod b/service/rdsdata/go.mod index 4045d48a95d..15373a9f2f8 100644 --- a/service/rdsdata/go.mod +++ b/service/rdsdata/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/rdsdata go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rdsdata/go.sum b/service/rdsdata/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/rdsdata/go.sum +++ b/service/rdsdata/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/redshift/api_client.go b/service/redshift/api_client.go index 5f193c00613..f944a8b0939 100644 --- a/service/redshift/api_client.go +++ b/service/redshift/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/redshift/api_op_AcceptReservedNodeExchange.go b/service/redshift/api_op_AcceptReservedNodeExchange.go index 5af1fde3df0..be8e101a9d8 100644 --- a/service/redshift/api_op_AcceptReservedNodeExchange.go +++ b/service/redshift/api_op_AcceptReservedNodeExchange.go @@ -62,6 +62,9 @@ func addOperationAcceptReservedNodeExchangeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAcceptReservedNodeExchangeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go b/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go index 8f6f9a225a0..2cdf3811f19 100644 --- a/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go +++ b/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go @@ -80,6 +80,9 @@ func addOperationAuthorizeClusterSecurityGroupIngressMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationAuthorizeClusterSecurityGroupIngressMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_AuthorizeSnapshotAccess.go b/service/redshift/api_op_AuthorizeSnapshotAccess.go index 3b5c9a43290..e24bb9f1267 100644 --- a/service/redshift/api_op_AuthorizeSnapshotAccess.go +++ b/service/redshift/api_op_AuthorizeSnapshotAccess.go @@ -69,6 +69,9 @@ func addOperationAuthorizeSnapshotAccessMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationAuthorizeSnapshotAccessMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_BatchDeleteClusterSnapshots.go b/service/redshift/api_op_BatchDeleteClusterSnapshots.go index 1fbaa214905..e0b18ddd4fd 100644 --- a/service/redshift/api_op_BatchDeleteClusterSnapshots.go +++ b/service/redshift/api_op_BatchDeleteClusterSnapshots.go @@ -56,6 +56,9 @@ func addOperationBatchDeleteClusterSnapshotsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchDeleteClusterSnapshotsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_BatchModifyClusterSnapshots.go b/service/redshift/api_op_BatchModifyClusterSnapshots.go index 17f64d1c236..767e8073a50 100644 --- a/service/redshift/api_op_BatchModifyClusterSnapshots.go +++ b/service/redshift/api_op_BatchModifyClusterSnapshots.go @@ -68,6 +68,9 @@ func addOperationBatchModifyClusterSnapshotsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationBatchModifyClusterSnapshotsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CancelResize.go b/service/redshift/api_op_CancelResize.go index 5e96cbf9d23..2c6d67a84ea 100644 --- a/service/redshift/api_op_CancelResize.go +++ b/service/redshift/api_op_CancelResize.go @@ -119,6 +119,9 @@ func addOperationCancelResizeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationCancelResizeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CopyClusterSnapshot.go b/service/redshift/api_op_CopyClusterSnapshot.go index 7dfa4f43615..3e83a6ccc9b 100644 --- a/service/redshift/api_op_CopyClusterSnapshot.go +++ b/service/redshift/api_op_CopyClusterSnapshot.go @@ -98,6 +98,9 @@ func addOperationCopyClusterSnapshotMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCopyClusterSnapshotMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateCluster.go b/service/redshift/api_op_CreateCluster.go index 4b10ce6b6c3..15396226db4 100644 --- a/service/redshift/api_op_CreateCluster.go +++ b/service/redshift/api_op_CreateCluster.go @@ -296,6 +296,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -338,6 +341,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateClusterParameterGroup.go b/service/redshift/api_op_CreateClusterParameterGroup.go index c9bd4320e13..fc5428298e0 100644 --- a/service/redshift/api_op_CreateClusterParameterGroup.go +++ b/service/redshift/api_op_CreateClusterParameterGroup.go @@ -95,6 +95,9 @@ func addOperationCreateClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateClusterSecurityGroup.go b/service/redshift/api_op_CreateClusterSecurityGroup.go index f4f264b8b47..98c1ddc2324 100644 --- a/service/redshift/api_op_CreateClusterSecurityGroup.go +++ b/service/redshift/api_op_CreateClusterSecurityGroup.go @@ -77,6 +77,9 @@ func addOperationCreateClusterSecurityGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateClusterSecurityGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateClusterSnapshot.go b/service/redshift/api_op_CreateClusterSnapshot.go index 8ffabae9dbd..d6e45d40057 100644 --- a/service/redshift/api_op_CreateClusterSnapshot.go +++ b/service/redshift/api_op_CreateClusterSnapshot.go @@ -85,6 +85,9 @@ func addOperationCreateClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateClusterSubnetGroup.go b/service/redshift/api_op_CreateClusterSubnetGroup.go index 3d321ab6a49..8a631371ea1 100644 --- a/service/redshift/api_op_CreateClusterSubnetGroup.go +++ b/service/redshift/api_op_CreateClusterSubnetGroup.go @@ -84,6 +84,9 @@ func addOperationCreateClusterSubnetGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationCreateClusterSubnetGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateEventSubscription.go b/service/redshift/api_op_CreateEventSubscription.go index fada9766df4..08df32408f3 100644 --- a/service/redshift/api_op_CreateEventSubscription.go +++ b/service/redshift/api_op_CreateEventSubscription.go @@ -122,6 +122,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationCreateEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateHsmClientCertificate.go b/service/redshift/api_op_CreateHsmClientCertificate.go index e201c888958..86ebcc99c3c 100644 --- a/service/redshift/api_op_CreateHsmClientCertificate.go +++ b/service/redshift/api_op_CreateHsmClientCertificate.go @@ -68,6 +68,9 @@ func addOperationCreateHsmClientCertificateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateHsmClientCertificateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateHsmConfiguration.go b/service/redshift/api_op_CreateHsmConfiguration.go index e138e823922..3abdc25cffc 100644 --- a/service/redshift/api_op_CreateHsmConfiguration.go +++ b/service/redshift/api_op_CreateHsmConfiguration.go @@ -94,6 +94,9 @@ func addOperationCreateHsmConfigurationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateHsmConfigurationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateScheduledAction.go b/service/redshift/api_op_CreateScheduledAction.go index 39bc65a292a..08b1f2e3e99 100644 --- a/service/redshift/api_op_CreateScheduledAction.go +++ b/service/redshift/api_op_CreateScheduledAction.go @@ -137,6 +137,9 @@ func addOperationCreateScheduledActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationCreateScheduledActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateSnapshotCopyGrant.go b/service/redshift/api_op_CreateSnapshotCopyGrant.go index d525ba9dfb2..e6a413aa5ee 100644 --- a/service/redshift/api_op_CreateSnapshotCopyGrant.go +++ b/service/redshift/api_op_CreateSnapshotCopyGrant.go @@ -85,6 +85,9 @@ func addOperationCreateSnapshotCopyGrantMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateSnapshotCopyGrantMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateSnapshotSchedule.go b/service/redshift/api_op_CreateSnapshotSchedule.go index d2579383ae0..4ed30f642f3 100644 --- a/service/redshift/api_op_CreateSnapshotSchedule.go +++ b/service/redshift/api_op_CreateSnapshotSchedule.go @@ -91,6 +91,9 @@ func addOperationCreateSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateTags.go b/service/redshift/api_op_CreateTags.go index 93969c656c7..9185f0746ef 100644 --- a/service/redshift/api_op_CreateTags.go +++ b/service/redshift/api_op_CreateTags.go @@ -64,6 +64,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_CreateUsageLimit.go b/service/redshift/api_op_CreateUsageLimit.go index 8cc6da8eaba..7a04172ee7c 100644 --- a/service/redshift/api_op_CreateUsageLimit.go +++ b/service/redshift/api_op_CreateUsageLimit.go @@ -118,6 +118,9 @@ func addOperationCreateUsageLimitMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateUsageLimitMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteCluster.go b/service/redshift/api_op_DeleteCluster.go index f29d3f8b99c..23114b07df6 100644 --- a/service/redshift/api_op_DeleteCluster.go +++ b/service/redshift/api_op_DeleteCluster.go @@ -104,6 +104,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDeleteClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteClusterParameterGroup.go b/service/redshift/api_op_DeleteClusterParameterGroup.go index c6c37e8037b..8bc89c85add 100644 --- a/service/redshift/api_op_DeleteClusterParameterGroup.go +++ b/service/redshift/api_op_DeleteClusterParameterGroup.go @@ -56,6 +56,9 @@ func addOperationDeleteClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteClusterSecurityGroup.go b/service/redshift/api_op_DeleteClusterSecurityGroup.go index e221a66592e..246e0dd9cbc 100644 --- a/service/redshift/api_op_DeleteClusterSecurityGroup.go +++ b/service/redshift/api_op_DeleteClusterSecurityGroup.go @@ -54,6 +54,9 @@ func addOperationDeleteClusterSecurityGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteClusterSecurityGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteClusterSnapshot.go b/service/redshift/api_op_DeleteClusterSnapshot.go index 49fc47d0450..cff12a60a6b 100644 --- a/service/redshift/api_op_DeleteClusterSnapshot.go +++ b/service/redshift/api_op_DeleteClusterSnapshot.go @@ -68,6 +68,9 @@ func addOperationDeleteClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteClusterSubnetGroup.go b/service/redshift/api_op_DeleteClusterSubnetGroup.go index 403f2340b2c..78630d45c94 100644 --- a/service/redshift/api_op_DeleteClusterSubnetGroup.go +++ b/service/redshift/api_op_DeleteClusterSubnetGroup.go @@ -49,6 +49,9 @@ func addOperationDeleteClusterSubnetGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteClusterSubnetGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteEventSubscription.go b/service/redshift/api_op_DeleteEventSubscription.go index 227733c45f9..f30b767dbba 100644 --- a/service/redshift/api_op_DeleteEventSubscription.go +++ b/service/redshift/api_op_DeleteEventSubscription.go @@ -49,6 +49,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteHsmClientCertificate.go b/service/redshift/api_op_DeleteHsmClientCertificate.go index 3de182a6fed..329732b2e0b 100644 --- a/service/redshift/api_op_DeleteHsmClientCertificate.go +++ b/service/redshift/api_op_DeleteHsmClientCertificate.go @@ -49,6 +49,9 @@ func addOperationDeleteHsmClientCertificateMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteHsmClientCertificateMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteHsmConfiguration.go b/service/redshift/api_op_DeleteHsmConfiguration.go index ca2f192e6f9..d4ad9a87d44 100644 --- a/service/redshift/api_op_DeleteHsmConfiguration.go +++ b/service/redshift/api_op_DeleteHsmConfiguration.go @@ -49,6 +49,9 @@ func addOperationDeleteHsmConfigurationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteHsmConfigurationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteScheduledAction.go b/service/redshift/api_op_DeleteScheduledAction.go index 393c1943cf0..63c83705c2c 100644 --- a/service/redshift/api_op_DeleteScheduledAction.go +++ b/service/redshift/api_op_DeleteScheduledAction.go @@ -48,6 +48,9 @@ func addOperationDeleteScheduledActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteScheduledActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteSnapshotCopyGrant.go b/service/redshift/api_op_DeleteSnapshotCopyGrant.go index 3d5be31724f..f8a833761f6 100644 --- a/service/redshift/api_op_DeleteSnapshotCopyGrant.go +++ b/service/redshift/api_op_DeleteSnapshotCopyGrant.go @@ -49,6 +49,9 @@ func addOperationDeleteSnapshotCopyGrantMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteSnapshotCopyGrantMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteSnapshotSchedule.go b/service/redshift/api_op_DeleteSnapshotSchedule.go index f4b3fe2c9d7..e7293c967dd 100644 --- a/service/redshift/api_op_DeleteSnapshotSchedule.go +++ b/service/redshift/api_op_DeleteSnapshotSchedule.go @@ -48,6 +48,9 @@ func addOperationDeleteSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteTags.go b/service/redshift/api_op_DeleteTags.go index c3a26ace7e7..fd2c8784f27 100644 --- a/service/redshift/api_op_DeleteTags.go +++ b/service/redshift/api_op_DeleteTags.go @@ -56,6 +56,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DeleteUsageLimit.go b/service/redshift/api_op_DeleteUsageLimit.go index f72a171a6fd..22c4ef3f3b5 100644 --- a/service/redshift/api_op_DeleteUsageLimit.go +++ b/service/redshift/api_op_DeleteUsageLimit.go @@ -48,6 +48,9 @@ func addOperationDeleteUsageLimitMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteUsageLimitMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeAccountAttributes.go b/service/redshift/api_op_DescribeAccountAttributes.go index 61d1ad49a67..b2318b40d69 100644 --- a/service/redshift/api_op_DescribeAccountAttributes.go +++ b/service/redshift/api_op_DescribeAccountAttributes.go @@ -51,6 +51,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDescribeAccountAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterDbRevisions.go b/service/redshift/api_op_DescribeClusterDbRevisions.go index 2e43ef7b485..61aec587818 100644 --- a/service/redshift/api_op_DescribeClusterDbRevisions.go +++ b/service/redshift/api_op_DescribeClusterDbRevisions.go @@ -75,6 +75,9 @@ func addOperationDescribeClusterDbRevisionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeClusterDbRevisionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterParameterGroups.go b/service/redshift/api_op_DescribeClusterParameterGroups.go index 132afc8ea82..ce1b0beffe0 100644 --- a/service/redshift/api_op_DescribeClusterParameterGroups.go +++ b/service/redshift/api_op_DescribeClusterParameterGroups.go @@ -106,6 +106,9 @@ func addOperationDescribeClusterParameterGroupsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeClusterParameterGroupsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterParameters.go b/service/redshift/api_op_DescribeClusterParameters.go index 2aa855dc122..820fc3051b8 100644 --- a/service/redshift/api_op_DescribeClusterParameters.go +++ b/service/redshift/api_op_DescribeClusterParameters.go @@ -92,6 +92,9 @@ func addOperationDescribeClusterParametersMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeClusterParametersMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterSecurityGroups.go b/service/redshift/api_op_DescribeClusterSecurityGroups.go index 5f77e9742d7..b9168a576dd 100644 --- a/service/redshift/api_op_DescribeClusterSecurityGroups.go +++ b/service/redshift/api_op_DescribeClusterSecurityGroups.go @@ -105,6 +105,9 @@ func addOperationDescribeClusterSecurityGroupsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationDescribeClusterSecurityGroupsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterSnapshots.go b/service/redshift/api_op_DescribeClusterSnapshots.go index e494170bf57..0d0c74beb2e 100644 --- a/service/redshift/api_op_DescribeClusterSnapshots.go +++ b/service/redshift/api_op_DescribeClusterSnapshots.go @@ -150,6 +150,9 @@ func addOperationDescribeClusterSnapshotsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationDescribeClusterSnapshotsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterSubnetGroups.go b/service/redshift/api_op_DescribeClusterSubnetGroups.go index 937cda14e88..cff1fd0513f 100644 --- a/service/redshift/api_op_DescribeClusterSubnetGroups.go +++ b/service/redshift/api_op_DescribeClusterSubnetGroups.go @@ -100,6 +100,9 @@ func addOperationDescribeClusterSubnetGroupsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeClusterSubnetGroupsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterTracks.go b/service/redshift/api_op_DescribeClusterTracks.go index 23ad2853fba..6f712d27647 100644 --- a/service/redshift/api_op_DescribeClusterTracks.go +++ b/service/redshift/api_op_DescribeClusterTracks.go @@ -67,6 +67,9 @@ func addOperationDescribeClusterTracksMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeClusterTracksMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusterVersions.go b/service/redshift/api_op_DescribeClusterVersions.go index 29c375e0d4a..ee2c0ce5130 100644 --- a/service/redshift/api_op_DescribeClusterVersions.go +++ b/service/redshift/api_op_DescribeClusterVersions.go @@ -90,6 +90,9 @@ func addOperationDescribeClusterVersionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeClusterVersionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeClusters.go b/service/redshift/api_op_DescribeClusters.go index f036ce4d3a6..cd71b8c0f6a 100644 --- a/service/redshift/api_op_DescribeClusters.go +++ b/service/redshift/api_op_DescribeClusters.go @@ -104,6 +104,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeClustersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeDefaultClusterParameters.go b/service/redshift/api_op_DescribeDefaultClusterParameters.go index 2766051dd88..eefc26b0910 100644 --- a/service/redshift/api_op_DescribeDefaultClusterParameters.go +++ b/service/redshift/api_op_DescribeDefaultClusterParameters.go @@ -73,6 +73,9 @@ func addOperationDescribeDefaultClusterParametersMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeDefaultClusterParametersMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeEventCategories.go b/service/redshift/api_op_DescribeEventCategories.go index a47b1721bb7..0a10e52b929 100644 --- a/service/redshift/api_op_DescribeEventCategories.go +++ b/service/redshift/api_op_DescribeEventCategories.go @@ -58,6 +58,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeEventCategoriesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeEventSubscriptions.go b/service/redshift/api_op_DescribeEventSubscriptions.go index 0f6f5b897a4..e646d9dfbec 100644 --- a/service/redshift/api_op_DescribeEventSubscriptions.go +++ b/service/redshift/api_op_DescribeEventSubscriptions.go @@ -100,6 +100,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeEventSubscriptionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeEvents.go b/service/redshift/api_op_DescribeEvents.go index 06e3a9ccbc8..4f95784bfca 100644 --- a/service/redshift/api_op_DescribeEvents.go +++ b/service/redshift/api_op_DescribeEvents.go @@ -126,6 +126,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationDescribeEventsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeHsmClientCertificates.go b/service/redshift/api_op_DescribeHsmClientCertificates.go index 54d84307459..a427edf9117 100644 --- a/service/redshift/api_op_DescribeHsmClientCertificates.go +++ b/service/redshift/api_op_DescribeHsmClientCertificates.go @@ -103,6 +103,9 @@ func addOperationDescribeHsmClientCertificatesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationDescribeHsmClientCertificatesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeHsmConfigurations.go b/service/redshift/api_op_DescribeHsmConfigurations.go index 018e5f1317c..cec48b842e9 100644 --- a/service/redshift/api_op_DescribeHsmConfigurations.go +++ b/service/redshift/api_op_DescribeHsmConfigurations.go @@ -100,6 +100,9 @@ func addOperationDescribeHsmConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeHsmConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeLoggingStatus.go b/service/redshift/api_op_DescribeLoggingStatus.go index 3183c12cedd..1d837e54c7b 100644 --- a/service/redshift/api_op_DescribeLoggingStatus.go +++ b/service/redshift/api_op_DescribeLoggingStatus.go @@ -72,6 +72,9 @@ func addOperationDescribeLoggingStatusMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeLoggingStatusMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeNodeConfigurationOptions.go b/service/redshift/api_op_DescribeNodeConfigurationOptions.go index 656ce93af90..005fcd9f6dd 100644 --- a/service/redshift/api_op_DescribeNodeConfigurationOptions.go +++ b/service/redshift/api_op_DescribeNodeConfigurationOptions.go @@ -93,6 +93,9 @@ func addOperationDescribeNodeConfigurationOptionsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeNodeConfigurationOptionsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeOrderableClusterOptions.go b/service/redshift/api_op_DescribeOrderableClusterOptions.go index 6baa2eb587f..3c59bbd6795 100644 --- a/service/redshift/api_op_DescribeOrderableClusterOptions.go +++ b/service/redshift/api_op_DescribeOrderableClusterOptions.go @@ -90,6 +90,9 @@ func addOperationDescribeOrderableClusterOptionsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeOrderableClusterOptionsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeReservedNodeOfferings.go b/service/redshift/api_op_DescribeReservedNodeOfferings.go index 9d6900d6c99..06067ea8d02 100644 --- a/service/redshift/api_op_DescribeReservedNodeOfferings.go +++ b/service/redshift/api_op_DescribeReservedNodeOfferings.go @@ -84,6 +84,9 @@ func addOperationDescribeReservedNodeOfferingsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeReservedNodeOfferingsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeReservedNodes.go b/service/redshift/api_op_DescribeReservedNodes.go index 7f1448f7269..2d0c022219a 100644 --- a/service/redshift/api_op_DescribeReservedNodes.go +++ b/service/redshift/api_op_DescribeReservedNodes.go @@ -74,6 +74,9 @@ func addOperationDescribeReservedNodesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeReservedNodesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeResize.go b/service/redshift/api_op_DescribeResize.go index dacef8a5dbe..aa44b643a4b 100644 --- a/service/redshift/api_op_DescribeResize.go +++ b/service/redshift/api_op_DescribeResize.go @@ -126,6 +126,9 @@ func addOperationDescribeResizeMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationDescribeResizeMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeScheduledActions.go b/service/redshift/api_op_DescribeScheduledActions.go index 892c5bf3e26..185957c82dd 100644 --- a/service/redshift/api_op_DescribeScheduledActions.go +++ b/service/redshift/api_op_DescribeScheduledActions.go @@ -91,6 +91,9 @@ func addOperationDescribeScheduledActionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeScheduledActionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeSnapshotCopyGrants.go b/service/redshift/api_op_DescribeSnapshotCopyGrants.go index e767f535b48..e8a47cd3220 100644 --- a/service/redshift/api_op_DescribeSnapshotCopyGrants.go +++ b/service/redshift/api_op_DescribeSnapshotCopyGrants.go @@ -96,6 +96,9 @@ func addOperationDescribeSnapshotCopyGrantsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeSnapshotCopyGrantsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeSnapshotSchedules.go b/service/redshift/api_op_DescribeSnapshotSchedules.go index 7eebdd949ff..970d7812591 100644 --- a/service/redshift/api_op_DescribeSnapshotSchedules.go +++ b/service/redshift/api_op_DescribeSnapshotSchedules.go @@ -80,6 +80,9 @@ func addOperationDescribeSnapshotSchedulesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeSnapshotSchedulesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeStorage.go b/service/redshift/api_op_DescribeStorage.go index c5e432eeb8f..f864ea1dbda 100644 --- a/service/redshift/api_op_DescribeStorage.go +++ b/service/redshift/api_op_DescribeStorage.go @@ -50,6 +50,9 @@ func addOperationDescribeStorageMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDescribeStorageMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeTableRestoreStatus.go b/service/redshift/api_op_DescribeTableRestoreStatus.go index 63db4599d3d..17ada227ede 100644 --- a/service/redshift/api_op_DescribeTableRestoreStatus.go +++ b/service/redshift/api_op_DescribeTableRestoreStatus.go @@ -77,6 +77,9 @@ func addOperationDescribeTableRestoreStatusMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeTableRestoreStatusMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeTags.go b/service/redshift/api_op_DescribeTags.go index eb57fe7e646..f8fdb7568e8 100644 --- a/service/redshift/api_op_DescribeTags.go +++ b/service/redshift/api_op_DescribeTags.go @@ -140,6 +140,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DescribeUsageLimits.go b/service/redshift/api_op_DescribeUsageLimits.go index 86130a9a691..4a85c4ee0ad 100644 --- a/service/redshift/api_op_DescribeUsageLimits.go +++ b/service/redshift/api_op_DescribeUsageLimits.go @@ -110,6 +110,9 @@ func addOperationDescribeUsageLimitsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationDescribeUsageLimitsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DisableLogging.go b/service/redshift/api_op_DisableLogging.go index 6708e89f171..6e30c9a87df 100644 --- a/service/redshift/api_op_DisableLogging.go +++ b/service/redshift/api_op_DisableLogging.go @@ -72,6 +72,9 @@ func addOperationDisableLoggingMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDisableLoggingMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_DisableSnapshotCopy.go b/service/redshift/api_op_DisableSnapshotCopy.go index 611e8892335..b9435b0c7e3 100644 --- a/service/redshift/api_op_DisableSnapshotCopy.go +++ b/service/redshift/api_op_DisableSnapshotCopy.go @@ -60,6 +60,9 @@ func addOperationDisableSnapshotCopyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDisableSnapshotCopyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_EnableLogging.go b/service/redshift/api_op_EnableLogging.go index 57d3c068ad1..616508f14b8 100644 --- a/service/redshift/api_op_EnableLogging.go +++ b/service/redshift/api_op_EnableLogging.go @@ -103,6 +103,9 @@ func addOperationEnableLoggingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationEnableLoggingMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_EnableSnapshotCopy.go b/service/redshift/api_op_EnableSnapshotCopy.go index bdf9ca98a25..ccece65195c 100644 --- a/service/redshift/api_op_EnableSnapshotCopy.go +++ b/service/redshift/api_op_EnableSnapshotCopy.go @@ -81,6 +81,9 @@ func addOperationEnableSnapshotCopyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationEnableSnapshotCopyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_GetClusterCredentials.go b/service/redshift/api_op_GetClusterCredentials.go index 92051cee587..c261397a12c 100644 --- a/service/redshift/api_op_GetClusterCredentials.go +++ b/service/redshift/api_op_GetClusterCredentials.go @@ -169,6 +169,9 @@ func addOperationGetClusterCredentialsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -211,6 +214,9 @@ func addOperationGetClusterCredentialsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_GetReservedNodeExchangeOfferings.go b/service/redshift/api_op_GetReservedNodeExchangeOfferings.go index 0ef1bad4867..538209768c7 100644 --- a/service/redshift/api_op_GetReservedNodeExchangeOfferings.go +++ b/service/redshift/api_op_GetReservedNodeExchangeOfferings.go @@ -71,6 +71,9 @@ func addOperationGetReservedNodeExchangeOfferingsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetReservedNodeExchangeOfferingsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyCluster.go b/service/redshift/api_op_ModifyCluster.go index cf18d06ece8..f0a18fb053c 100644 --- a/service/redshift/api_op_ModifyCluster.go +++ b/service/redshift/api_op_ModifyCluster.go @@ -241,6 +241,9 @@ func addOperationModifyClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -283,6 +286,9 @@ func addOperationModifyClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterDbRevision.go b/service/redshift/api_op_ModifyClusterDbRevision.go index 939b8e44db1..f9398ab266e 100644 --- a/service/redshift/api_op_ModifyClusterDbRevision.go +++ b/service/redshift/api_op_ModifyClusterDbRevision.go @@ -61,6 +61,9 @@ func addOperationModifyClusterDbRevisionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationModifyClusterDbRevisionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterIamRoles.go b/service/redshift/api_op_ModifyClusterIamRoles.go index 082659c1b80..3e0bcd2e9b5 100644 --- a/service/redshift/api_op_ModifyClusterIamRoles.go +++ b/service/redshift/api_op_ModifyClusterIamRoles.go @@ -66,6 +66,9 @@ func addOperationModifyClusterIamRolesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationModifyClusterIamRolesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterMaintenance.go b/service/redshift/api_op_ModifyClusterMaintenance.go index 170a075ff91..1e09b32d39b 100644 --- a/service/redshift/api_op_ModifyClusterMaintenance.go +++ b/service/redshift/api_op_ModifyClusterMaintenance.go @@ -72,6 +72,9 @@ func addOperationModifyClusterMaintenanceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationModifyClusterMaintenanceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterParameterGroup.go b/service/redshift/api_op_ModifyClusterParameterGroup.go index 6faf8235ca8..8ed0734727e 100644 --- a/service/redshift/api_op_ModifyClusterParameterGroup.go +++ b/service/redshift/api_op_ModifyClusterParameterGroup.go @@ -72,6 +72,9 @@ func addOperationModifyClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationModifyClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterSnapshot.go b/service/redshift/api_op_ModifyClusterSnapshot.go index 04788d1ae97..4b618f38c44 100644 --- a/service/redshift/api_op_ModifyClusterSnapshot.go +++ b/service/redshift/api_op_ModifyClusterSnapshot.go @@ -65,6 +65,9 @@ func addOperationModifyClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationModifyClusterSnapshotMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterSnapshotSchedule.go b/service/redshift/api_op_ModifyClusterSnapshotSchedule.go index 04febc1b6cf..7d038430afa 100644 --- a/service/redshift/api_op_ModifyClusterSnapshotSchedule.go +++ b/service/redshift/api_op_ModifyClusterSnapshotSchedule.go @@ -56,6 +56,9 @@ func addOperationModifyClusterSnapshotScheduleMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationModifyClusterSnapshotScheduleMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyClusterSubnetGroup.go b/service/redshift/api_op_ModifyClusterSubnetGroup.go index ac79d8b2d7e..5e158bb0fe1 100644 --- a/service/redshift/api_op_ModifyClusterSubnetGroup.go +++ b/service/redshift/api_op_ModifyClusterSubnetGroup.go @@ -65,6 +65,9 @@ func addOperationModifyClusterSubnetGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationModifyClusterSubnetGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyEventSubscription.go b/service/redshift/api_op_ModifyEventSubscription.go index 91e4786f306..d2d2763c321 100644 --- a/service/redshift/api_op_ModifyEventSubscription.go +++ b/service/redshift/api_op_ModifyEventSubscription.go @@ -87,6 +87,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationModifyEventSubscriptionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyScheduledAction.go b/service/redshift/api_op_ModifyScheduledAction.go index fe839230ac1..ad7c514ba2f 100644 --- a/service/redshift/api_op_ModifyScheduledAction.go +++ b/service/redshift/api_op_ModifyScheduledAction.go @@ -125,6 +125,9 @@ func addOperationModifyScheduledActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationModifyScheduledActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go b/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go index c269f0d27bc..f98ae0d3946 100644 --- a/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go +++ b/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go @@ -82,6 +82,9 @@ func addOperationModifySnapshotCopyRetentionPeriodMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationModifySnapshotCopyRetentionPeriodMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifySnapshotSchedule.go b/service/redshift/api_op_ModifySnapshotSchedule.go index da0464ee2ad..4bec9b59f02 100644 --- a/service/redshift/api_op_ModifySnapshotSchedule.go +++ b/service/redshift/api_op_ModifySnapshotSchedule.go @@ -82,6 +82,9 @@ func addOperationModifySnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationModifySnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ModifyUsageLimit.go b/service/redshift/api_op_ModifyUsageLimit.go index 33167242520..68fad08820d 100644 --- a/service/redshift/api_op_ModifyUsageLimit.go +++ b/service/redshift/api_op_ModifyUsageLimit.go @@ -95,6 +95,9 @@ func addOperationModifyUsageLimitMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationModifyUsageLimitMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_PauseCluster.go b/service/redshift/api_op_PauseCluster.go index 1f274d0c366..6d7ee26d0de 100644 --- a/service/redshift/api_op_PauseCluster.go +++ b/service/redshift/api_op_PauseCluster.go @@ -55,6 +55,9 @@ func addOperationPauseClusterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationPauseClusterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_PurchaseReservedNodeOffering.go b/service/redshift/api_op_PurchaseReservedNodeOffering.go index 72eeab4ea1a..98a57def389 100644 --- a/service/redshift/api_op_PurchaseReservedNodeOffering.go +++ b/service/redshift/api_op_PurchaseReservedNodeOffering.go @@ -65,6 +65,9 @@ func addOperationPurchaseReservedNodeOfferingMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationPurchaseReservedNodeOfferingMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_RebootCluster.go b/service/redshift/api_op_RebootCluster.go index dd68a6aebca..6b47cfad7bd 100644 --- a/service/redshift/api_op_RebootCluster.go +++ b/service/redshift/api_op_RebootCluster.go @@ -60,6 +60,9 @@ func addOperationRebootClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRebootClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ResetClusterParameterGroup.go b/service/redshift/api_op_ResetClusterParameterGroup.go index 6e8a21e1e45..f3ed05e2f5a 100644 --- a/service/redshift/api_op_ResetClusterParameterGroup.go +++ b/service/redshift/api_op_ResetClusterParameterGroup.go @@ -72,6 +72,9 @@ func addOperationResetClusterParameterGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationResetClusterParameterGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ResizeCluster.go b/service/redshift/api_op_ResizeCluster.go index 8f242a8371f..754a7bc6f4e 100644 --- a/service/redshift/api_op_ResizeCluster.go +++ b/service/redshift/api_op_ResizeCluster.go @@ -99,6 +99,9 @@ func addOperationResizeClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationResizeClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_RestoreFromClusterSnapshot.go b/service/redshift/api_op_RestoreFromClusterSnapshot.go index e5a5e05685d..17a72038f34 100644 --- a/service/redshift/api_op_RestoreFromClusterSnapshot.go +++ b/service/redshift/api_op_RestoreFromClusterSnapshot.go @@ -221,6 +221,9 @@ func addOperationRestoreFromClusterSnapshotMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -263,6 +266,9 @@ func addOperationRestoreFromClusterSnapshotMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_RestoreTableFromClusterSnapshot.go b/service/redshift/api_op_RestoreTableFromClusterSnapshot.go index e3d2db1a712..8226698aefb 100644 --- a/service/redshift/api_op_RestoreTableFromClusterSnapshot.go +++ b/service/redshift/api_op_RestoreTableFromClusterSnapshot.go @@ -96,6 +96,9 @@ func addOperationRestoreTableFromClusterSnapshotMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationRestoreTableFromClusterSnapshotMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_ResumeCluster.go b/service/redshift/api_op_ResumeCluster.go index 35111488b9f..3e89478ccce 100644 --- a/service/redshift/api_op_ResumeCluster.go +++ b/service/redshift/api_op_ResumeCluster.go @@ -55,6 +55,9 @@ func addOperationResumeClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationResumeClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go b/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go index e116e31e22c..9b59b282cd9 100644 --- a/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go +++ b/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go @@ -75,6 +75,9 @@ func addOperationRevokeClusterSecurityGroupIngressMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRevokeClusterSecurityGroupIngressMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_RevokeSnapshotAccess.go b/service/redshift/api_op_RevokeSnapshotAccess.go index 65406320461..34ac851bead 100644 --- a/service/redshift/api_op_RevokeSnapshotAccess.go +++ b/service/redshift/api_op_RevokeSnapshotAccess.go @@ -70,6 +70,9 @@ func addOperationRevokeSnapshotAccessMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationRevokeSnapshotAccessMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/api_op_RotateEncryptionKey.go b/service/redshift/api_op_RotateEncryptionKey.go index c3cd1dd0a54..8a914b8d08f 100644 --- a/service/redshift/api_op_RotateEncryptionKey.go +++ b/service/redshift/api_op_RotateEncryptionKey.go @@ -55,6 +55,9 @@ func addOperationRotateEncryptionKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRotateEncryptionKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshift/go.mod b/service/redshift/go.mod index 91a173ce04a..5b8e316f064 100644 --- a/service/redshift/go.mod +++ b/service/redshift/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/redshift go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/redshift/go.sum b/service/redshift/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/redshift/go.sum +++ b/service/redshift/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/redshiftdata/api_client.go b/service/redshiftdata/api_client.go index 9f066b0b35d..f1ea56af277 100644 --- a/service/redshiftdata/api_client.go +++ b/service/redshiftdata/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/redshiftdata/api_op_CancelStatement.go b/service/redshiftdata/api_op_CancelStatement.go index e680f091af5..a2f9fd59c9d 100644 --- a/service/redshiftdata/api_op_CancelStatement.go +++ b/service/redshiftdata/api_op_CancelStatement.go @@ -54,6 +54,9 @@ func addOperationCancelStatementMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationCancelStatementMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_DescribeStatement.go b/service/redshiftdata/api_op_DescribeStatement.go index e68ded0a455..64485dc4dc7 100644 --- a/service/redshiftdata/api_op_DescribeStatement.go +++ b/service/redshiftdata/api_op_DescribeStatement.go @@ -130,6 +130,9 @@ func addOperationDescribeStatementMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationDescribeStatementMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_DescribeTable.go b/service/redshiftdata/api_op_DescribeTable.go index 7dcd0b976bd..1cd595b88d7 100644 --- a/service/redshiftdata/api_op_DescribeTable.go +++ b/service/redshiftdata/api_op_DescribeTable.go @@ -108,6 +108,9 @@ func addOperationDescribeTableMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeTableMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_ExecuteStatement.go b/service/redshiftdata/api_op_ExecuteStatement.go index 361675a9643..18ddba53079 100644 --- a/service/redshiftdata/api_op_ExecuteStatement.go +++ b/service/redshiftdata/api_op_ExecuteStatement.go @@ -106,6 +106,9 @@ func addOperationExecuteStatementMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationExecuteStatementMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_GetStatementResult.go b/service/redshiftdata/api_op_GetStatementResult.go index c89b0c3611b..cfefdf62cc3 100644 --- a/service/redshiftdata/api_op_GetStatementResult.go +++ b/service/redshiftdata/api_op_GetStatementResult.go @@ -80,6 +80,9 @@ func addOperationGetStatementResultMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetStatementResultMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_ListDatabases.go b/service/redshiftdata/api_op_ListDatabases.go index 1aa799c664e..ba01ae39ba4 100644 --- a/service/redshiftdata/api_op_ListDatabases.go +++ b/service/redshiftdata/api_op_ListDatabases.go @@ -94,6 +94,9 @@ func addOperationListDatabasesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationListDatabasesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_ListSchemas.go b/service/redshiftdata/api_op_ListSchemas.go index ddbaa13f95e..7669b837214 100644 --- a/service/redshiftdata/api_op_ListSchemas.go +++ b/service/redshiftdata/api_op_ListSchemas.go @@ -101,6 +101,9 @@ func addOperationListSchemasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationListSchemasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_ListStatements.go b/service/redshiftdata/api_op_ListStatements.go index 5631ae92a3d..79ba6849eff 100644 --- a/service/redshiftdata/api_op_ListStatements.go +++ b/service/redshiftdata/api_op_ListStatements.go @@ -100,6 +100,9 @@ func addOperationListStatementsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationListStatementsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/api_op_ListTables.go b/service/redshiftdata/api_op_ListTables.go index 16e0a93eb71..281e98f3cd5 100644 --- a/service/redshiftdata/api_op_ListTables.go +++ b/service/redshiftdata/api_op_ListTables.go @@ -115,6 +115,9 @@ func addOperationListTablesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationListTablesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/redshiftdata/go.mod b/service/redshiftdata/go.mod index 747f4838fb9..3a6d12a9a57 100644 --- a/service/redshiftdata/go.mod +++ b/service/redshiftdata/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/redshiftdata go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/redshiftdata/go.sum b/service/redshiftdata/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/redshiftdata/go.sum +++ b/service/redshiftdata/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/rekognition/api_client.go b/service/rekognition/api_client.go index 430132aac82..6f0a51b836e 100644 --- a/service/rekognition/api_client.go +++ b/service/rekognition/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/rekognition/api_op_CompareFaces.go b/service/rekognition/api_op_CompareFaces.go index 3c4edd46a1e..4f400284bb2 100644 --- a/service/rekognition/api_op_CompareFaces.go +++ b/service/rekognition/api_op_CompareFaces.go @@ -148,6 +148,9 @@ func addOperationCompareFacesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationCompareFacesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_CreateCollection.go b/service/rekognition/api_op_CreateCollection.go index 1137384fd0d..eef7e262f41 100644 --- a/service/rekognition/api_op_CreateCollection.go +++ b/service/rekognition/api_op_CreateCollection.go @@ -67,6 +67,9 @@ func addOperationCreateCollectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateCollectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_CreateProject.go b/service/rekognition/api_op_CreateProject.go index 3273a5f9a94..24218862352 100644 --- a/service/rekognition/api_op_CreateProject.go +++ b/service/rekognition/api_op_CreateProject.go @@ -56,6 +56,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_CreateProjectVersion.go b/service/rekognition/api_op_CreateProjectVersion.go index 858689b81fd..02a028bd4ca 100644 --- a/service/rekognition/api_op_CreateProjectVersion.go +++ b/service/rekognition/api_op_CreateProjectVersion.go @@ -83,6 +83,9 @@ func addOperationCreateProjectVersionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateProjectVersionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_CreateStreamProcessor.go b/service/rekognition/api_op_CreateStreamProcessor.go index 93a994acfa9..0e0cefa5fcb 100644 --- a/service/rekognition/api_op_CreateStreamProcessor.go +++ b/service/rekognition/api_op_CreateStreamProcessor.go @@ -90,6 +90,9 @@ func addOperationCreateStreamProcessorMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateStreamProcessorMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DeleteCollection.go b/service/rekognition/api_op_DeleteCollection.go index 7da74c96d40..d12a33a2ef7 100644 --- a/service/rekognition/api_op_DeleteCollection.go +++ b/service/rekognition/api_op_DeleteCollection.go @@ -54,6 +54,9 @@ func addOperationDeleteCollectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteCollectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DeleteFaces.go b/service/rekognition/api_op_DeleteFaces.go index a7234fc98d7..85f4e08d7a4 100644 --- a/service/rekognition/api_op_DeleteFaces.go +++ b/service/rekognition/api_op_DeleteFaces.go @@ -59,6 +59,9 @@ func addOperationDeleteFacesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteFacesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DeleteProject.go b/service/rekognition/api_op_DeleteProject.go index 0e37dd60b15..66127568471 100644 --- a/service/rekognition/api_op_DeleteProject.go +++ b/service/rekognition/api_op_DeleteProject.go @@ -56,6 +56,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteProjectMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DeleteProjectVersion.go b/service/rekognition/api_op_DeleteProjectVersion.go index ed061c35160..438552d9b49 100644 --- a/service/rekognition/api_op_DeleteProjectVersion.go +++ b/service/rekognition/api_op_DeleteProjectVersion.go @@ -58,6 +58,9 @@ func addOperationDeleteProjectVersionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteProjectVersionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DeleteStreamProcessor.go b/service/rekognition/api_op_DeleteStreamProcessor.go index 5165014464f..4be413bbc62 100644 --- a/service/rekognition/api_op_DeleteStreamProcessor.go +++ b/service/rekognition/api_op_DeleteStreamProcessor.go @@ -51,6 +51,9 @@ func addOperationDeleteStreamProcessorMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteStreamProcessorMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DescribeCollection.go b/service/rekognition/api_op_DescribeCollection.go index 23e24abebd4..19e5d41d206 100644 --- a/service/rekognition/api_op_DescribeCollection.go +++ b/service/rekognition/api_op_DescribeCollection.go @@ -71,6 +71,9 @@ func addOperationDescribeCollectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeCollectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DescribeProjectVersions.go b/service/rekognition/api_op_DescribeProjectVersions.go index 1b704da0640..b5a9e8549b4 100644 --- a/service/rekognition/api_op_DescribeProjectVersions.go +++ b/service/rekognition/api_op_DescribeProjectVersions.go @@ -81,6 +81,9 @@ func addOperationDescribeProjectVersionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeProjectVersionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DescribeProjects.go b/service/rekognition/api_op_DescribeProjects.go index 6a9b269eeba..8d53d1a612d 100644 --- a/service/rekognition/api_op_DescribeProjects.go +++ b/service/rekognition/api_op_DescribeProjects.go @@ -66,6 +66,9 @@ func addOperationDescribeProjectsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeProjectsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DescribeStreamProcessor.go b/service/rekognition/api_op_DescribeStreamProcessor.go index 5e9b3745f89..33d487f572a 100644 --- a/service/rekognition/api_op_DescribeStreamProcessor.go +++ b/service/rekognition/api_op_DescribeStreamProcessor.go @@ -88,6 +88,9 @@ func addOperationDescribeStreamProcessorMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeStreamProcessorMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DetectCustomLabels.go b/service/rekognition/api_op_DetectCustomLabels.go index aced2e3e798..db215bd771d 100644 --- a/service/rekognition/api_op_DetectCustomLabels.go +++ b/service/rekognition/api_op_DetectCustomLabels.go @@ -106,6 +106,9 @@ func addOperationDetectCustomLabelsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationDetectCustomLabelsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DetectFaces.go b/service/rekognition/api_op_DetectFaces.go index 7cfd58d43d8..82453a9f554 100644 --- a/service/rekognition/api_op_DetectFaces.go +++ b/service/rekognition/api_op_DetectFaces.go @@ -92,6 +92,9 @@ func addOperationDetectFacesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDetectFacesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DetectLabels.go b/service/rekognition/api_op_DetectLabels.go index bf07e53e425..22c71edbfcf 100644 --- a/service/rekognition/api_op_DetectLabels.go +++ b/service/rekognition/api_op_DetectLabels.go @@ -131,6 +131,9 @@ func addOperationDetectLabelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationDetectLabelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DetectModerationLabels.go b/service/rekognition/api_op_DetectModerationLabels.go index c423c402ab5..7c44bda60ca 100644 --- a/service/rekognition/api_op_DetectModerationLabels.go +++ b/service/rekognition/api_op_DetectModerationLabels.go @@ -84,6 +84,9 @@ func addOperationDetectModerationLabelsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDetectModerationLabelsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DetectProtectiveEquipment.go b/service/rekognition/api_op_DetectProtectiveEquipment.go index 673e9d85ab7..46e2c3663c9 100644 --- a/service/rekognition/api_op_DetectProtectiveEquipment.go +++ b/service/rekognition/api_op_DetectProtectiveEquipment.go @@ -99,6 +99,9 @@ func addOperationDetectProtectiveEquipmentMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationDetectProtectiveEquipmentMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_DetectText.go b/service/rekognition/api_op_DetectText.go index 3659837f46d..21ff905a033 100644 --- a/service/rekognition/api_op_DetectText.go +++ b/service/rekognition/api_op_DetectText.go @@ -84,6 +84,9 @@ func addOperationDetectTextMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDetectTextMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetCelebrityInfo.go b/service/rekognition/api_op_GetCelebrityInfo.go index aa1a17b00d4..a7920be6ef3 100644 --- a/service/rekognition/api_op_GetCelebrityInfo.go +++ b/service/rekognition/api_op_GetCelebrityInfo.go @@ -61,6 +61,9 @@ func addOperationGetCelebrityInfoMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetCelebrityInfoMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetCelebrityRecognition.go b/service/rekognition/api_op_GetCelebrityRecognition.go index 83dd90f9293..d7d31c193fb 100644 --- a/service/rekognition/api_op_GetCelebrityRecognition.go +++ b/service/rekognition/api_op_GetCelebrityRecognition.go @@ -118,6 +118,9 @@ func addOperationGetCelebrityRecognitionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetCelebrityRecognitionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetContentModeration.go b/service/rekognition/api_op_GetContentModeration.go index 7a8f7453408..3b2f2030484 100644 --- a/service/rekognition/api_op_GetContentModeration.go +++ b/service/rekognition/api_op_GetContentModeration.go @@ -113,6 +113,9 @@ func addOperationGetContentModerationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationGetContentModerationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetFaceDetection.go b/service/rekognition/api_op_GetFaceDetection.go index 95507f20796..20e1ce0e970 100644 --- a/service/rekognition/api_op_GetFaceDetection.go +++ b/service/rekognition/api_op_GetFaceDetection.go @@ -96,6 +96,9 @@ func addOperationGetFaceDetectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationGetFaceDetectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetFaceSearch.go b/service/rekognition/api_op_GetFaceSearch.go index 650f5009a4c..6ff345c3220 100644 --- a/service/rekognition/api_op_GetFaceSearch.go +++ b/service/rekognition/api_op_GetFaceSearch.go @@ -112,6 +112,9 @@ func addOperationGetFaceSearchMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationGetFaceSearchMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetLabelDetection.go b/service/rekognition/api_op_GetLabelDetection.go index 904149018ca..12fdf655c1f 100644 --- a/service/rekognition/api_op_GetLabelDetection.go +++ b/service/rekognition/api_op_GetLabelDetection.go @@ -110,6 +110,9 @@ func addOperationGetLabelDetectionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationGetLabelDetectionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetPersonTracking.go b/service/rekognition/api_op_GetPersonTracking.go index a93f80f5eb3..cb7dcf8d219 100644 --- a/service/rekognition/api_op_GetPersonTracking.go +++ b/service/rekognition/api_op_GetPersonTracking.go @@ -110,6 +110,9 @@ func addOperationGetPersonTrackingMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationGetPersonTrackingMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetSegmentDetection.go b/service/rekognition/api_op_GetSegmentDetection.go index ecf88f78c24..1df8b110b3c 100644 --- a/service/rekognition/api_op_GetSegmentDetection.go +++ b/service/rekognition/api_op_GetSegmentDetection.go @@ -118,6 +118,9 @@ func addOperationGetSegmentDetectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetSegmentDetectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_GetTextDetection.go b/service/rekognition/api_op_GetTextDetection.go index ff2a0605f17..d39dc0bdb73 100644 --- a/service/rekognition/api_op_GetTextDetection.go +++ b/service/rekognition/api_op_GetTextDetection.go @@ -102,6 +102,9 @@ func addOperationGetTextDetectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationGetTextDetectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_IndexFaces.go b/service/rekognition/api_op_IndexFaces.go index 3056e0323c6..cb2a5a929ef 100644 --- a/service/rekognition/api_op_IndexFaces.go +++ b/service/rekognition/api_op_IndexFaces.go @@ -215,6 +215,9 @@ func addOperationIndexFacesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -257,6 +260,9 @@ func addOperationIndexFacesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_ListCollections.go b/service/rekognition/api_op_ListCollections.go index bed9c23ffa9..d4a327204e0 100644 --- a/service/rekognition/api_op_ListCollections.go +++ b/service/rekognition/api_op_ListCollections.go @@ -67,6 +67,9 @@ func addOperationListCollectionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListCollectionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_ListFaces.go b/service/rekognition/api_op_ListFaces.go index 1319bee3de7..5d61a3b1857 100644 --- a/service/rekognition/api_op_ListFaces.go +++ b/service/rekognition/api_op_ListFaces.go @@ -73,6 +73,9 @@ func addOperationListFacesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListFacesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_ListStreamProcessors.go b/service/rekognition/api_op_ListStreamProcessors.go index 7d3edfc0918..e5557b685c1 100644 --- a/service/rekognition/api_op_ListStreamProcessors.go +++ b/service/rekognition/api_op_ListStreamProcessors.go @@ -64,6 +64,9 @@ func addOperationListStreamProcessorsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListStreamProcessorsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_RecognizeCelebrities.go b/service/rekognition/api_op_RecognizeCelebrities.go index 0489066c421..a5bb6a90bfd 100644 --- a/service/rekognition/api_op_RecognizeCelebrities.go +++ b/service/rekognition/api_op_RecognizeCelebrities.go @@ -93,6 +93,9 @@ func addOperationRecognizeCelebritiesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationRecognizeCelebritiesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_SearchFaces.go b/service/rekognition/api_op_SearchFaces.go index 818528ae783..ceda3ab7204 100644 --- a/service/rekognition/api_op_SearchFaces.go +++ b/service/rekognition/api_op_SearchFaces.go @@ -86,6 +86,9 @@ func addOperationSearchFacesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationSearchFacesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_SearchFacesByImage.go b/service/rekognition/api_op_SearchFacesByImage.go index 13f38a56b3a..8f8bb5bf484 100644 --- a/service/rekognition/api_op_SearchFacesByImage.go +++ b/service/rekognition/api_op_SearchFacesByImage.go @@ -121,6 +121,9 @@ func addOperationSearchFacesByImageMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationSearchFacesByImageMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartCelebrityRecognition.go b/service/rekognition/api_op_StartCelebrityRecognition.go index 102e9c82761..793107ac7e8 100644 --- a/service/rekognition/api_op_StartCelebrityRecognition.go +++ b/service/rekognition/api_op_StartCelebrityRecognition.go @@ -82,6 +82,9 @@ func addOperationStartCelebrityRecognitionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationStartCelebrityRecognitionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartContentModeration.go b/service/rekognition/api_op_StartContentModeration.go index bb50c8d2c79..97a946a6d1a 100644 --- a/service/rekognition/api_op_StartContentModeration.go +++ b/service/rekognition/api_op_StartContentModeration.go @@ -91,6 +91,9 @@ func addOperationStartContentModerationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationStartContentModerationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartFaceDetection.go b/service/rekognition/api_op_StartFaceDetection.go index 9c65232f238..64e31b3e601 100644 --- a/service/rekognition/api_op_StartFaceDetection.go +++ b/service/rekognition/api_op_StartFaceDetection.go @@ -86,6 +86,9 @@ func addOperationStartFaceDetectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationStartFaceDetectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartFaceSearch.go b/service/rekognition/api_op_StartFaceSearch.go index c0e269f1726..f8922ed61a1 100644 --- a/service/rekognition/api_op_StartFaceSearch.go +++ b/service/rekognition/api_op_StartFaceSearch.go @@ -90,6 +90,9 @@ func addOperationStartFaceSearchMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationStartFaceSearchMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartLabelDetection.go b/service/rekognition/api_op_StartLabelDetection.go index bd282466798..6f8cdb68ff7 100644 --- a/service/rekognition/api_op_StartLabelDetection.go +++ b/service/rekognition/api_op_StartLabelDetection.go @@ -93,6 +93,9 @@ func addOperationStartLabelDetectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationStartLabelDetectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartPersonTracking.go b/service/rekognition/api_op_StartPersonTracking.go index a799d915bf7..72ecdcbc126 100644 --- a/service/rekognition/api_op_StartPersonTracking.go +++ b/service/rekognition/api_op_StartPersonTracking.go @@ -80,6 +80,9 @@ func addOperationStartPersonTrackingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationStartPersonTrackingMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartProjectVersion.go b/service/rekognition/api_op_StartProjectVersion.go index 7bdd75e2876..73ebd7aa197 100644 --- a/service/rekognition/api_op_StartProjectVersion.go +++ b/service/rekognition/api_op_StartProjectVersion.go @@ -66,6 +66,9 @@ func addOperationStartProjectVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationStartProjectVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartSegmentDetection.go b/service/rekognition/api_op_StartSegmentDetection.go index 7bc481e115f..d63214eed17 100644 --- a/service/rekognition/api_op_StartSegmentDetection.go +++ b/service/rekognition/api_op_StartSegmentDetection.go @@ -96,6 +96,9 @@ func addOperationStartSegmentDetectionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationStartSegmentDetectionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartStreamProcessor.go b/service/rekognition/api_op_StartStreamProcessor.go index 2487fd274c0..223c03919d3 100644 --- a/service/rekognition/api_op_StartStreamProcessor.go +++ b/service/rekognition/api_op_StartStreamProcessor.go @@ -51,6 +51,9 @@ func addOperationStartStreamProcessorMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationStartStreamProcessorMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StartTextDetection.go b/service/rekognition/api_op_StartTextDetection.go index 10dc17f2d3b..af55950cd7d 100644 --- a/service/rekognition/api_op_StartTextDetection.go +++ b/service/rekognition/api_op_StartTextDetection.go @@ -85,6 +85,9 @@ func addOperationStartTextDetectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationStartTextDetectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StopProjectVersion.go b/service/rekognition/api_op_StopProjectVersion.go index 3a46d492adb..8cc8220ce81 100644 --- a/service/rekognition/api_op_StopProjectVersion.go +++ b/service/rekognition/api_op_StopProjectVersion.go @@ -56,6 +56,9 @@ func addOperationStopProjectVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopProjectVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/api_op_StopStreamProcessor.go b/service/rekognition/api_op_StopStreamProcessor.go index cfb871a69f8..87a53daa870 100644 --- a/service/rekognition/api_op_StopStreamProcessor.go +++ b/service/rekognition/api_op_StopStreamProcessor.go @@ -48,6 +48,9 @@ func addOperationStopStreamProcessorMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopStreamProcessorMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/rekognition/go.mod b/service/rekognition/go.mod index 553cde288b4..3b7946624e8 100644 --- a/service/rekognition/go.mod +++ b/service/rekognition/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/rekognition go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rekognition/go.sum b/service/rekognition/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/rekognition/go.sum +++ b/service/rekognition/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/resourcegroups/api_client.go b/service/resourcegroups/api_client.go index 33f01e9b163..700086f9140 100644 --- a/service/resourcegroups/api_client.go +++ b/service/resourcegroups/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/resourcegroups/api_op_CreateGroup.go b/service/resourcegroups/api_op_CreateGroup.go index 709bf4e706f..d4a5b737184 100644 --- a/service/resourcegroups/api_op_CreateGroup.go +++ b/service/resourcegroups/api_op_CreateGroup.go @@ -91,6 +91,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_DeleteGroup.go b/service/resourcegroups/api_op_DeleteGroup.go index b0329fb29b7..4fd7738a810 100644 --- a/service/resourcegroups/api_op_DeleteGroup.go +++ b/service/resourcegroups/api_op_DeleteGroup.go @@ -56,6 +56,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_GetGroup.go b/service/resourcegroups/api_op_GetGroup.go index 23ea2c2f5cd..fcbac81b606 100644 --- a/service/resourcegroups/api_op_GetGroup.go +++ b/service/resourcegroups/api_op_GetGroup.go @@ -54,6 +54,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_GetGroupConfiguration.go b/service/resourcegroups/api_op_GetGroupConfiguration.go index f3e059413b3..83fcd74e065 100644 --- a/service/resourcegroups/api_op_GetGroupConfiguration.go +++ b/service/resourcegroups/api_op_GetGroupConfiguration.go @@ -58,6 +58,9 @@ func addOperationGetGroupConfigurationMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetGroupConfigurationMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_GetGroupQuery.go b/service/resourcegroups/api_op_GetGroupQuery.go index 19f6e51c882..91a9b81d786 100644 --- a/service/resourcegroups/api_op_GetGroupQuery.go +++ b/service/resourcegroups/api_op_GetGroupQuery.go @@ -54,6 +54,9 @@ func addOperationGetGroupQueryMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetGroupQueryMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_GetTags.go b/service/resourcegroups/api_op_GetTags.go index 5f502a00a26..f49a1721a31 100644 --- a/service/resourcegroups/api_op_GetTags.go +++ b/service/resourcegroups/api_op_GetTags.go @@ -56,6 +56,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_GroupResources.go b/service/resourcegroups/api_op_GroupResources.go index 9222558642c..02b01d09b8a 100644 --- a/service/resourcegroups/api_op_GroupResources.go +++ b/service/resourcegroups/api_op_GroupResources.go @@ -63,6 +63,9 @@ func addOperationGroupResourcesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGroupResourcesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_ListGroupResources.go b/service/resourcegroups/api_op_ListGroupResources.go index 15745aa43ed..6b8ae8dd5bd 100644 --- a/service/resourcegroups/api_op_ListGroupResources.go +++ b/service/resourcegroups/api_op_ListGroupResources.go @@ -107,6 +107,9 @@ func addOperationListGroupResourcesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationListGroupResourcesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_ListGroups.go b/service/resourcegroups/api_op_ListGroups.go index fe76a55e967..8d73eaaf674 100644 --- a/service/resourcegroups/api_op_ListGroups.go +++ b/service/resourcegroups/api_op_ListGroups.go @@ -91,6 +91,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_SearchResources.go b/service/resourcegroups/api_op_SearchResources.go index 7ec99abf4db..2702e8ed89c 100644 --- a/service/resourcegroups/api_op_SearchResources.go +++ b/service/resourcegroups/api_op_SearchResources.go @@ -85,6 +85,9 @@ func addOperationSearchResourcesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationSearchResourcesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_Tag.go b/service/resourcegroups/api_op_Tag.go index ffbd84f955e..9c37bd9575f 100644 --- a/service/resourcegroups/api_op_Tag.go +++ b/service/resourcegroups/api_op_Tag.go @@ -66,6 +66,9 @@ func addOperationTagMiddlewares(stack *middleware.Stack, options Options) (err e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationTagMiddlewares(stack *middleware.Stack, options Options) (err e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_UngroupResources.go b/service/resourcegroups/api_op_UngroupResources.go index a914ea0d438..252c664fd23 100644 --- a/service/resourcegroups/api_op_UngroupResources.go +++ b/service/resourcegroups/api_op_UngroupResources.go @@ -61,6 +61,9 @@ func addOperationUngroupResourcesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUngroupResourcesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_Untag.go b/service/resourcegroups/api_op_Untag.go index fdccc1a2a15..bbb5a8d40bb 100644 --- a/service/resourcegroups/api_op_Untag.go +++ b/service/resourcegroups/api_op_Untag.go @@ -61,6 +61,9 @@ func addOperationUntagMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUntagMiddlewares(stack *middleware.Stack, options Options) (err if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_UpdateGroup.go b/service/resourcegroups/api_op_UpdateGroup.go index 6f63f018f00..60f2ad1f11b 100644 --- a/service/resourcegroups/api_op_UpdateGroup.go +++ b/service/resourcegroups/api_op_UpdateGroup.go @@ -60,6 +60,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/api_op_UpdateGroupQuery.go b/service/resourcegroups/api_op_UpdateGroupQuery.go index ac72c9933c6..c4e92d5e431 100644 --- a/service/resourcegroups/api_op_UpdateGroupQuery.go +++ b/service/resourcegroups/api_op_UpdateGroupQuery.go @@ -60,6 +60,9 @@ func addOperationUpdateGroupQueryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateGroupQueryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroups/go.mod b/service/resourcegroups/go.mod index 07d81caa8de..7dfa72f4ce7 100644 --- a/service/resourcegroups/go.mod +++ b/service/resourcegroups/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/resourcegroups go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resourcegroups/go.sum b/service/resourcegroups/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/resourcegroups/go.sum +++ b/service/resourcegroups/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/resourcegroupstaggingapi/api_client.go b/service/resourcegroupstaggingapi/api_client.go index 8f7e34b256d..ed5f4a214fa 100644 --- a/service/resourcegroupstaggingapi/api_client.go +++ b/service/resourcegroupstaggingapi/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go b/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go index 11d6fc91cee..a659b452f03 100644 --- a/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go +++ b/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go @@ -71,6 +71,9 @@ func addOperationDescribeReportCreationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeReportCreationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go b/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go index 1710e2f79cf..dccf77dc1df 100644 --- a/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go +++ b/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go @@ -110,6 +110,9 @@ func addOperationGetComplianceSummaryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationGetComplianceSummaryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_GetResources.go b/service/resourcegroupstaggingapi/api_op_GetResources.go index 235505b93c0..0472b5ec925 100644 --- a/service/resourcegroupstaggingapi/api_op_GetResources.go +++ b/service/resourcegroupstaggingapi/api_op_GetResources.go @@ -173,6 +173,9 @@ func addOperationGetResourcesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -212,6 +215,9 @@ func addOperationGetResourcesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_GetTagKeys.go b/service/resourcegroupstaggingapi/api_op_GetTagKeys.go index 8ef073d8bf7..b225de4e7c4 100644 --- a/service/resourcegroupstaggingapi/api_op_GetTagKeys.go +++ b/service/resourcegroupstaggingapi/api_op_GetTagKeys.go @@ -58,6 +58,9 @@ func addOperationGetTagKeysMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetTagKeysMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_GetTagValues.go b/service/resourcegroupstaggingapi/api_op_GetTagValues.go index 4ffa193f584..0d87752a40b 100644 --- a/service/resourcegroupstaggingapi/api_op_GetTagValues.go +++ b/service/resourcegroupstaggingapi/api_op_GetTagValues.go @@ -66,6 +66,9 @@ func addOperationGetTagValuesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetTagValuesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_StartReportCreation.go b/service/resourcegroupstaggingapi/api_op_StartReportCreation.go index 3f2c6594ddb..866d7a3bea1 100644 --- a/service/resourcegroupstaggingapi/api_op_StartReportCreation.go +++ b/service/resourcegroupstaggingapi/api_op_StartReportCreation.go @@ -56,6 +56,9 @@ func addOperationStartReportCreationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartReportCreationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_TagResources.go b/service/resourcegroupstaggingapi/api_op_TagResources.go index 7269aa1e3cb..e6e526ca646 100644 --- a/service/resourcegroupstaggingapi/api_op_TagResources.go +++ b/service/resourcegroupstaggingapi/api_op_TagResources.go @@ -91,6 +91,9 @@ func addOperationTagResourcesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationTagResourcesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/api_op_UntagResources.go b/service/resourcegroupstaggingapi/api_op_UntagResources.go index 92320e9a38b..27e7504d8e7 100644 --- a/service/resourcegroupstaggingapi/api_op_UntagResources.go +++ b/service/resourcegroupstaggingapi/api_op_UntagResources.go @@ -75,6 +75,9 @@ func addOperationUntagResourcesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUntagResourcesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/resourcegroupstaggingapi/go.mod b/service/resourcegroupstaggingapi/go.mod index 908fd01f6d2..23da863b444 100644 --- a/service/resourcegroupstaggingapi/go.mod +++ b/service/resourcegroupstaggingapi/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resourcegroupstaggingapi/go.sum b/service/resourcegroupstaggingapi/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/resourcegroupstaggingapi/go.sum +++ b/service/resourcegroupstaggingapi/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/robomaker/api_client.go b/service/robomaker/api_client.go index 271a9c8851a..538706f894d 100644 --- a/service/robomaker/api_client.go +++ b/service/robomaker/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/robomaker/api_op_BatchDeleteWorlds.go b/service/robomaker/api_op_BatchDeleteWorlds.go index 38ce339e229..70b679eabaa 100644 --- a/service/robomaker/api_op_BatchDeleteWorlds.go +++ b/service/robomaker/api_op_BatchDeleteWorlds.go @@ -53,6 +53,9 @@ func addOperationBatchDeleteWorldsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationBatchDeleteWorldsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_BatchDescribeSimulationJob.go b/service/robomaker/api_op_BatchDescribeSimulationJob.go index 22b4aaf6685..8b6db6fbce4 100644 --- a/service/robomaker/api_op_BatchDescribeSimulationJob.go +++ b/service/robomaker/api_op_BatchDescribeSimulationJob.go @@ -56,6 +56,9 @@ func addOperationBatchDescribeSimulationJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchDescribeSimulationJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CancelDeploymentJob.go b/service/robomaker/api_op_CancelDeploymentJob.go index f004aa33e75..71fa341ec72 100644 --- a/service/robomaker/api_op_CancelDeploymentJob.go +++ b/service/robomaker/api_op_CancelDeploymentJob.go @@ -48,6 +48,9 @@ func addOperationCancelDeploymentJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationCancelDeploymentJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CancelSimulationJob.go b/service/robomaker/api_op_CancelSimulationJob.go index c293eb6e467..ed3cef6034a 100644 --- a/service/robomaker/api_op_CancelSimulationJob.go +++ b/service/robomaker/api_op_CancelSimulationJob.go @@ -48,6 +48,9 @@ func addOperationCancelSimulationJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationCancelSimulationJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CancelSimulationJobBatch.go b/service/robomaker/api_op_CancelSimulationJobBatch.go index e2de64babee..8562f03f46e 100644 --- a/service/robomaker/api_op_CancelSimulationJobBatch.go +++ b/service/robomaker/api_op_CancelSimulationJobBatch.go @@ -49,6 +49,9 @@ func addOperationCancelSimulationJobBatchMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationCancelSimulationJobBatchMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CancelWorldExportJob.go b/service/robomaker/api_op_CancelWorldExportJob.go index 2abd130b0e0..276fed8f338 100644 --- a/service/robomaker/api_op_CancelWorldExportJob.go +++ b/service/robomaker/api_op_CancelWorldExportJob.go @@ -48,6 +48,9 @@ func addOperationCancelWorldExportJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationCancelWorldExportJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CancelWorldGenerationJob.go b/service/robomaker/api_op_CancelWorldGenerationJob.go index 5b5882a20a1..e1a81e31d1a 100644 --- a/service/robomaker/api_op_CancelWorldGenerationJob.go +++ b/service/robomaker/api_op_CancelWorldGenerationJob.go @@ -48,6 +48,9 @@ func addOperationCancelWorldGenerationJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationCancelWorldGenerationJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateDeploymentJob.go b/service/robomaker/api_op_CreateDeploymentJob.go index 3ff11f07c88..ba6d57b9165 100644 --- a/service/robomaker/api_op_CreateDeploymentJob.go +++ b/service/robomaker/api_op_CreateDeploymentJob.go @@ -123,6 +123,9 @@ func addOperationCreateDeploymentJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationCreateDeploymentJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateFleet.go b/service/robomaker/api_op_CreateFleet.go index 8c0dbb07b1b..4868d367dd6 100644 --- a/service/robomaker/api_op_CreateFleet.go +++ b/service/robomaker/api_op_CreateFleet.go @@ -65,6 +65,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateRobot.go b/service/robomaker/api_op_CreateRobot.go index 95c78c368c1..4a362be3984 100644 --- a/service/robomaker/api_op_CreateRobot.go +++ b/service/robomaker/api_op_CreateRobot.go @@ -83,6 +83,9 @@ func addOperationCreateRobotMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateRobotMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateRobotApplication.go b/service/robomaker/api_op_CreateRobotApplication.go index fa03a6caf38..f860388a220 100644 --- a/service/robomaker/api_op_CreateRobotApplication.go +++ b/service/robomaker/api_op_CreateRobotApplication.go @@ -90,6 +90,9 @@ func addOperationCreateRobotApplicationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateRobotApplicationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateRobotApplicationVersion.go b/service/robomaker/api_op_CreateRobotApplicationVersion.go index b920ba45701..e856d6b25e5 100644 --- a/service/robomaker/api_op_CreateRobotApplicationVersion.go +++ b/service/robomaker/api_op_CreateRobotApplicationVersion.go @@ -77,6 +77,9 @@ func addOperationCreateRobotApplicationVersionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationCreateRobotApplicationVersionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateSimulationApplication.go b/service/robomaker/api_op_CreateSimulationApplication.go index 3c12dd8a41e..38ee493b412 100644 --- a/service/robomaker/api_op_CreateSimulationApplication.go +++ b/service/robomaker/api_op_CreateSimulationApplication.go @@ -104,6 +104,9 @@ func addOperationCreateSimulationApplicationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateSimulationApplicationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateSimulationApplicationVersion.go b/service/robomaker/api_op_CreateSimulationApplicationVersion.go index 12f024ff08d..0ca604e75fb 100644 --- a/service/robomaker/api_op_CreateSimulationApplicationVersion.go +++ b/service/robomaker/api_op_CreateSimulationApplicationVersion.go @@ -83,6 +83,9 @@ func addOperationCreateSimulationApplicationVersionMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateSimulationApplicationVersionMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateSimulationJob.go b/service/robomaker/api_op_CreateSimulationJob.go index d3a4b3117f4..ebd26ff6132 100644 --- a/service/robomaker/api_op_CreateSimulationJob.go +++ b/service/robomaker/api_op_CreateSimulationJob.go @@ -173,6 +173,9 @@ func addOperationCreateSimulationJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -218,6 +221,9 @@ func addOperationCreateSimulationJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateWorldExportJob.go b/service/robomaker/api_op_CreateWorldExportJob.go index 4e9c158314e..d603e9623d0 100644 --- a/service/robomaker/api_op_CreateWorldExportJob.go +++ b/service/robomaker/api_op_CreateWorldExportJob.go @@ -108,6 +108,9 @@ func addOperationCreateWorldExportJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationCreateWorldExportJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateWorldGenerationJob.go b/service/robomaker/api_op_CreateWorldGenerationJob.go index 287a192ee76..f146c96999d 100644 --- a/service/robomaker/api_op_CreateWorldGenerationJob.go +++ b/service/robomaker/api_op_CreateWorldGenerationJob.go @@ -103,6 +103,9 @@ func addOperationCreateWorldGenerationJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationCreateWorldGenerationJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_CreateWorldTemplate.go b/service/robomaker/api_op_CreateWorldTemplate.go index f78faca32bb..8944ec42bbd 100644 --- a/service/robomaker/api_op_CreateWorldTemplate.go +++ b/service/robomaker/api_op_CreateWorldTemplate.go @@ -80,6 +80,9 @@ func addOperationCreateWorldTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateWorldTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DeleteFleet.go b/service/robomaker/api_op_DeleteFleet.go index fa66276078c..a2a24fdaa9c 100644 --- a/service/robomaker/api_op_DeleteFleet.go +++ b/service/robomaker/api_op_DeleteFleet.go @@ -48,6 +48,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DeleteRobot.go b/service/robomaker/api_op_DeleteRobot.go index 49dee1a2f30..a449a0738b2 100644 --- a/service/robomaker/api_op_DeleteRobot.go +++ b/service/robomaker/api_op_DeleteRobot.go @@ -48,6 +48,9 @@ func addOperationDeleteRobotMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteRobotMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DeleteRobotApplication.go b/service/robomaker/api_op_DeleteRobotApplication.go index bacc586d062..a927fe1562a 100644 --- a/service/robomaker/api_op_DeleteRobotApplication.go +++ b/service/robomaker/api_op_DeleteRobotApplication.go @@ -51,6 +51,9 @@ func addOperationDeleteRobotApplicationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteRobotApplicationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DeleteSimulationApplication.go b/service/robomaker/api_op_DeleteSimulationApplication.go index be7d36a070f..41b2cc68a0e 100644 --- a/service/robomaker/api_op_DeleteSimulationApplication.go +++ b/service/robomaker/api_op_DeleteSimulationApplication.go @@ -51,6 +51,9 @@ func addOperationDeleteSimulationApplicationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteSimulationApplicationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DeleteWorldTemplate.go b/service/robomaker/api_op_DeleteWorldTemplate.go index 87c5abc3133..2f1e47b4e68 100644 --- a/service/robomaker/api_op_DeleteWorldTemplate.go +++ b/service/robomaker/api_op_DeleteWorldTemplate.go @@ -48,6 +48,9 @@ func addOperationDeleteWorldTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteWorldTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DeregisterRobot.go b/service/robomaker/api_op_DeregisterRobot.go index 59358caf7a7..2e69e4adbbc 100644 --- a/service/robomaker/api_op_DeregisterRobot.go +++ b/service/robomaker/api_op_DeregisterRobot.go @@ -60,6 +60,9 @@ func addOperationDeregisterRobotMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeregisterRobotMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeDeploymentJob.go b/service/robomaker/api_op_DescribeDeploymentJob.go index b9fda6894dd..d1a5a7015c2 100644 --- a/service/robomaker/api_op_DescribeDeploymentJob.go +++ b/service/robomaker/api_op_DescribeDeploymentJob.go @@ -81,6 +81,9 @@ func addOperationDescribeDeploymentJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeDeploymentJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeFleet.go b/service/robomaker/api_op_DescribeFleet.go index 3f03a73e723..73187f32b03 100644 --- a/service/robomaker/api_op_DescribeFleet.go +++ b/service/robomaker/api_op_DescribeFleet.go @@ -75,6 +75,9 @@ func addOperationDescribeFleetMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeFleetMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeRobot.go b/service/robomaker/api_op_DescribeRobot.go index be555807488..95f39b77eb2 100644 --- a/service/robomaker/api_op_DescribeRobot.go +++ b/service/robomaker/api_op_DescribeRobot.go @@ -81,6 +81,9 @@ func addOperationDescribeRobotMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeRobotMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeRobotApplication.go b/service/robomaker/api_op_DescribeRobotApplication.go index 2ec5971bf1b..92c8669aa75 100644 --- a/service/robomaker/api_op_DescribeRobotApplication.go +++ b/service/robomaker/api_op_DescribeRobotApplication.go @@ -79,6 +79,9 @@ func addOperationDescribeRobotApplicationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeRobotApplicationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeSimulationApplication.go b/service/robomaker/api_op_DescribeSimulationApplication.go index 036bb4c5a4e..ab8ce7ccf61 100644 --- a/service/robomaker/api_op_DescribeSimulationApplication.go +++ b/service/robomaker/api_op_DescribeSimulationApplication.go @@ -85,6 +85,9 @@ func addOperationDescribeSimulationApplicationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeSimulationApplicationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeSimulationJob.go b/service/robomaker/api_op_DescribeSimulationJob.go index 2051c4374a4..2ce44c922d4 100644 --- a/service/robomaker/api_op_DescribeSimulationJob.go +++ b/service/robomaker/api_op_DescribeSimulationJob.go @@ -136,6 +136,9 @@ func addOperationDescribeSimulationJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationDescribeSimulationJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeSimulationJobBatch.go b/service/robomaker/api_op_DescribeSimulationJobBatch.go index 9a677441cde..1012b9d5735 100644 --- a/service/robomaker/api_op_DescribeSimulationJobBatch.go +++ b/service/robomaker/api_op_DescribeSimulationJobBatch.go @@ -107,6 +107,9 @@ func addOperationDescribeSimulationJobBatchMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationDescribeSimulationJobBatchMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeWorld.go b/service/robomaker/api_op_DescribeWorld.go index bb3d98fefe4..5ce118a329f 100644 --- a/service/robomaker/api_op_DescribeWorld.go +++ b/service/robomaker/api_op_DescribeWorld.go @@ -66,6 +66,9 @@ func addOperationDescribeWorldMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeWorldMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeWorldExportJob.go b/service/robomaker/api_op_DescribeWorldExportJob.go index 5b95dbc315c..f961e76c480 100644 --- a/service/robomaker/api_op_DescribeWorldExportJob.go +++ b/service/robomaker/api_op_DescribeWorldExportJob.go @@ -94,6 +94,9 @@ func addOperationDescribeWorldExportJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDescribeWorldExportJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeWorldGenerationJob.go b/service/robomaker/api_op_DescribeWorldGenerationJob.go index fdd409ee488..1d532563f5f 100644 --- a/service/robomaker/api_op_DescribeWorldGenerationJob.go +++ b/service/robomaker/api_op_DescribeWorldGenerationJob.go @@ -94,6 +94,9 @@ func addOperationDescribeWorldGenerationJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDescribeWorldGenerationJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_DescribeWorldTemplate.go b/service/robomaker/api_op_DescribeWorldTemplate.go index c9c24c7887b..453b1364368 100644 --- a/service/robomaker/api_op_DescribeWorldTemplate.go +++ b/service/robomaker/api_op_DescribeWorldTemplate.go @@ -71,6 +71,9 @@ func addOperationDescribeWorldTemplateMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeWorldTemplateMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_GetWorldTemplateBody.go b/service/robomaker/api_op_GetWorldTemplateBody.go index 95aeeb45fd7..50b42043c4e 100644 --- a/service/robomaker/api_op_GetWorldTemplateBody.go +++ b/service/robomaker/api_op_GetWorldTemplateBody.go @@ -53,6 +53,9 @@ func addOperationGetWorldTemplateBodyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetWorldTemplateBodyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListDeploymentJobs.go b/service/robomaker/api_op_ListDeploymentJobs.go index 54f81684674..b573cab055f 100644 --- a/service/robomaker/api_op_ListDeploymentJobs.go +++ b/service/robomaker/api_op_ListDeploymentJobs.go @@ -78,6 +78,9 @@ func addOperationListDeploymentJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListDeploymentJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListFleets.go b/service/robomaker/api_op_ListFleets.go index 00e76ab4efe..8520343412e 100644 --- a/service/robomaker/api_op_ListFleets.go +++ b/service/robomaker/api_op_ListFleets.go @@ -78,6 +78,9 @@ func addOperationListFleetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListFleetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListRobotApplications.go b/service/robomaker/api_op_ListRobotApplications.go index ce6450460c0..da40a6860ea 100644 --- a/service/robomaker/api_op_ListRobotApplications.go +++ b/service/robomaker/api_op_ListRobotApplications.go @@ -79,6 +79,9 @@ func addOperationListRobotApplicationsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListRobotApplicationsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListRobots.go b/service/robomaker/api_op_ListRobots.go index f082a653fa1..207d1d00dee 100644 --- a/service/robomaker/api_op_ListRobots.go +++ b/service/robomaker/api_op_ListRobots.go @@ -78,6 +78,9 @@ func addOperationListRobotsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListRobotsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListSimulationApplications.go b/service/robomaker/api_op_ListSimulationApplications.go index 34c2667f2b5..219390796f5 100644 --- a/service/robomaker/api_op_ListSimulationApplications.go +++ b/service/robomaker/api_op_ListSimulationApplications.go @@ -81,6 +81,9 @@ func addOperationListSimulationApplicationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListSimulationApplicationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListSimulationJobBatches.go b/service/robomaker/api_op_ListSimulationJobBatches.go index e7350213d4c..483065bc1e2 100644 --- a/service/robomaker/api_op_ListSimulationJobBatches.go +++ b/service/robomaker/api_op_ListSimulationJobBatches.go @@ -72,6 +72,9 @@ func addOperationListSimulationJobBatchesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListSimulationJobBatchesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListSimulationJobs.go b/service/robomaker/api_op_ListSimulationJobs.go index 37dceda6d99..6b15e610399 100644 --- a/service/robomaker/api_op_ListSimulationJobs.go +++ b/service/robomaker/api_op_ListSimulationJobs.go @@ -80,6 +80,9 @@ func addOperationListSimulationJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListSimulationJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListTagsForResource.go b/service/robomaker/api_op_ListTagsForResource.go index 2d7163684fd..6f45d91043c 100644 --- a/service/robomaker/api_op_ListTagsForResource.go +++ b/service/robomaker/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListWorldExportJobs.go b/service/robomaker/api_op_ListWorldExportJobs.go index dd68930694d..2f99f4abce3 100644 --- a/service/robomaker/api_op_ListWorldExportJobs.go +++ b/service/robomaker/api_op_ListWorldExportJobs.go @@ -75,6 +75,9 @@ func addOperationListWorldExportJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListWorldExportJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListWorldGenerationJobs.go b/service/robomaker/api_op_ListWorldGenerationJobs.go index a1669c8d529..4d88295c219 100644 --- a/service/robomaker/api_op_ListWorldGenerationJobs.go +++ b/service/robomaker/api_op_ListWorldGenerationJobs.go @@ -77,6 +77,9 @@ func addOperationListWorldGenerationJobsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListWorldGenerationJobsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListWorldTemplates.go b/service/robomaker/api_op_ListWorldTemplates.go index e1840b4c186..3d1ea63a391 100644 --- a/service/robomaker/api_op_ListWorldTemplates.go +++ b/service/robomaker/api_op_ListWorldTemplates.go @@ -70,6 +70,9 @@ func addOperationListWorldTemplatesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListWorldTemplatesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_ListWorlds.go b/service/robomaker/api_op_ListWorlds.go index eff51357f4b..53ebfe8968e 100644 --- a/service/robomaker/api_op_ListWorlds.go +++ b/service/robomaker/api_op_ListWorlds.go @@ -73,6 +73,9 @@ func addOperationListWorldsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListWorldsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_RegisterRobot.go b/service/robomaker/api_op_RegisterRobot.go index 5c99eac6286..5e79ade11db 100644 --- a/service/robomaker/api_op_RegisterRobot.go +++ b/service/robomaker/api_op_RegisterRobot.go @@ -60,6 +60,9 @@ func addOperationRegisterRobotMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRegisterRobotMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_RestartSimulationJob.go b/service/robomaker/api_op_RestartSimulationJob.go index c6fa4612794..c62e3c49dbb 100644 --- a/service/robomaker/api_op_RestartSimulationJob.go +++ b/service/robomaker/api_op_RestartSimulationJob.go @@ -48,6 +48,9 @@ func addOperationRestartSimulationJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationRestartSimulationJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_StartSimulationJobBatch.go b/service/robomaker/api_op_StartSimulationJobBatch.go index d768e032324..46fb0f15072 100644 --- a/service/robomaker/api_op_StartSimulationJobBatch.go +++ b/service/robomaker/api_op_StartSimulationJobBatch.go @@ -117,6 +117,9 @@ func addOperationStartSimulationJobBatchMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationStartSimulationJobBatchMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_SyncDeploymentJob.go b/service/robomaker/api_op_SyncDeploymentJob.go index 55edda45eac..518084cc907 100644 --- a/service/robomaker/api_op_SyncDeploymentJob.go +++ b/service/robomaker/api_op_SyncDeploymentJob.go @@ -98,6 +98,9 @@ func addOperationSyncDeploymentJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationSyncDeploymentJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_TagResource.go b/service/robomaker/api_op_TagResource.go index 4eef7e040c7..3a82455cd89 100644 --- a/service/robomaker/api_op_TagResource.go +++ b/service/robomaker/api_op_TagResource.go @@ -58,6 +58,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_UntagResource.go b/service/robomaker/api_op_UntagResource.go index c18bb3f6985..4d0da36a5bd 100644 --- a/service/robomaker/api_op_UntagResource.go +++ b/service/robomaker/api_op_UntagResource.go @@ -58,6 +58,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_UpdateRobotApplication.go b/service/robomaker/api_op_UpdateRobotApplication.go index d0bd93c11c7..e8923d74cda 100644 --- a/service/robomaker/api_op_UpdateRobotApplication.go +++ b/service/robomaker/api_op_UpdateRobotApplication.go @@ -86,6 +86,9 @@ func addOperationUpdateRobotApplicationMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationUpdateRobotApplicationMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_UpdateSimulationApplication.go b/service/robomaker/api_op_UpdateSimulationApplication.go index 418e38ad298..9f5781ab8a8 100644 --- a/service/robomaker/api_op_UpdateSimulationApplication.go +++ b/service/robomaker/api_op_UpdateSimulationApplication.go @@ -100,6 +100,9 @@ func addOperationUpdateSimulationApplicationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationUpdateSimulationApplicationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/api_op_UpdateWorldTemplate.go b/service/robomaker/api_op_UpdateWorldTemplate.go index fc9810cdac7..4deaf3bfbb8 100644 --- a/service/robomaker/api_op_UpdateWorldTemplate.go +++ b/service/robomaker/api_op_UpdateWorldTemplate.go @@ -73,6 +73,9 @@ func addOperationUpdateWorldTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateWorldTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/robomaker/go.mod b/service/robomaker/go.mod index 5057a153aaa..1f8f910250e 100644 --- a/service/robomaker/go.mod +++ b/service/robomaker/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/robomaker go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/robomaker/go.sum b/service/robomaker/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/robomaker/go.sum +++ b/service/robomaker/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/route53/api_client.go b/service/route53/api_client.go index 378ac3b6b27..fc6110f74ad 100644 --- a/service/route53/api_client.go +++ b/service/route53/api_client.go @@ -11,6 +11,7 @@ import ( awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" route53cust "github.com/aws/aws-sdk-go-v2/service/route53/internal/customizations" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -57,6 +60,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -69,6 +75,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -123,14 +132,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -169,21 +191,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -392,3 +415,12 @@ func sanitizeHostedZoneIDInput(input interface{}) error { } return nil } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/route53/api_op_AssociateVPCWithHostedZone.go b/service/route53/api_op_AssociateVPCWithHostedZone.go index 9027ff341dd..ba07348a9f2 100644 --- a/service/route53/api_op_AssociateVPCWithHostedZone.go +++ b/service/route53/api_op_AssociateVPCWithHostedZone.go @@ -77,6 +77,9 @@ func addOperationAssociateVPCWithHostedZoneMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationAssociateVPCWithHostedZoneMiddlewares(stack *middleware.Stack, if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ChangeResourceRecordSets.go b/service/route53/api_op_ChangeResourceRecordSets.go index 1b18332fb5e..3609cf56572 100644 --- a/service/route53/api_op_ChangeResourceRecordSets.go +++ b/service/route53/api_op_ChangeResourceRecordSets.go @@ -127,6 +127,9 @@ func addOperationChangeResourceRecordSetsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationChangeResourceRecordSetsMiddlewares(stack *middleware.Stack, op if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ChangeTagsForResource.go b/service/route53/api_op_ChangeTagsForResource.go index 849ddcb046b..899eb5b0fe0 100644 --- a/service/route53/api_op_ChangeTagsForResource.go +++ b/service/route53/api_op_ChangeTagsForResource.go @@ -74,6 +74,9 @@ func addOperationChangeTagsForResourceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationChangeTagsForResourceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateHealthCheck.go b/service/route53/api_op_CreateHealthCheck.go index 172e04ad033..4fd13228675 100644 --- a/service/route53/api_op_CreateHealthCheck.go +++ b/service/route53/api_op_CreateHealthCheck.go @@ -115,6 +115,9 @@ func addOperationCreateHealthCheckMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationCreateHealthCheckMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateHostedZone.go b/service/route53/api_op_CreateHostedZone.go index efd5b191ffd..4f41dc52ff5 100644 --- a/service/route53/api_op_CreateHostedZone.go +++ b/service/route53/api_op_CreateHostedZone.go @@ -155,6 +155,9 @@ func addOperationCreateHostedZoneMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationCreateHostedZoneMiddlewares(stack *middleware.Stack, options Op if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateQueryLoggingConfig.go b/service/route53/api_op_CreateQueryLoggingConfig.go index 6f7a2ca6129..931bd351cd1 100644 --- a/service/route53/api_op_CreateQueryLoggingConfig.go +++ b/service/route53/api_op_CreateQueryLoggingConfig.go @@ -163,6 +163,9 @@ func addOperationCreateQueryLoggingConfigMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -208,6 +211,9 @@ func addOperationCreateQueryLoggingConfigMiddlewares(stack *middleware.Stack, op if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateReusableDelegationSet.go b/service/route53/api_op_CreateReusableDelegationSet.go index 8e5d7f6b691..ec9c88c4d60 100644 --- a/service/route53/api_op_CreateReusableDelegationSet.go +++ b/service/route53/api_op_CreateReusableDelegationSet.go @@ -115,6 +115,9 @@ func addOperationCreateReusableDelegationSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateReusableDelegationSetMiddlewares(stack *middleware.Stack, if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateTrafficPolicy.go b/service/route53/api_op_CreateTrafficPolicy.go index 2e49a9bfa02..9ef8d0c8dee 100644 --- a/service/route53/api_op_CreateTrafficPolicy.go +++ b/service/route53/api_op_CreateTrafficPolicy.go @@ -76,6 +76,9 @@ func addOperationCreateTrafficPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateTrafficPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateTrafficPolicyInstance.go b/service/route53/api_op_CreateTrafficPolicyInstance.go index 85434b29527..30f7ba6b093 100644 --- a/service/route53/api_op_CreateTrafficPolicyInstance.go +++ b/service/route53/api_op_CreateTrafficPolicyInstance.go @@ -95,6 +95,9 @@ func addOperationCreateTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateTrafficPolicyVersion.go b/service/route53/api_op_CreateTrafficPolicyVersion.go index a2252c48282..eebac707818 100644 --- a/service/route53/api_op_CreateTrafficPolicyVersion.go +++ b/service/route53/api_op_CreateTrafficPolicyVersion.go @@ -83,6 +83,9 @@ func addOperationCreateTrafficPolicyVersionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateTrafficPolicyVersionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_CreateVPCAssociationAuthorization.go b/service/route53/api_op_CreateVPCAssociationAuthorization.go index 55916ba183c..df7e925da30 100644 --- a/service/route53/api_op_CreateVPCAssociationAuthorization.go +++ b/service/route53/api_op_CreateVPCAssociationAuthorization.go @@ -80,6 +80,9 @@ func addOperationCreateVPCAssociationAuthorizationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateVPCAssociationAuthorizationMiddlewares(stack *middleware. if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteHealthCheck.go b/service/route53/api_op_DeleteHealthCheck.go index 50d681895a4..d286c8a6c74 100644 --- a/service/route53/api_op_DeleteHealthCheck.go +++ b/service/route53/api_op_DeleteHealthCheck.go @@ -63,6 +63,9 @@ func addOperationDeleteHealthCheckMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteHealthCheckMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteHostedZone.go b/service/route53/api_op_DeleteHostedZone.go index eccb1503ac1..a1d08a50421 100644 --- a/service/route53/api_op_DeleteHostedZone.go +++ b/service/route53/api_op_DeleteHostedZone.go @@ -97,6 +97,9 @@ func addOperationDeleteHostedZoneMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationDeleteHostedZoneMiddlewares(stack *middleware.Stack, options Op if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteQueryLoggingConfig.go b/service/route53/api_op_DeleteQueryLoggingConfig.go index 097bf8464ae..8bdee20197a 100644 --- a/service/route53/api_op_DeleteQueryLoggingConfig.go +++ b/service/route53/api_op_DeleteQueryLoggingConfig.go @@ -52,6 +52,9 @@ func addOperationDeleteQueryLoggingConfigMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteQueryLoggingConfigMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteReusableDelegationSet.go b/service/route53/api_op_DeleteReusableDelegationSet.go index f7807e80dd4..2d5a0996abb 100644 --- a/service/route53/api_op_DeleteReusableDelegationSet.go +++ b/service/route53/api_op_DeleteReusableDelegationSet.go @@ -56,6 +56,9 @@ func addOperationDeleteReusableDelegationSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteReusableDelegationSetMiddlewares(stack *middleware.Stack, if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteTrafficPolicy.go b/service/route53/api_op_DeleteTrafficPolicy.go index 71aa47f933a..f49c4d5b21c 100644 --- a/service/route53/api_op_DeleteTrafficPolicy.go +++ b/service/route53/api_op_DeleteTrafficPolicy.go @@ -69,6 +69,9 @@ func addOperationDeleteTrafficPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteTrafficPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteTrafficPolicyInstance.go b/service/route53/api_op_DeleteTrafficPolicyInstance.go index 74c36ed37b4..c80e6cab1b6 100644 --- a/service/route53/api_op_DeleteTrafficPolicyInstance.go +++ b/service/route53/api_op_DeleteTrafficPolicyInstance.go @@ -54,6 +54,9 @@ func addOperationDeleteTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DeleteVPCAssociationAuthorization.go b/service/route53/api_op_DeleteVPCAssociationAuthorization.go index 8e8d742d9bf..ad61a6f0509 100644 --- a/service/route53/api_op_DeleteVPCAssociationAuthorization.go +++ b/service/route53/api_op_DeleteVPCAssociationAuthorization.go @@ -70,6 +70,9 @@ func addOperationDeleteVPCAssociationAuthorizationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteVPCAssociationAuthorizationMiddlewares(stack *middleware. if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_DisassociateVPCFromHostedZone.go b/service/route53/api_op_DisassociateVPCFromHostedZone.go index f41e6103c4d..217a12074a3 100644 --- a/service/route53/api_op_DisassociateVPCFromHostedZone.go +++ b/service/route53/api_op_DisassociateVPCFromHostedZone.go @@ -91,6 +91,9 @@ func addOperationDisassociateVPCFromHostedZoneMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDisassociateVPCFromHostedZoneMiddlewares(stack *middleware.Stac if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetAccountLimit.go b/service/route53/api_op_GetAccountLimit.go index 00ffaeb5919..6355a388391 100644 --- a/service/route53/api_op_GetAccountLimit.go +++ b/service/route53/api_op_GetAccountLimit.go @@ -99,6 +99,9 @@ func addOperationGetAccountLimitMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationGetAccountLimitMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetChange.go b/service/route53/api_op_GetChange.go index 98ad3f7d28d..f36dfd26de5 100644 --- a/service/route53/api_op_GetChange.go +++ b/service/route53/api_op_GetChange.go @@ -67,6 +67,9 @@ func addOperationGetChangeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetChangeMiddlewares(stack *middleware.Stack, options Options) if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetCheckerIpRanges.go b/service/route53/api_op_GetCheckerIpRanges.go index 6a33247328b..9651a21980c 100644 --- a/service/route53/api_op_GetCheckerIpRanges.go +++ b/service/route53/api_op_GetCheckerIpRanges.go @@ -56,6 +56,9 @@ func addOperationGetCheckerIpRangesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetCheckerIpRangesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetGeoLocation.go b/service/route53/api_op_GetGeoLocation.go index f047c0485fd..662ddc19e08 100644 --- a/service/route53/api_op_GetGeoLocation.go +++ b/service/route53/api_op_GetGeoLocation.go @@ -94,6 +94,9 @@ func addOperationGetGeoLocationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetGeoLocationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHealthCheck.go b/service/route53/api_op_GetHealthCheck.go index c20e7d6da60..eb3a8fb5486 100644 --- a/service/route53/api_op_GetHealthCheck.go +++ b/service/route53/api_op_GetHealthCheck.go @@ -60,6 +60,9 @@ func addOperationGetHealthCheckMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetHealthCheckMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHealthCheckCount.go b/service/route53/api_op_GetHealthCheckCount.go index 01983e9a030..5f0a8983b3e 100644 --- a/service/route53/api_op_GetHealthCheckCount.go +++ b/service/route53/api_op_GetHealthCheckCount.go @@ -53,6 +53,9 @@ func addOperationGetHealthCheckCountMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetHealthCheckCountMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHealthCheckLastFailureReason.go b/service/route53/api_op_GetHealthCheckLastFailureReason.go index ec038427e7e..fae7217fd50 100644 --- a/service/route53/api_op_GetHealthCheckLastFailureReason.go +++ b/service/route53/api_op_GetHealthCheckLastFailureReason.go @@ -64,6 +64,9 @@ func addOperationGetHealthCheckLastFailureReasonMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetHealthCheckLastFailureReasonMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHealthCheckStatus.go b/service/route53/api_op_GetHealthCheckStatus.go index 1e18c601880..2b9318478d4 100644 --- a/service/route53/api_op_GetHealthCheckStatus.go +++ b/service/route53/api_op_GetHealthCheckStatus.go @@ -63,6 +63,9 @@ func addOperationGetHealthCheckStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetHealthCheckStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHostedZone.go b/service/route53/api_op_GetHostedZone.go index 143a0e7864d..0c8e00ea736 100644 --- a/service/route53/api_op_GetHostedZone.go +++ b/service/route53/api_op_GetHostedZone.go @@ -67,6 +67,9 @@ func addOperationGetHostedZoneMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetHostedZoneMiddlewares(stack *middleware.Stack, options Optio if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHostedZoneCount.go b/service/route53/api_op_GetHostedZoneCount.go index 39834d979e2..ad85dc3e026 100644 --- a/service/route53/api_op_GetHostedZoneCount.go +++ b/service/route53/api_op_GetHostedZoneCount.go @@ -54,6 +54,9 @@ func addOperationGetHostedZoneCountMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetHostedZoneCountMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetHostedZoneLimit.go b/service/route53/api_op_GetHostedZoneLimit.go index 6f099f40826..29106e1b4a1 100644 --- a/service/route53/api_op_GetHostedZoneLimit.go +++ b/service/route53/api_op_GetHostedZoneLimit.go @@ -85,6 +85,9 @@ func addOperationGetHostedZoneLimitMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetHostedZoneLimitMiddlewares(stack *middleware.Stack, options if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetQueryLoggingConfig.go b/service/route53/api_op_GetQueryLoggingConfig.go index 46c58eab9aa..35ed7c17e34 100644 --- a/service/route53/api_op_GetQueryLoggingConfig.go +++ b/service/route53/api_op_GetQueryLoggingConfig.go @@ -63,6 +63,9 @@ func addOperationGetQueryLoggingConfigMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetQueryLoggingConfigMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetReusableDelegationSet.go b/service/route53/api_op_GetReusableDelegationSet.go index d6685ee64a7..e004ab94236 100644 --- a/service/route53/api_op_GetReusableDelegationSet.go +++ b/service/route53/api_op_GetReusableDelegationSet.go @@ -60,6 +60,9 @@ func addOperationGetReusableDelegationSetMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetReusableDelegationSetMiddlewares(stack *middleware.Stack, op if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetReusableDelegationSetLimit.go b/service/route53/api_op_GetReusableDelegationSetLimit.go index bb613c28af5..5b66b6243d2 100644 --- a/service/route53/api_op_GetReusableDelegationSetLimit.go +++ b/service/route53/api_op_GetReusableDelegationSetLimit.go @@ -75,6 +75,9 @@ func addOperationGetReusableDelegationSetLimitMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetReusableDelegationSetLimitMiddlewares(stack *middleware.Stac if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetTrafficPolicy.go b/service/route53/api_op_GetTrafficPolicy.go index d29d2d77b4e..1315b564dda 100644 --- a/service/route53/api_op_GetTrafficPolicy.go +++ b/service/route53/api_op_GetTrafficPolicy.go @@ -65,6 +65,9 @@ func addOperationGetTrafficPolicyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetTrafficPolicyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetTrafficPolicyInstance.go b/service/route53/api_op_GetTrafficPolicyInstance.go index 2ccec1b4dc9..27905257099 100644 --- a/service/route53/api_op_GetTrafficPolicyInstance.go +++ b/service/route53/api_op_GetTrafficPolicyInstance.go @@ -63,6 +63,9 @@ func addOperationGetTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_GetTrafficPolicyInstanceCount.go b/service/route53/api_op_GetTrafficPolicyInstanceCount.go index 72ee7b6031f..18e38a807b8 100644 --- a/service/route53/api_op_GetTrafficPolicyInstanceCount.go +++ b/service/route53/api_op_GetTrafficPolicyInstanceCount.go @@ -55,6 +55,9 @@ func addOperationGetTrafficPolicyInstanceCountMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGetTrafficPolicyInstanceCountMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListGeoLocations.go b/service/route53/api_op_ListGeoLocations.go index 419cce562c5..cfd8f079f33 100644 --- a/service/route53/api_op_ListGeoLocations.go +++ b/service/route53/api_op_ListGeoLocations.go @@ -118,6 +118,9 @@ func addOperationListGeoLocationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationListGeoLocationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListHealthChecks.go b/service/route53/api_op_ListHealthChecks.go index b9a232a17c4..a82bc2b8c7c 100644 --- a/service/route53/api_op_ListHealthChecks.go +++ b/service/route53/api_op_ListHealthChecks.go @@ -94,6 +94,9 @@ func addOperationListHealthChecksMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListHealthChecksMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListHostedZones.go b/service/route53/api_op_ListHostedZones.go index 48de5111553..8d607d6d717 100644 --- a/service/route53/api_op_ListHostedZones.go +++ b/service/route53/api_op_ListHostedZones.go @@ -102,6 +102,9 @@ func addOperationListHostedZonesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationListHostedZonesMiddlewares(stack *middleware.Stack, options Opt if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListHostedZonesByName.go b/service/route53/api_op_ListHostedZonesByName.go index 363d4b00b0f..30f0d10de10 100644 --- a/service/route53/api_op_ListHostedZonesByName.go +++ b/service/route53/api_op_ListHostedZonesByName.go @@ -152,6 +152,9 @@ func addOperationListHostedZonesByNameMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationListHostedZonesByNameMiddlewares(stack *middleware.Stack, optio if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListHostedZonesByVPC.go b/service/route53/api_op_ListHostedZonesByVPC.go index f47b9838b9d..6aee89b0627 100644 --- a/service/route53/api_op_ListHostedZonesByVPC.go +++ b/service/route53/api_op_ListHostedZonesByVPC.go @@ -101,6 +101,9 @@ func addOperationListHostedZonesByVPCMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationListHostedZonesByVPCMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListQueryLoggingConfigs.go b/service/route53/api_op_ListQueryLoggingConfigs.go index 29b99693db6..0b2032517fc 100644 --- a/service/route53/api_op_ListQueryLoggingConfigs.go +++ b/service/route53/api_op_ListQueryLoggingConfigs.go @@ -91,6 +91,9 @@ func addOperationListQueryLoggingConfigsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListQueryLoggingConfigsMiddlewares(stack *middleware.Stack, opt if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListResourceRecordSets.go b/service/route53/api_op_ListResourceRecordSets.go index c075e9e3a99..9987f711471 100644 --- a/service/route53/api_op_ListResourceRecordSets.go +++ b/service/route53/api_op_ListResourceRecordSets.go @@ -165,6 +165,9 @@ func addOperationListResourceRecordSetsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -210,6 +213,9 @@ func addOperationListResourceRecordSetsMiddlewares(stack *middleware.Stack, opti if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListReusableDelegationSets.go b/service/route53/api_op_ListReusableDelegationSets.go index 627168d01e8..0e1aa1762c4 100644 --- a/service/route53/api_op_ListReusableDelegationSets.go +++ b/service/route53/api_op_ListReusableDelegationSets.go @@ -95,6 +95,9 @@ func addOperationListReusableDelegationSetsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListReusableDelegationSetsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTagsForResource.go b/service/route53/api_op_ListTagsForResource.go index 273db214638..7d2ad9cf76f 100644 --- a/service/route53/api_op_ListTagsForResource.go +++ b/service/route53/api_op_ListTagsForResource.go @@ -72,6 +72,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTagsForResources.go b/service/route53/api_op_ListTagsForResources.go index 6e1dba5a1fc..e8605cdb58e 100644 --- a/service/route53/api_op_ListTagsForResources.go +++ b/service/route53/api_op_ListTagsForResources.go @@ -73,6 +73,9 @@ func addOperationListTagsForResourcesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListTagsForResourcesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTrafficPolicies.go b/service/route53/api_op_ListTrafficPolicies.go index 1f79cdd03d6..2799887f8a9 100644 --- a/service/route53/api_op_ListTrafficPolicies.go +++ b/service/route53/api_op_ListTrafficPolicies.go @@ -93,6 +93,9 @@ func addOperationListTrafficPoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListTrafficPoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTrafficPolicyInstances.go b/service/route53/api_op_ListTrafficPolicyInstances.go index 36a27c085d7..541148f7691 100644 --- a/service/route53/api_op_ListTrafficPolicyInstances.go +++ b/service/route53/api_op_ListTrafficPolicyInstances.go @@ -127,6 +127,9 @@ func addOperationListTrafficPolicyInstancesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationListTrafficPolicyInstancesMiddlewares(stack *middleware.Stack, if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go b/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go index b2d3a9dc6e5..b03f4e3b0ec 100644 --- a/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go +++ b/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go @@ -118,6 +118,9 @@ func addOperationListTrafficPolicyInstancesByHostedZoneMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationListTrafficPolicyInstancesByHostedZoneMiddlewares(stack *middle if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go b/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go index 2e217234d5c..21752410537 100644 --- a/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go +++ b/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go @@ -140,6 +140,9 @@ func addOperationListTrafficPolicyInstancesByPolicyMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -185,6 +188,9 @@ func addOperationListTrafficPolicyInstancesByPolicyMiddlewares(stack *middleware if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListTrafficPolicyVersions.go b/service/route53/api_op_ListTrafficPolicyVersions.go index 2b3cced7118..9108d578906 100644 --- a/service/route53/api_op_ListTrafficPolicyVersions.go +++ b/service/route53/api_op_ListTrafficPolicyVersions.go @@ -99,6 +99,9 @@ func addOperationListTrafficPolicyVersionsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationListTrafficPolicyVersionsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_ListVPCAssociationAuthorizations.go b/service/route53/api_op_ListVPCAssociationAuthorizations.go index 7fe884e8c64..6bc884bdb71 100644 --- a/service/route53/api_op_ListVPCAssociationAuthorizations.go +++ b/service/route53/api_op_ListVPCAssociationAuthorizations.go @@ -87,6 +87,9 @@ func addOperationListVPCAssociationAuthorizationsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListVPCAssociationAuthorizationsMiddlewares(stack *middleware.S if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_TestDNSAnswer.go b/service/route53/api_op_TestDNSAnswer.go index 6c9ca126ffa..8bcd316eb98 100644 --- a/service/route53/api_op_TestDNSAnswer.go +++ b/service/route53/api_op_TestDNSAnswer.go @@ -128,6 +128,9 @@ func addOperationTestDNSAnswerMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationTestDNSAnswerMiddlewares(stack *middleware.Stack, options Optio if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_UpdateHealthCheck.go b/service/route53/api_op_UpdateHealthCheck.go index 1233156eb13..e1bbfa7d8a1 100644 --- a/service/route53/api_op_UpdateHealthCheck.go +++ b/service/route53/api_op_UpdateHealthCheck.go @@ -324,6 +324,9 @@ func addOperationUpdateHealthCheckMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -366,6 +369,9 @@ func addOperationUpdateHealthCheckMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_UpdateHostedZoneComment.go b/service/route53/api_op_UpdateHostedZoneComment.go index a12242d928f..d817ef1c3f5 100644 --- a/service/route53/api_op_UpdateHostedZoneComment.go +++ b/service/route53/api_op_UpdateHostedZoneComment.go @@ -63,6 +63,9 @@ func addOperationUpdateHostedZoneCommentMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateHostedZoneCommentMiddlewares(stack *middleware.Stack, opt if err = addSanitizeURLMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_UpdateTrafficPolicyComment.go b/service/route53/api_op_UpdateTrafficPolicyComment.go index 1c15bc8dc0e..bd25491b1a6 100644 --- a/service/route53/api_op_UpdateTrafficPolicyComment.go +++ b/service/route53/api_op_UpdateTrafficPolicyComment.go @@ -69,6 +69,9 @@ func addOperationUpdateTrafficPolicyCommentMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateTrafficPolicyCommentMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/api_op_UpdateTrafficPolicyInstance.go b/service/route53/api_op_UpdateTrafficPolicyInstance.go index c10979f811e..16c7b1eee66 100644 --- a/service/route53/api_op_UpdateTrafficPolicyInstance.go +++ b/service/route53/api_op_UpdateTrafficPolicyInstance.go @@ -95,6 +95,9 @@ func addOperationUpdateTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationUpdateTrafficPolicyInstanceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53/go.mod b/service/route53/go.mod index ba506b58d33..5b771e5bf3d 100644 --- a/service/route53/go.mod +++ b/service/route53/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/route53 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53/go.sum b/service/route53/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/route53/go.sum +++ b/service/route53/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/route53domains/api_client.go b/service/route53domains/api_client.go index 8544129f034..05a8a113e1f 100644 --- a/service/route53domains/api_client.go +++ b/service/route53domains/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go b/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go index 8ce34c599d3..261e78085df 100644 --- a/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go +++ b/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go @@ -79,6 +79,9 @@ func addOperationAcceptDomainTransferFromAnotherAwsAccountMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationAcceptDomainTransferFromAnotherAwsAccountMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go b/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go index 2a8ff1699bd..b859c253dae 100644 --- a/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go +++ b/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go @@ -74,6 +74,9 @@ func addOperationCancelDomainTransferToAnotherAwsAccountMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCancelDomainTransferToAnotherAwsAccountMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_CheckDomainAvailability.go b/service/route53domains/api_op_CheckDomainAvailability.go index 99964a5da69..a6b85dc456b 100644 --- a/service/route53domains/api_op_CheckDomainAvailability.go +++ b/service/route53domains/api_op_CheckDomainAvailability.go @@ -98,6 +98,9 @@ func addOperationCheckDomainAvailabilityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCheckDomainAvailabilityMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_CheckDomainTransferability.go b/service/route53domains/api_op_CheckDomainTransferability.go index c63bd84018e..2f6a01e1f62 100644 --- a/service/route53domains/api_op_CheckDomainTransferability.go +++ b/service/route53domains/api_op_CheckDomainTransferability.go @@ -79,6 +79,9 @@ func addOperationCheckDomainTransferabilityMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCheckDomainTransferabilityMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_DeleteTagsForDomain.go b/service/route53domains/api_op_DeleteTagsForDomain.go index a2ec56eab87..05967cc0885 100644 --- a/service/route53domains/api_op_DeleteTagsForDomain.go +++ b/service/route53domains/api_op_DeleteTagsForDomain.go @@ -56,6 +56,9 @@ func addOperationDeleteTagsForDomainMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteTagsForDomainMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_DisableDomainAutoRenew.go b/service/route53domains/api_op_DisableDomainAutoRenew.go index 6367fef13d8..ec782b759ee 100644 --- a/service/route53domains/api_op_DisableDomainAutoRenew.go +++ b/service/route53domains/api_op_DisableDomainAutoRenew.go @@ -49,6 +49,9 @@ func addOperationDisableDomainAutoRenewMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisableDomainAutoRenewMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_DisableDomainTransferLock.go b/service/route53domains/api_op_DisableDomainTransferLock.go index da178d0e642..0bb8cccbc43 100644 --- a/service/route53domains/api_op_DisableDomainTransferLock.go +++ b/service/route53domains/api_op_DisableDomainTransferLock.go @@ -63,6 +63,9 @@ func addOperationDisableDomainTransferLockMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDisableDomainTransferLockMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_EnableDomainAutoRenew.go b/service/route53domains/api_op_EnableDomainAutoRenew.go index 1e945cc395b..19ef3844437 100644 --- a/service/route53domains/api_op_EnableDomainAutoRenew.go +++ b/service/route53domains/api_op_EnableDomainAutoRenew.go @@ -55,6 +55,9 @@ func addOperationEnableDomainAutoRenewMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationEnableDomainAutoRenewMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_EnableDomainTransferLock.go b/service/route53domains/api_op_EnableDomainTransferLock.go index 24d495ad028..604b9124230 100644 --- a/service/route53domains/api_op_EnableDomainTransferLock.go +++ b/service/route53domains/api_op_EnableDomainTransferLock.go @@ -61,6 +61,9 @@ func addOperationEnableDomainTransferLockMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationEnableDomainTransferLockMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_GetContactReachabilityStatus.go b/service/route53domains/api_op_GetContactReachabilityStatus.go index f1f1dc35a97..4307b05f06c 100644 --- a/service/route53domains/api_op_GetContactReachabilityStatus.go +++ b/service/route53domains/api_op_GetContactReachabilityStatus.go @@ -61,6 +61,9 @@ func addOperationGetContactReachabilityStatusMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetContactReachabilityStatusMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_GetDomainDetail.go b/service/route53domains/api_op_GetDomainDetail.go index 40d223f3a4a..63b3afac8dd 100644 --- a/service/route53domains/api_op_GetDomainDetail.go +++ b/service/route53domains/api_op_GetDomainDetail.go @@ -160,6 +160,9 @@ func addOperationGetDomainDetailMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -202,6 +205,9 @@ func addOperationGetDomainDetailMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_GetDomainSuggestions.go b/service/route53domains/api_op_GetDomainSuggestions.go index 556bb258d44..e58f702251c 100644 --- a/service/route53domains/api_op_GetDomainSuggestions.go +++ b/service/route53domains/api_op_GetDomainSuggestions.go @@ -91,6 +91,9 @@ func addOperationGetDomainSuggestionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetDomainSuggestionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_GetOperationDetail.go b/service/route53domains/api_op_GetOperationDetail.go index a7bb0906f8d..e162ac6c8a4 100644 --- a/service/route53domains/api_op_GetOperationDetail.go +++ b/service/route53domains/api_op_GetOperationDetail.go @@ -74,6 +74,9 @@ func addOperationGetOperationDetailMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetOperationDetailMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_ListDomains.go b/service/route53domains/api_op_ListDomains.go index bbd2438a279..ce000ba4abd 100644 --- a/service/route53domains/api_op_ListDomains.go +++ b/service/route53domains/api_op_ListDomains.go @@ -68,6 +68,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_ListOperations.go b/service/route53domains/api_op_ListOperations.go index 10bac22ead1..0acb1132354 100644 --- a/service/route53domains/api_op_ListOperations.go +++ b/service/route53domains/api_op_ListOperations.go @@ -75,6 +75,9 @@ func addOperationListOperationsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListOperationsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_ListTagsForDomain.go b/service/route53domains/api_op_ListTagsForDomain.go index 1886c62232b..82e41ede91f 100644 --- a/service/route53domains/api_op_ListTagsForDomain.go +++ b/service/route53domains/api_op_ListTagsForDomain.go @@ -59,6 +59,9 @@ func addOperationListTagsForDomainMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListTagsForDomainMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_RegisterDomain.go b/service/route53domains/api_op_RegisterDomain.go index d665e85de0c..42a8ae403dc 100644 --- a/service/route53domains/api_op_RegisterDomain.go +++ b/service/route53domains/api_op_RegisterDomain.go @@ -172,6 +172,9 @@ func addOperationRegisterDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -214,6 +217,9 @@ func addOperationRegisterDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go b/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go index 7a86be1b648..bfed103261f 100644 --- a/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go +++ b/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go @@ -73,6 +73,9 @@ func addOperationRejectDomainTransferFromAnotherAwsAccountMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationRejectDomainTransferFromAnotherAwsAccountMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_RenewDomain.go b/service/route53domains/api_op_RenewDomain.go index 075d9d0e14a..211ba7c526a 100644 --- a/service/route53domains/api_op_RenewDomain.go +++ b/service/route53domains/api_op_RenewDomain.go @@ -78,6 +78,9 @@ func addOperationRenewDomainMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationRenewDomainMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_ResendContactReachabilityEmail.go b/service/route53domains/api_op_ResendContactReachabilityEmail.go index 098ec1020e1..3c1b2d54e7f 100644 --- a/service/route53domains/api_op_ResendContactReachabilityEmail.go +++ b/service/route53domains/api_op_ResendContactReachabilityEmail.go @@ -63,6 +63,9 @@ func addOperationResendContactReachabilityEmailMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationResendContactReachabilityEmailMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_RetrieveDomainAuthCode.go b/service/route53domains/api_op_RetrieveDomainAuthCode.go index 99b08d9f343..5a098a5dfa5 100644 --- a/service/route53domains/api_op_RetrieveDomainAuthCode.go +++ b/service/route53domains/api_op_RetrieveDomainAuthCode.go @@ -58,6 +58,9 @@ func addOperationRetrieveDomainAuthCodeMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationRetrieveDomainAuthCodeMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_TransferDomain.go b/service/route53domains/api_op_TransferDomain.go index 9b0b31a1298..2e1c5fbc16f 100644 --- a/service/route53domains/api_op_TransferDomain.go +++ b/service/route53domains/api_op_TransferDomain.go @@ -168,6 +168,9 @@ func addOperationTransferDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -210,6 +213,9 @@ func addOperationTransferDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go b/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go index eadd679aaf9..f6f4e993db9 100644 --- a/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go +++ b/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go @@ -104,6 +104,9 @@ func addOperationTransferDomainToAnotherAwsAccountMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationTransferDomainToAnotherAwsAccountMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_UpdateDomainContact.go b/service/route53domains/api_op_UpdateDomainContact.go index d21c1f76ebb..94ab8a5c70a 100644 --- a/service/route53domains/api_op_UpdateDomainContact.go +++ b/service/route53domains/api_op_UpdateDomainContact.go @@ -72,6 +72,9 @@ func addOperationUpdateDomainContactMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateDomainContactMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_UpdateDomainContactPrivacy.go b/service/route53domains/api_op_UpdateDomainContactPrivacy.go index 42bfe9fb120..9f0aa6da9c2 100644 --- a/service/route53domains/api_op_UpdateDomainContactPrivacy.go +++ b/service/route53domains/api_op_UpdateDomainContactPrivacy.go @@ -97,6 +97,9 @@ func addOperationUpdateDomainContactPrivacyMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationUpdateDomainContactPrivacyMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_UpdateDomainNameservers.go b/service/route53domains/api_op_UpdateDomainNameservers.go index 5c33f3ab440..5079e1f312a 100644 --- a/service/route53domains/api_op_UpdateDomainNameservers.go +++ b/service/route53domains/api_op_UpdateDomainNameservers.go @@ -77,6 +77,9 @@ func addOperationUpdateDomainNameserversMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateDomainNameserversMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_UpdateTagsForDomain.go b/service/route53domains/api_op_UpdateTagsForDomain.go index 04e9f09add5..920990dd0b8 100644 --- a/service/route53domains/api_op_UpdateTagsForDomain.go +++ b/service/route53domains/api_op_UpdateTagsForDomain.go @@ -56,6 +56,9 @@ func addOperationUpdateTagsForDomainMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateTagsForDomainMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/api_op_ViewBilling.go b/service/route53domains/api_op_ViewBilling.go index 6aade2e0754..b78ac6d90f4 100644 --- a/service/route53domains/api_op_ViewBilling.go +++ b/service/route53domains/api_op_ViewBilling.go @@ -80,6 +80,9 @@ func addOperationViewBillingMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationViewBillingMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53domains/go.mod b/service/route53domains/go.mod index 8b46db6b636..f552c68dc75 100644 --- a/service/route53domains/go.mod +++ b/service/route53domains/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/route53domains go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53domains/go.sum b/service/route53domains/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/route53domains/go.sum +++ b/service/route53domains/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/route53resolver/api_client.go b/service/route53resolver/api_client.go index d5bb1dfe37f..92df5606cbd 100644 --- a/service/route53resolver/api_client.go +++ b/service/route53resolver/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go b/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go index e1791de0fb5..c89e71a2c41 100644 --- a/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go +++ b/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go @@ -64,6 +64,9 @@ func addOperationAssociateResolverEndpointIpAddressMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationAssociateResolverEndpointIpAddressMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_AssociateResolverQueryLogConfig.go b/service/route53resolver/api_op_AssociateResolverQueryLogConfig.go index 6b2e96fec3f..4095b5cc7f4 100644 --- a/service/route53resolver/api_op_AssociateResolverQueryLogConfig.go +++ b/service/route53resolver/api_op_AssociateResolverQueryLogConfig.go @@ -68,6 +68,9 @@ func addOperationAssociateResolverQueryLogConfigMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAssociateResolverQueryLogConfigMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_AssociateResolverRule.go b/service/route53resolver/api_op_AssociateResolverRule.go index 68935cf7d04..cf8396bc95f 100644 --- a/service/route53resolver/api_op_AssociateResolverRule.go +++ b/service/route53resolver/api_op_AssociateResolverRule.go @@ -70,6 +70,9 @@ func addOperationAssociateResolverRuleMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAssociateResolverRuleMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_CreateResolverEndpoint.go b/service/route53resolver/api_op_CreateResolverEndpoint.go index c2fdc7b03ec..4d309497700 100644 --- a/service/route53resolver/api_op_CreateResolverEndpoint.go +++ b/service/route53resolver/api_op_CreateResolverEndpoint.go @@ -98,6 +98,9 @@ func addOperationCreateResolverEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationCreateResolverEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_CreateResolverQueryLogConfig.go b/service/route53resolver/api_op_CreateResolverQueryLogConfig.go index 2f8040e7f6a..f2ebe03eea8 100644 --- a/service/route53resolver/api_op_CreateResolverQueryLogConfig.go +++ b/service/route53resolver/api_op_CreateResolverQueryLogConfig.go @@ -96,6 +96,9 @@ func addOperationCreateResolverQueryLogConfigMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreateResolverQueryLogConfigMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_CreateResolverRule.go b/service/route53resolver/api_op_CreateResolverRule.go index 1856e11b37b..62dc480e32c 100644 --- a/service/route53resolver/api_op_CreateResolverRule.go +++ b/service/route53resolver/api_op_CreateResolverRule.go @@ -94,6 +94,9 @@ func addOperationCreateResolverRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateResolverRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_DeleteResolverEndpoint.go b/service/route53resolver/api_op_DeleteResolverEndpoint.go index 665e6886763..c0a71fb35ba 100644 --- a/service/route53resolver/api_op_DeleteResolverEndpoint.go +++ b/service/route53resolver/api_op_DeleteResolverEndpoint.go @@ -62,6 +62,9 @@ func addOperationDeleteResolverEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteResolverEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_DeleteResolverQueryLogConfig.go b/service/route53resolver/api_op_DeleteResolverQueryLogConfig.go index cca04515485..0599e1a9ee6 100644 --- a/service/route53resolver/api_op_DeleteResolverQueryLogConfig.go +++ b/service/route53resolver/api_op_DeleteResolverQueryLogConfig.go @@ -67,6 +67,9 @@ func addOperationDeleteResolverQueryLogConfigMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDeleteResolverQueryLogConfigMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_DeleteResolverRule.go b/service/route53resolver/api_op_DeleteResolverRule.go index 1412c6d76ed..73cfdecfe4f 100644 --- a/service/route53resolver/api_op_DeleteResolverRule.go +++ b/service/route53resolver/api_op_DeleteResolverRule.go @@ -57,6 +57,9 @@ func addOperationDeleteResolverRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteResolverRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go b/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go index 2cb770e2025..8bebde9e387 100644 --- a/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go +++ b/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go @@ -63,6 +63,9 @@ func addOperationDisassociateResolverEndpointIpAddressMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDisassociateResolverEndpointIpAddressMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_DisassociateResolverQueryLogConfig.go b/service/route53resolver/api_op_DisassociateResolverQueryLogConfig.go index 5ee642a15b1..d70721bbe3f 100644 --- a/service/route53resolver/api_op_DisassociateResolverQueryLogConfig.go +++ b/service/route53resolver/api_op_DisassociateResolverQueryLogConfig.go @@ -71,6 +71,9 @@ func addOperationDisassociateResolverQueryLogConfigMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDisassociateResolverQueryLogConfigMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_DisassociateResolverRule.go b/service/route53resolver/api_op_DisassociateResolverRule.go index 0b0c1093764..037546e1fa0 100644 --- a/service/route53resolver/api_op_DisassociateResolverRule.go +++ b/service/route53resolver/api_op_DisassociateResolverRule.go @@ -62,6 +62,9 @@ func addOperationDisassociateResolverRuleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDisassociateResolverRuleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverEndpoint.go b/service/route53resolver/api_op_GetResolverEndpoint.go index 5515897d70e..7e08eae8de5 100644 --- a/service/route53resolver/api_op_GetResolverEndpoint.go +++ b/service/route53resolver/api_op_GetResolverEndpoint.go @@ -56,6 +56,9 @@ func addOperationGetResolverEndpointMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetResolverEndpointMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverQueryLogConfig.go b/service/route53resolver/api_op_GetResolverQueryLogConfig.go index 886793c472a..433d8746bfb 100644 --- a/service/route53resolver/api_op_GetResolverQueryLogConfig.go +++ b/service/route53resolver/api_op_GetResolverQueryLogConfig.go @@ -57,6 +57,9 @@ func addOperationGetResolverQueryLogConfigMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetResolverQueryLogConfigMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverQueryLogConfigAssociation.go b/service/route53resolver/api_op_GetResolverQueryLogConfigAssociation.go index 40dbc8de8bd..f57910d14e7 100644 --- a/service/route53resolver/api_op_GetResolverQueryLogConfigAssociation.go +++ b/service/route53resolver/api_op_GetResolverQueryLogConfigAssociation.go @@ -57,6 +57,9 @@ func addOperationGetResolverQueryLogConfigAssociationMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetResolverQueryLogConfigAssociationMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverQueryLogConfigPolicy.go b/service/route53resolver/api_op_GetResolverQueryLogConfigPolicy.go index ba452a27b99..d261fe3b2c5 100644 --- a/service/route53resolver/api_op_GetResolverQueryLogConfigPolicy.go +++ b/service/route53resolver/api_op_GetResolverQueryLogConfigPolicy.go @@ -56,6 +56,9 @@ func addOperationGetResolverQueryLogConfigPolicyMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetResolverQueryLogConfigPolicyMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverRule.go b/service/route53resolver/api_op_GetResolverRule.go index 76c09175cca..c2be59cd6e9 100644 --- a/service/route53resolver/api_op_GetResolverRule.go +++ b/service/route53resolver/api_op_GetResolverRule.go @@ -56,6 +56,9 @@ func addOperationGetResolverRuleMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetResolverRuleMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverRuleAssociation.go b/service/route53resolver/api_op_GetResolverRuleAssociation.go index 770391da6fa..29571fc7044 100644 --- a/service/route53resolver/api_op_GetResolverRuleAssociation.go +++ b/service/route53resolver/api_op_GetResolverRuleAssociation.go @@ -56,6 +56,9 @@ func addOperationGetResolverRuleAssociationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetResolverRuleAssociationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_GetResolverRulePolicy.go b/service/route53resolver/api_op_GetResolverRulePolicy.go index 50c2c027356..548ec1caac7 100644 --- a/service/route53resolver/api_op_GetResolverRulePolicy.go +++ b/service/route53resolver/api_op_GetResolverRulePolicy.go @@ -55,6 +55,9 @@ func addOperationGetResolverRulePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetResolverRulePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go b/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go index 35cf639069d..73275a42a02 100644 --- a/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go +++ b/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go @@ -76,6 +76,9 @@ func addOperationListResolverEndpointIpAddressesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListResolverEndpointIpAddressesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListResolverEndpoints.go b/service/route53resolver/api_op_ListResolverEndpoints.go index ba3443c3239..d6b1bfaf4fc 100644 --- a/service/route53resolver/api_op_ListResolverEndpoints.go +++ b/service/route53resolver/api_op_ListResolverEndpoints.go @@ -75,6 +75,9 @@ func addOperationListResolverEndpointsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListResolverEndpointsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListResolverQueryLogConfigAssociations.go b/service/route53resolver/api_op_ListResolverQueryLogConfigAssociations.go index ad87f6c7656..2d8ac1d3852 100644 --- a/service/route53resolver/api_op_ListResolverQueryLogConfigAssociations.go +++ b/service/route53resolver/api_op_ListResolverQueryLogConfigAssociations.go @@ -149,6 +149,9 @@ func addOperationListResolverQueryLogConfigAssociationsMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationListResolverQueryLogConfigAssociationsMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListResolverQueryLogConfigs.go b/service/route53resolver/api_op_ListResolverQueryLogConfigs.go index f82989ba0f8..17186da6fe3 100644 --- a/service/route53resolver/api_op_ListResolverQueryLogConfigs.go +++ b/service/route53resolver/api_op_ListResolverQueryLogConfigs.go @@ -152,6 +152,9 @@ func addOperationListResolverQueryLogConfigsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationListResolverQueryLogConfigsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListResolverRuleAssociations.go b/service/route53resolver/api_op_ListResolverRuleAssociations.go index 89ec2b3e3e2..bed7ef85ac3 100644 --- a/service/route53resolver/api_op_ListResolverRuleAssociations.go +++ b/service/route53resolver/api_op_ListResolverRuleAssociations.go @@ -77,6 +77,9 @@ func addOperationListResolverRuleAssociationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListResolverRuleAssociationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListResolverRules.go b/service/route53resolver/api_op_ListResolverRules.go index a2bd7807dcf..2636c6f54ee 100644 --- a/service/route53resolver/api_op_ListResolverRules.go +++ b/service/route53resolver/api_op_ListResolverRules.go @@ -75,6 +75,9 @@ func addOperationListResolverRulesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListResolverRulesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_ListTagsForResource.go b/service/route53resolver/api_op_ListTagsForResource.go index 2fbbb67a362..8285942e8d3 100644 --- a/service/route53resolver/api_op_ListTagsForResource.go +++ b/service/route53resolver/api_op_ListTagsForResource.go @@ -70,6 +70,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_PutResolverQueryLogConfigPolicy.go b/service/route53resolver/api_op_PutResolverQueryLogConfigPolicy.go index 909b740f27e..740f35fbcce 100644 --- a/service/route53resolver/api_op_PutResolverQueryLogConfigPolicy.go +++ b/service/route53resolver/api_op_PutResolverQueryLogConfigPolicy.go @@ -79,6 +79,9 @@ func addOperationPutResolverQueryLogConfigPolicyMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationPutResolverQueryLogConfigPolicyMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_PutResolverRulePolicy.go b/service/route53resolver/api_op_PutResolverRulePolicy.go index 0a86fb971e1..5f209d452f9 100644 --- a/service/route53resolver/api_op_PutResolverRulePolicy.go +++ b/service/route53resolver/api_op_PutResolverRulePolicy.go @@ -80,6 +80,9 @@ func addOperationPutResolverRulePolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationPutResolverRulePolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_TagResource.go b/service/route53resolver/api_op_TagResource.go index 1291df4b852..fff906b611b 100644 --- a/service/route53resolver/api_op_TagResource.go +++ b/service/route53resolver/api_op_TagResource.go @@ -79,6 +79,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_UntagResource.go b/service/route53resolver/api_op_UntagResource.go index f08a0f184d5..2caa8f25362 100644 --- a/service/route53resolver/api_op_UntagResource.go +++ b/service/route53resolver/api_op_UntagResource.go @@ -78,6 +78,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_UpdateResolverEndpoint.go b/service/route53resolver/api_op_UpdateResolverEndpoint.go index 75271df4927..cf22b132474 100644 --- a/service/route53resolver/api_op_UpdateResolverEndpoint.go +++ b/service/route53resolver/api_op_UpdateResolverEndpoint.go @@ -56,6 +56,9 @@ func addOperationUpdateResolverEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateResolverEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/api_op_UpdateResolverRule.go b/service/route53resolver/api_op_UpdateResolverRule.go index 5ebef978d5e..9c6050791a6 100644 --- a/service/route53resolver/api_op_UpdateResolverRule.go +++ b/service/route53resolver/api_op_UpdateResolverRule.go @@ -60,6 +60,9 @@ func addOperationUpdateResolverRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateResolverRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/route53resolver/go.mod b/service/route53resolver/go.mod index bec15ea2ea7..3da84d08bc4 100644 --- a/service/route53resolver/go.mod +++ b/service/route53resolver/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/route53resolver go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53resolver/go.sum b/service/route53resolver/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/route53resolver/go.sum +++ b/service/route53resolver/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3/api_client.go b/service/s3/api_client.go index fa83ac339f7..2761d587a01 100644 --- a/service/s3/api_client.go +++ b/service/s3/api_client.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/internal/s3shared" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -58,6 +61,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -70,6 +76,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -140,14 +149,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -186,22 +208,23 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { - s.DisableURIPathEscaping = true -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + s.DisableURIPathEscaping = true + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -420,3 +443,12 @@ func addResponseErrorMiddleware(stack *middleware.Stack) error { func disableAcceptEncodingGzip(stack *middleware.Stack) error { return acceptencodingcust.AddAcceptEncodingGzip(stack, acceptencodingcust.AddAcceptEncodingGzipOptions{}) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/s3/api_op_AbortMultipartUpload.go b/service/s3/api_op_AbortMultipartUpload.go index 36965d6cf4c..d400a259fcf 100644 --- a/service/s3/api_op_AbortMultipartUpload.go +++ b/service/s3/api_op_AbortMultipartUpload.go @@ -125,6 +125,9 @@ func addOperationAbortMultipartUploadMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationAbortMultipartUploadMiddlewares(stack *middleware.Stack, option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go index 1eb9dee97f0..afbb9d1921b 100644 --- a/service/s3/api_op_CompleteMultipartUpload.go +++ b/service/s3/api_op_CompleteMultipartUpload.go @@ -214,6 +214,9 @@ func addOperationCompleteMultipartUploadMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -268,6 +271,9 @@ func addOperationCompleteMultipartUploadMiddlewares(stack *middleware.Stack, opt if err = s3cust.HandleResponseErrorWith200Status(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go index e54c66d8108..fd90503d392 100644 --- a/service/s3/api_op_CopyObject.go +++ b/service/s3/api_op_CopyObject.go @@ -437,6 +437,9 @@ func addOperationCopyObjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -491,6 +494,9 @@ func addOperationCopyObjectMiddlewares(stack *middleware.Stack, options Options) if err = s3cust.HandleResponseErrorWith200Status(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go index 4b5bde547d1..ef150bb923d 100644 --- a/service/s3/api_op_CreateBucket.go +++ b/service/s3/api_op_CreateBucket.go @@ -169,6 +169,9 @@ func addOperationCreateBucketMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -220,6 +223,9 @@ func addOperationCreateBucketMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go index 307bd316b9e..43d362a46f4 100644 --- a/service/s3/api_op_CreateMultipartUpload.go +++ b/service/s3/api_op_CreateMultipartUpload.go @@ -465,6 +465,9 @@ func addOperationCreateMultipartUploadMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -516,6 +519,9 @@ func addOperationCreateMultipartUploadMiddlewares(stack *middleware.Stack, optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucket.go b/service/s3/api_op_DeleteBucket.go index 28565aa7db7..a42d7524f97 100644 --- a/service/s3/api_op_DeleteBucket.go +++ b/service/s3/api_op_DeleteBucket.go @@ -61,6 +61,9 @@ func addOperationDeleteBucketMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteBucketMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go index 282c6e33e88..da235ae714e 100644 --- a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go @@ -81,6 +81,9 @@ func addOperationDeleteBucketAnalyticsConfigurationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDeleteBucketAnalyticsConfigurationMiddlewares(stack *middleware if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketCors.go b/service/s3/api_op_DeleteBucketCors.go index 79a8e89f40c..23e011165e7 100644 --- a/service/s3/api_op_DeleteBucketCors.go +++ b/service/s3/api_op_DeleteBucketCors.go @@ -64,6 +64,9 @@ func addOperationDeleteBucketCorsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeleteBucketCorsMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketEncryption.go b/service/s3/api_op_DeleteBucketEncryption.go index 622451e4633..3ffad438c7e 100644 --- a/service/s3/api_op_DeleteBucketEncryption.go +++ b/service/s3/api_op_DeleteBucketEncryption.go @@ -73,6 +73,9 @@ func addOperationDeleteBucketEncryptionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDeleteBucketEncryptionMiddlewares(stack *middleware.Stack, opti if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketInventoryConfiguration.go b/service/s3/api_op_DeleteBucketInventoryConfiguration.go index 1d666fb6e0c..86d2e926ac2 100644 --- a/service/s3/api_op_DeleteBucketInventoryConfiguration.go +++ b/service/s3/api_op_DeleteBucketInventoryConfiguration.go @@ -80,6 +80,9 @@ func addOperationDeleteBucketInventoryConfigurationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDeleteBucketInventoryConfigurationMiddlewares(stack *middleware if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketLifecycle.go b/service/s3/api_op_DeleteBucketLifecycle.go index 06acc26316b..79040f8a491 100644 --- a/service/s3/api_op_DeleteBucketLifecycle.go +++ b/service/s3/api_op_DeleteBucketLifecycle.go @@ -70,6 +70,9 @@ func addOperationDeleteBucketLifecycleMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteBucketLifecycleMiddlewares(stack *middleware.Stack, optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketMetricsConfiguration.go b/service/s3/api_op_DeleteBucketMetricsConfiguration.go index 91105ad52a7..8181e2325be 100644 --- a/service/s3/api_op_DeleteBucketMetricsConfiguration.go +++ b/service/s3/api_op_DeleteBucketMetricsConfiguration.go @@ -86,6 +86,9 @@ func addOperationDeleteBucketMetricsConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDeleteBucketMetricsConfigurationMiddlewares(stack *middleware.S if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketOwnershipControls.go b/service/s3/api_op_DeleteBucketOwnershipControls.go index c7305de3be0..9ba5560197e 100644 --- a/service/s3/api_op_DeleteBucketOwnershipControls.go +++ b/service/s3/api_op_DeleteBucketOwnershipControls.go @@ -61,6 +61,9 @@ func addOperationDeleteBucketOwnershipControlsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDeleteBucketOwnershipControlsMiddlewares(stack *middleware.Stac if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketPolicy.go b/service/s3/api_op_DeleteBucketPolicy.go index 2ff410f3148..1deea8ab88a 100644 --- a/service/s3/api_op_DeleteBucketPolicy.go +++ b/service/s3/api_op_DeleteBucketPolicy.go @@ -72,6 +72,9 @@ func addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketReplication.go b/service/s3/api_op_DeleteBucketReplication.go index 5b7a7b3b17d..44f7be0e94a 100644 --- a/service/s3/api_op_DeleteBucketReplication.go +++ b/service/s3/api_op_DeleteBucketReplication.go @@ -71,6 +71,9 @@ func addOperationDeleteBucketReplicationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteBucketReplicationMiddlewares(stack *middleware.Stack, opt if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketTagging.go b/service/s3/api_op_DeleteBucketTagging.go index 14fda23345e..b20fc01e553 100644 --- a/service/s3/api_op_DeleteBucketTagging.go +++ b/service/s3/api_op_DeleteBucketTagging.go @@ -62,6 +62,9 @@ func addOperationDeleteBucketTaggingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteBucketTaggingMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteBucketWebsite.go b/service/s3/api_op_DeleteBucketWebsite.go index 35e09a9fa84..c8b427626b7 100644 --- a/service/s3/api_op_DeleteBucketWebsite.go +++ b/service/s3/api_op_DeleteBucketWebsite.go @@ -71,6 +71,9 @@ func addOperationDeleteBucketWebsiteMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteBucketWebsiteMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go index 45ce72d1157..5ea342563be 100644 --- a/service/s3/api_op_DeleteObject.go +++ b/service/s3/api_op_DeleteObject.go @@ -129,6 +129,9 @@ func addOperationDeleteObjectMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationDeleteObjectMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteObjectTagging.go b/service/s3/api_op_DeleteObjectTagging.go index 6c7c9abb262..e5c72d54de2 100644 --- a/service/s3/api_op_DeleteObjectTagging.go +++ b/service/s3/api_op_DeleteObjectTagging.go @@ -94,6 +94,9 @@ func addOperationDeleteObjectTaggingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDeleteObjectTaggingMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go index 970f14474c2..b47328d8878 100644 --- a/service/s3/api_op_DeleteObjects.go +++ b/service/s3/api_op_DeleteObjects.go @@ -149,6 +149,9 @@ func addOperationDeleteObjectsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationDeleteObjectsMiddlewares(stack *middleware.Stack, options Optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_DeletePublicAccessBlock.go b/service/s3/api_op_DeletePublicAccessBlock.go index 8a743f18764..75570659128 100644 --- a/service/s3/api_op_DeletePublicAccessBlock.go +++ b/service/s3/api_op_DeletePublicAccessBlock.go @@ -75,6 +75,9 @@ func addOperationDeletePublicAccessBlockMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDeletePublicAccessBlockMiddlewares(stack *middleware.Stack, opt if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketAccelerateConfiguration.go b/service/s3/api_op_GetBucketAccelerateConfiguration.go index 92a6315fa6f..a0dff76d0c9 100644 --- a/service/s3/api_op_GetBucketAccelerateConfiguration.go +++ b/service/s3/api_op_GetBucketAccelerateConfiguration.go @@ -81,6 +81,9 @@ func addOperationGetBucketAccelerateConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetBucketAccelerateConfigurationMiddlewares(stack *middleware.S if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketAcl.go b/service/s3/api_op_GetBucketAcl.go index e9d83510860..26c70f87d40 100644 --- a/service/s3/api_op_GetBucketAcl.go +++ b/service/s3/api_op_GetBucketAcl.go @@ -67,6 +67,9 @@ func addOperationGetBucketAclMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetBucketAclMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketAnalyticsConfiguration.go b/service/s3/api_op_GetBucketAnalyticsConfiguration.go index 2d290ae6ccd..7f4c6c344d3 100644 --- a/service/s3/api_op_GetBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_GetBucketAnalyticsConfiguration.go @@ -86,6 +86,9 @@ func addOperationGetBucketAnalyticsConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationGetBucketAnalyticsConfigurationMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketCors.go b/service/s3/api_op_GetBucketCors.go index 5fded12ee55..a2b109a65a5 100644 --- a/service/s3/api_op_GetBucketCors.go +++ b/service/s3/api_op_GetBucketCors.go @@ -70,6 +70,9 @@ func addOperationGetBucketCorsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetBucketCorsMiddlewares(stack *middleware.Stack, options Optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketEncryption.go b/service/s3/api_op_GetBucketEncryption.go index 21706c05b78..3153c8e9fe0 100644 --- a/service/s3/api_op_GetBucketEncryption.go +++ b/service/s3/api_op_GetBucketEncryption.go @@ -77,6 +77,9 @@ func addOperationGetBucketEncryptionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetBucketEncryptionMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketInventoryConfiguration.go b/service/s3/api_op_GetBucketInventoryConfiguration.go index 683ae32ac4e..b89a130674f 100644 --- a/service/s3/api_op_GetBucketInventoryConfiguration.go +++ b/service/s3/api_op_GetBucketInventoryConfiguration.go @@ -84,6 +84,9 @@ func addOperationGetBucketInventoryConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationGetBucketInventoryConfigurationMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketLifecycleConfiguration.go b/service/s3/api_op_GetBucketLifecycleConfiguration.go index 1a5d389b5e9..257725b4b2c 100644 --- a/service/s3/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3/api_op_GetBucketLifecycleConfiguration.go @@ -101,6 +101,9 @@ func addOperationGetBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationGetBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketLocation.go b/service/s3/api_op_GetBucketLocation.go index ae3b85ae495..01f716f7743 100644 --- a/service/s3/api_op_GetBucketLocation.go +++ b/service/s3/api_op_GetBucketLocation.go @@ -72,6 +72,9 @@ func addOperationGetBucketLocationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetBucketLocationMiddlewares(stack *middleware.Stack, options O if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketLogging.go b/service/s3/api_op_GetBucketLogging.go index 97efc127e15..0f159a42180 100644 --- a/service/s3/api_op_GetBucketLogging.go +++ b/service/s3/api_op_GetBucketLogging.go @@ -69,6 +69,9 @@ func addOperationGetBucketLoggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetBucketLoggingMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketMetricsConfiguration.go b/service/s3/api_op_GetBucketMetricsConfiguration.go index c70f3e69fd1..8e8a1481b85 100644 --- a/service/s3/api_op_GetBucketMetricsConfiguration.go +++ b/service/s3/api_op_GetBucketMetricsConfiguration.go @@ -91,6 +91,9 @@ func addOperationGetBucketMetricsConfigurationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationGetBucketMetricsConfigurationMiddlewares(stack *middleware.Stac if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketNotificationConfiguration.go b/service/s3/api_op_GetBucketNotificationConfiguration.go index 9786636d513..7babd858fc4 100644 --- a/service/s3/api_op_GetBucketNotificationConfiguration.go +++ b/service/s3/api_op_GetBucketNotificationConfiguration.go @@ -83,6 +83,9 @@ func addOperationGetBucketNotificationConfigurationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetBucketNotificationConfigurationMiddlewares(stack *middleware if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketOwnershipControls.go b/service/s3/api_op_GetBucketOwnershipControls.go index a9968271d9b..dba02c6d95f 100644 --- a/service/s3/api_op_GetBucketOwnershipControls.go +++ b/service/s3/api_op_GetBucketOwnershipControls.go @@ -67,6 +67,9 @@ func addOperationGetBucketOwnershipControlsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetBucketOwnershipControlsMiddlewares(stack *middleware.Stack, if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketPolicy.go b/service/s3/api_op_GetBucketPolicy.go index b20b0c775c4..6e68ff488c5 100644 --- a/service/s3/api_op_GetBucketPolicy.go +++ b/service/s3/api_op_GetBucketPolicy.go @@ -71,6 +71,9 @@ func addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketPolicyStatus.go b/service/s3/api_op_GetBucketPolicyStatus.go index 8df7ed050f6..5d1e687d602 100644 --- a/service/s3/api_op_GetBucketPolicyStatus.go +++ b/service/s3/api_op_GetBucketPolicyStatus.go @@ -81,6 +81,9 @@ func addOperationGetBucketPolicyStatusMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetBucketPolicyStatusMiddlewares(stack *middleware.Stack, optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketReplication.go b/service/s3/api_op_GetBucketReplication.go index caab4c78c03..a24b444ffb7 100644 --- a/service/s3/api_op_GetBucketReplication.go +++ b/service/s3/api_op_GetBucketReplication.go @@ -80,6 +80,9 @@ func addOperationGetBucketReplicationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetBucketReplicationMiddlewares(stack *middleware.Stack, option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketRequestPayment.go b/service/s3/api_op_GetBucketRequestPayment.go index 0e5c94b8354..f4ad65b80ea 100644 --- a/service/s3/api_op_GetBucketRequestPayment.go +++ b/service/s3/api_op_GetBucketRequestPayment.go @@ -64,6 +64,9 @@ func addOperationGetBucketRequestPaymentMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetBucketRequestPaymentMiddlewares(stack *middleware.Stack, opt if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketTagging.go b/service/s3/api_op_GetBucketTagging.go index 54790edced1..5856c09c398 100644 --- a/service/s3/api_op_GetBucketTagging.go +++ b/service/s3/api_op_GetBucketTagging.go @@ -78,6 +78,9 @@ func addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketVersioning.go b/service/s3/api_op_GetBucketVersioning.go index a937ce51a6f..15cfd701fa7 100644 --- a/service/s3/api_op_GetBucketVersioning.go +++ b/service/s3/api_op_GetBucketVersioning.go @@ -78,6 +78,9 @@ func addOperationGetBucketVersioningMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationGetBucketVersioningMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetBucketWebsite.go b/service/s3/api_op_GetBucketWebsite.go index d71818edd45..03054b97079 100644 --- a/service/s3/api_op_GetBucketWebsite.go +++ b/service/s3/api_op_GetBucketWebsite.go @@ -82,6 +82,9 @@ func addOperationGetBucketWebsiteMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetBucketWebsiteMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObject.go b/service/s3/api_op_GetObject.go index b24634b14f5..4b382152e87 100644 --- a/service/s3/api_op_GetObject.go +++ b/service/s3/api_op_GetObject.go @@ -383,6 +383,9 @@ func addOperationGetObjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -431,6 +434,9 @@ func addOperationGetObjectMiddlewares(stack *middleware.Stack, options Options) if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObjectAcl.go b/service/s3/api_op_GetObjectAcl.go index cee4d3f99f3..dd7cf9b1cd6 100644 --- a/service/s3/api_op_GetObjectAcl.go +++ b/service/s3/api_op_GetObjectAcl.go @@ -103,6 +103,9 @@ func addOperationGetObjectAclMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationGetObjectAclMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObjectLegalHold.go b/service/s3/api_op_GetObjectLegalHold.go index 87f9340ee11..8e1f68d09e4 100644 --- a/service/s3/api_op_GetObjectLegalHold.go +++ b/service/s3/api_op_GetObjectLegalHold.go @@ -83,6 +83,9 @@ func addOperationGetObjectLegalHoldMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetObjectLegalHoldMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObjectLockConfiguration.go b/service/s3/api_op_GetObjectLockConfiguration.go index 95ee6dcfe2e..889a6038ac3 100644 --- a/service/s3/api_op_GetObjectLockConfiguration.go +++ b/service/s3/api_op_GetObjectLockConfiguration.go @@ -68,6 +68,9 @@ func addOperationGetObjectLockConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationGetObjectLockConfigurationMiddlewares(stack *middleware.Stack, if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObjectRetention.go b/service/s3/api_op_GetObjectRetention.go index cfa96fa52f2..0ef61113b1f 100644 --- a/service/s3/api_op_GetObjectRetention.go +++ b/service/s3/api_op_GetObjectRetention.go @@ -83,6 +83,9 @@ func addOperationGetObjectRetentionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetObjectRetentionMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObjectTagging.go b/service/s3/api_op_GetObjectTagging.go index cb7e66387ae..cdce8145ca3 100644 --- a/service/s3/api_op_GetObjectTagging.go +++ b/service/s3/api_op_GetObjectTagging.go @@ -99,6 +99,9 @@ func addOperationGetObjectTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationGetObjectTaggingMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetObjectTorrent.go b/service/s3/api_op_GetObjectTorrent.go index e96ab21cb3c..428e7a4f3f1 100644 --- a/service/s3/api_op_GetObjectTorrent.go +++ b/service/s3/api_op_GetObjectTorrent.go @@ -86,6 +86,9 @@ func addOperationGetObjectTorrentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationGetObjectTorrentMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_GetPublicAccessBlock.go b/service/s3/api_op_GetPublicAccessBlock.go index 5e63585f2ae..a2e2b855541 100644 --- a/service/s3/api_op_GetPublicAccessBlock.go +++ b/service/s3/api_op_GetPublicAccessBlock.go @@ -88,6 +88,9 @@ func addOperationGetPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationGetPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_HeadBucket.go b/service/s3/api_op_HeadBucket.go index 42a3a68e88c..d26ed833a9c 100644 --- a/service/s3/api_op_HeadBucket.go +++ b/service/s3/api_op_HeadBucket.go @@ -77,6 +77,9 @@ func addOperationHeadBucketMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationHeadBucketMiddlewares(stack *middleware.Stack, options Options) if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_HeadObject.go b/service/s3/api_op_HeadObject.go index d9c6ed35ca1..cd9b88de2e0 100644 --- a/service/s3/api_op_HeadObject.go +++ b/service/s3/api_op_HeadObject.go @@ -354,6 +354,9 @@ func addOperationHeadObjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -405,6 +408,9 @@ func addOperationHeadObjectMiddlewares(stack *middleware.Stack, options Options) if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListBucketAnalyticsConfigurations.go b/service/s3/api_op_ListBucketAnalyticsConfigurations.go index 6fabcbab675..0f6f88b9500 100644 --- a/service/s3/api_op_ListBucketAnalyticsConfigurations.go +++ b/service/s3/api_op_ListBucketAnalyticsConfigurations.go @@ -106,6 +106,9 @@ func addOperationListBucketAnalyticsConfigurationsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationListBucketAnalyticsConfigurationsMiddlewares(stack *middleware. if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListBucketInventoryConfigurations.go b/service/s3/api_op_ListBucketInventoryConfigurations.go index 58ceb74866d..e23991bb13c 100644 --- a/service/s3/api_op_ListBucketInventoryConfigurations.go +++ b/service/s3/api_op_ListBucketInventoryConfigurations.go @@ -107,6 +107,9 @@ func addOperationListBucketInventoryConfigurationsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationListBucketInventoryConfigurationsMiddlewares(stack *middleware. if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListBucketMetricsConfigurations.go b/service/s3/api_op_ListBucketMetricsConfigurations.go index 6fc0a24c4b1..510f7139ba6 100644 --- a/service/s3/api_op_ListBucketMetricsConfigurations.go +++ b/service/s3/api_op_ListBucketMetricsConfigurations.go @@ -110,6 +110,9 @@ func addOperationListBucketMetricsConfigurationsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationListBucketMetricsConfigurationsMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListBuckets.go b/service/s3/api_op_ListBuckets.go index a98d9248a69..2bb3ee330b3 100644 --- a/service/s3/api_op_ListBuckets.go +++ b/service/s3/api_op_ListBuckets.go @@ -51,6 +51,9 @@ func addOperationListBucketsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListBucketsMiddlewares(stack *middleware.Stack, options Options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListMultipartUploads.go b/service/s3/api_op_ListMultipartUploads.go index 24b10775a76..6fe6d24f257 100644 --- a/service/s3/api_op_ListMultipartUploads.go +++ b/service/s3/api_op_ListMultipartUploads.go @@ -201,6 +201,9 @@ func addOperationListMultipartUploadsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -252,6 +255,9 @@ func addOperationListMultipartUploadsMiddlewares(stack *middleware.Stack, option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListObjectVersions.go b/service/s3/api_op_ListObjectVersions.go index 0c5ffdba299..0b66e93206f 100644 --- a/service/s3/api_op_ListObjectVersions.go +++ b/service/s3/api_op_ListObjectVersions.go @@ -166,6 +166,9 @@ func addOperationListObjectVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -217,6 +220,9 @@ func addOperationListObjectVersionsMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListObjects.go b/service/s3/api_op_ListObjects.go index 335ce76a68c..44dea4a399b 100644 --- a/service/s3/api_op_ListObjects.go +++ b/service/s3/api_op_ListObjects.go @@ -175,6 +175,9 @@ func addOperationListObjectsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -226,6 +229,9 @@ func addOperationListObjectsMiddlewares(stack *middleware.Stack, options Options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListObjectsV2.go b/service/s3/api_op_ListObjectsV2.go index 916b0e6526b..5813ccd63b8 100644 --- a/service/s3/api_op_ListObjectsV2.go +++ b/service/s3/api_op_ListObjectsV2.go @@ -205,6 +205,9 @@ func addOperationListObjectsV2Middlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -256,6 +259,9 @@ func addOperationListObjectsV2Middlewares(stack *middleware.Stack, options Optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_ListParts.go b/service/s3/api_op_ListParts.go index 12daed18ddb..cd95a50fa55 100644 --- a/service/s3/api_op_ListParts.go +++ b/service/s3/api_op_ListParts.go @@ -197,6 +197,9 @@ func addOperationListPartsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -248,6 +251,9 @@ func addOperationListPartsMiddlewares(stack *middleware.Stack, options Options) if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketAccelerateConfiguration.go b/service/s3/api_op_PutBucketAccelerateConfiguration.go index e68a80b312e..b71c122fbc2 100644 --- a/service/s3/api_op_PutBucketAccelerateConfiguration.go +++ b/service/s3/api_op_PutBucketAccelerateConfiguration.go @@ -94,6 +94,9 @@ func addOperationPutBucketAccelerateConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationPutBucketAccelerateConfigurationMiddlewares(stack *middleware.S if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketAcl.go b/service/s3/api_op_PutBucketAcl.go index c105f34ec5f..9e06b48a699 100644 --- a/service/s3/api_op_PutBucketAcl.go +++ b/service/s3/api_op_PutBucketAcl.go @@ -215,6 +215,9 @@ func addOperationPutBucketAclMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -266,6 +269,9 @@ func addOperationPutBucketAclMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketAnalyticsConfiguration.go b/service/s3/api_op_PutBucketAnalyticsConfiguration.go index 34802cbf6ef..596aa6b525c 100644 --- a/service/s3/api_op_PutBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_PutBucketAnalyticsConfiguration.go @@ -126,6 +126,9 @@ func addOperationPutBucketAnalyticsConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationPutBucketAnalyticsConfigurationMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketCors.go b/service/s3/api_op_PutBucketCors.go index df162f4f50c..f9eb487d5d8 100644 --- a/service/s3/api_op_PutBucketCors.go +++ b/service/s3/api_op_PutBucketCors.go @@ -108,6 +108,9 @@ func addOperationPutBucketCorsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationPutBucketCorsMiddlewares(stack *middleware.Stack, options Optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketEncryption.go b/service/s3/api_op_PutBucketEncryption.go index 9ca273fdc7f..b7a3a8d796b 100644 --- a/service/s3/api_op_PutBucketEncryption.go +++ b/service/s3/api_op_PutBucketEncryption.go @@ -92,6 +92,9 @@ func addOperationPutBucketEncryptionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationPutBucketEncryptionMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketInventoryConfiguration.go b/service/s3/api_op_PutBucketInventoryConfiguration.go index 27b1bdc0310..08928452171 100644 --- a/service/s3/api_op_PutBucketInventoryConfiguration.go +++ b/service/s3/api_op_PutBucketInventoryConfiguration.go @@ -126,6 +126,9 @@ func addOperationPutBucketInventoryConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationPutBucketInventoryConfigurationMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketLifecycleConfiguration.go b/service/s3/api_op_PutBucketLifecycleConfiguration.go index 2a394d5e8c5..91b6758b55f 100644 --- a/service/s3/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3/api_op_PutBucketLifecycleConfiguration.go @@ -121,6 +121,9 @@ func addOperationPutBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationPutBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketLogging.go b/service/s3/api_op_PutBucketLogging.go index 784e06f5e31..cea6c5f70bb 100644 --- a/service/s3/api_op_PutBucketLogging.go +++ b/service/s3/api_op_PutBucketLogging.go @@ -106,6 +106,9 @@ func addOperationPutBucketLoggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationPutBucketLoggingMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketMetricsConfiguration.go b/service/s3/api_op_PutBucketMetricsConfiguration.go index 949615a51c5..bc62aca2ba0 100644 --- a/service/s3/api_op_PutBucketMetricsConfiguration.go +++ b/service/s3/api_op_PutBucketMetricsConfiguration.go @@ -101,6 +101,9 @@ func addOperationPutBucketMetricsConfigurationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationPutBucketMetricsConfigurationMiddlewares(stack *middleware.Stac if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketNotificationConfiguration.go b/service/s3/api_op_PutBucketNotificationConfiguration.go index a4971a9c822..3c71c257208 100644 --- a/service/s3/api_op_PutBucketNotificationConfiguration.go +++ b/service/s3/api_op_PutBucketNotificationConfiguration.go @@ -93,6 +93,9 @@ func addOperationPutBucketNotificationConfigurationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationPutBucketNotificationConfigurationMiddlewares(stack *middleware if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketOwnershipControls.go b/service/s3/api_op_PutBucketOwnershipControls.go index e8941d4f37b..97421f2053b 100644 --- a/service/s3/api_op_PutBucketOwnershipControls.go +++ b/service/s3/api_op_PutBucketOwnershipControls.go @@ -71,6 +71,9 @@ func addOperationPutBucketOwnershipControlsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationPutBucketOwnershipControlsMiddlewares(stack *middleware.Stack, if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutBucketPolicy.go b/service/s3/api_op_PutBucketPolicy.go index a2019f5b86c..c021cd8b39f 100644 --- a/service/s3/api_op_PutBucketPolicy.go +++ b/service/s3/api_op_PutBucketPolicy.go @@ -83,6 +83,9 @@ func addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketReplication.go b/service/s3/api_op_PutBucketReplication.go index 90e2ba44c03..404f36537ae 100644 --- a/service/s3/api_op_PutBucketReplication.go +++ b/service/s3/api_op_PutBucketReplication.go @@ -121,6 +121,9 @@ func addOperationPutBucketReplicationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationPutBucketReplicationMiddlewares(stack *middleware.Stack, option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketRequestPayment.go b/service/s3/api_op_PutBucketRequestPayment.go index ffae8b5982c..8431be9e7c9 100644 --- a/service/s3/api_op_PutBucketRequestPayment.go +++ b/service/s3/api_op_PutBucketRequestPayment.go @@ -76,6 +76,9 @@ func addOperationPutBucketRequestPaymentMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationPutBucketRequestPaymentMiddlewares(stack *middleware.Stack, opt if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketTagging.go b/service/s3/api_op_PutBucketTagging.go index 0e64aa29fb7..ca07cf62fd4 100644 --- a/service/s3/api_op_PutBucketTagging.go +++ b/service/s3/api_op_PutBucketTagging.go @@ -120,6 +120,9 @@ func addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketVersioning.go b/service/s3/api_op_PutBucketVersioning.go index f8b9cc2cd34..74cc21b4c17 100644 --- a/service/s3/api_op_PutBucketVersioning.go +++ b/service/s3/api_op_PutBucketVersioning.go @@ -98,6 +98,9 @@ func addOperationPutBucketVersioningMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationPutBucketVersioningMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutBucketWebsite.go b/service/s3/api_op_PutBucketWebsite.go index dfac1230f5f..f0d74d69a1f 100644 --- a/service/s3/api_op_PutBucketWebsite.go +++ b/service/s3/api_op_PutBucketWebsite.go @@ -134,6 +134,9 @@ func addOperationPutBucketWebsiteMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -185,6 +188,9 @@ func addOperationPutBucketWebsiteMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutObject.go b/service/s3/api_op_PutObject.go index 8b823ced544..e8057bf380f 100644 --- a/service/s3/api_op_PutObject.go +++ b/service/s3/api_op_PutObject.go @@ -331,6 +331,9 @@ func addOperationPutObjectMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -382,6 +385,9 @@ func addOperationPutObjectMiddlewares(stack *middleware.Stack, options Options) if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_PutObjectAcl.go b/service/s3/api_op_PutObjectAcl.go index 9653cf50f04..85df889b87c 100644 --- a/service/s3/api_op_PutObjectAcl.go +++ b/service/s3/api_op_PutObjectAcl.go @@ -257,6 +257,9 @@ func addOperationPutObjectAclMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -308,6 +311,9 @@ func addOperationPutObjectAclMiddlewares(stack *middleware.Stack, options Option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutObjectLegalHold.go b/service/s3/api_op_PutObjectLegalHold.go index b58cf3f2806..a3e58ccffd6 100644 --- a/service/s3/api_op_PutObjectLegalHold.go +++ b/service/s3/api_op_PutObjectLegalHold.go @@ -93,6 +93,9 @@ func addOperationPutObjectLegalHoldMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationPutObjectLegalHoldMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutObjectLockConfiguration.go b/service/s3/api_op_PutObjectLockConfiguration.go index 8951c8a9e4c..b63add05d27 100644 --- a/service/s3/api_op_PutObjectLockConfiguration.go +++ b/service/s3/api_op_PutObjectLockConfiguration.go @@ -81,6 +81,9 @@ func addOperationPutObjectLockConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationPutObjectLockConfigurationMiddlewares(stack *middleware.Stack, if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutObjectRetention.go b/service/s3/api_op_PutObjectRetention.go index b732e8e683b..ee7d3a17d4b 100644 --- a/service/s3/api_op_PutObjectRetention.go +++ b/service/s3/api_op_PutObjectRetention.go @@ -97,6 +97,9 @@ func addOperationPutObjectRetentionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationPutObjectRetentionMiddlewares(stack *middleware.Stack, options if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutObjectTagging.go b/service/s3/api_op_PutObjectTagging.go index e5b73593774..3e1438a7a20 100644 --- a/service/s3/api_op_PutObjectTagging.go +++ b/service/s3/api_op_PutObjectTagging.go @@ -133,6 +133,9 @@ func addOperationPutObjectTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -184,6 +187,9 @@ func addOperationPutObjectTaggingMiddlewares(stack *middleware.Stack, options Op if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_PutPublicAccessBlock.go b/service/s3/api_op_PutPublicAccessBlock.go index ab1812a6639..d1a12be6770 100644 --- a/service/s3/api_op_PutPublicAccessBlock.go +++ b/service/s3/api_op_PutPublicAccessBlock.go @@ -95,6 +95,9 @@ func addOperationPutPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationPutPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3/api_op_RestoreObject.go b/service/s3/api_op_RestoreObject.go index ffeca4e04d4..c4d1eb0e50c 100644 --- a/service/s3/api_op_RestoreObject.go +++ b/service/s3/api_op_RestoreObject.go @@ -313,6 +313,9 @@ func addOperationRestoreObjectMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -364,6 +367,9 @@ func addOperationRestoreObjectMiddlewares(stack *middleware.Stack, options Optio if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_UploadPart.go b/service/s3/api_op_UploadPart.go index a230bc55e24..99dbc3da6d0 100644 --- a/service/s3/api_op_UploadPart.go +++ b/service/s3/api_op_UploadPart.go @@ -243,6 +243,9 @@ func addOperationUploadPartMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -294,6 +297,9 @@ func addOperationUploadPartMiddlewares(stack *middleware.Stack, options Options) if err = disableAcceptEncodingGzip(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/api_op_UploadPartCopy.go b/service/s3/api_op_UploadPartCopy.go index 8b589c265d5..1f0beb0c0bc 100644 --- a/service/s3/api_op_UploadPartCopy.go +++ b/service/s3/api_op_UploadPartCopy.go @@ -327,6 +327,9 @@ func addOperationUploadPartCopyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -381,6 +384,9 @@ func addOperationUploadPartCopyMiddlewares(stack *middleware.Stack, options Opti if err = s3cust.HandleResponseErrorWith200Status(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3/go.mod b/service/s3/go.mod index 68c194e3ccd..b9d11504650 100644 --- a/service/s3/go.mod +++ b/service/s3/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.3.0 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3/go.sum b/service/s3/go.sum index bf7474a0ab2..c669e324b14 100644 --- a/service/s3/go.sum +++ b/service/s3/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3/internal/configtesting/go.sum b/service/s3/internal/configtesting/go.sum index bf7474a0ab2..c669e324b14 100644 --- a/service/s3/internal/configtesting/go.sum +++ b/service/s3/internal/configtesting/go.sum @@ -1,7 +1,3 @@ -github.com/awslabs/smithy-go v0.3.0 h1:I1EQ1P+VtxpuNnGYymATewaKrlnaYQwFvO8lNTsafbs= -github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go index 8e299c0de42..9b524a69f59 100644 --- a/service/s3control/api_client.go +++ b/service/s3control/api_client.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/internal/s3shared" s3controlcust "github.com/aws/aws-sdk-go-v2/service/s3control/internal/customizations" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -133,14 +142,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -179,15 +201,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -200,7 +222,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -221,3 +244,12 @@ func addUpdateEndpointMiddleware(stack *middleware.Stack, options Options) error func addResponseErrorMiddleware(stack *middleware.Stack) error { return s3shared.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/s3control/api_op_CreateAccessPoint.go b/service/s3control/api_op_CreateAccessPoint.go index 9b521956a3d..f108b163e6a 100644 --- a/service/s3control/api_op_CreateAccessPoint.go +++ b/service/s3control/api_op_CreateAccessPoint.go @@ -125,6 +125,9 @@ func addOperationCreateAccessPointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationCreateAccessPointMiddlewares(stack *middleware.Stack, options O if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_CreateBucket.go b/service/s3control/api_op_CreateBucket.go index cc3b480f0fe..eb83c536014 100644 --- a/service/s3control/api_op_CreateBucket.go +++ b/service/s3control/api_op_CreateBucket.go @@ -145,6 +145,9 @@ func addOperationCreateBucketMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -193,6 +196,9 @@ func addOperationCreateBucketMiddlewares(stack *middleware.Stack, options Option if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3control/api_op_CreateJob.go b/service/s3control/api_op_CreateJob.go index 0726b76f462..a31b150b02e 100644 --- a/service/s3control/api_op_CreateJob.go +++ b/service/s3control/api_op_CreateJob.go @@ -125,6 +125,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteAccessPoint.go b/service/s3control/api_op_DeleteAccessPoint.go index 9067cfbab4a..1c5f41340e7 100644 --- a/service/s3control/api_op_DeleteAccessPoint.go +++ b/service/s3control/api_op_DeleteAccessPoint.go @@ -81,6 +81,9 @@ func addOperationDeleteAccessPointMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDeleteAccessPointMiddlewares(stack *middleware.Stack, options O if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteAccessPointPolicy.go b/service/s3control/api_op_DeleteAccessPointPolicy.go index 412338adcb9..ad9c5e16300 100644 --- a/service/s3control/api_op_DeleteAccessPointPolicy.go +++ b/service/s3control/api_op_DeleteAccessPointPolicy.go @@ -77,6 +77,9 @@ func addOperationDeleteAccessPointPolicyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDeleteAccessPointPolicyMiddlewares(stack *middleware.Stack, opt if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteBucket.go b/service/s3control/api_op_DeleteBucket.go index b3974a2fccb..e4ad1c40e92 100644 --- a/service/s3control/api_op_DeleteBucket.go +++ b/service/s3control/api_op_DeleteBucket.go @@ -87,6 +87,9 @@ func addOperationDeleteBucketMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationDeleteBucketMiddlewares(stack *middleware.Stack, options Option if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go index 16c72d20673..c1bfa18935c 100644 --- a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go @@ -92,6 +92,9 @@ func addOperationDeleteBucketLifecycleConfigurationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDeleteBucketLifecycleConfigurationMiddlewares(stack *middleware if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteBucketPolicy.go b/service/s3control/api_op_DeleteBucketPolicy.go index 6b01bfb8e85..a4e41abc12d 100644 --- a/service/s3control/api_op_DeleteBucketPolicy.go +++ b/service/s3control/api_op_DeleteBucketPolicy.go @@ -95,6 +95,9 @@ func addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Stack, options if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteBucketTagging.go b/service/s3control/api_op_DeleteBucketTagging.go index 0c7db98ac73..c558ca6df3c 100644 --- a/service/s3control/api_op_DeleteBucketTagging.go +++ b/service/s3control/api_op_DeleteBucketTagging.go @@ -85,6 +85,9 @@ func addOperationDeleteBucketTaggingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDeleteBucketTaggingMiddlewares(stack *middleware.Stack, options if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeleteJobTagging.go b/service/s3control/api_op_DeleteJobTagging.go index be2da6aebf7..ef1b980b4d1 100644 --- a/service/s3control/api_op_DeleteJobTagging.go +++ b/service/s3control/api_op_DeleteJobTagging.go @@ -73,6 +73,9 @@ func addOperationDeleteJobTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationDeleteJobTaggingMiddlewares(stack *middleware.Stack, options Op if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DeletePublicAccessBlock.go b/service/s3control/api_op_DeletePublicAccessBlock.go index 3e6a0c277df..f19cb3e1fca 100644 --- a/service/s3control/api_op_DeletePublicAccessBlock.go +++ b/service/s3control/api_op_DeletePublicAccessBlock.go @@ -62,6 +62,9 @@ func addOperationDeletePublicAccessBlockMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeletePublicAccessBlockMiddlewares(stack *middleware.Stack, opt if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_DescribeJob.go b/service/s3control/api_op_DescribeJob.go index fd7c66c9cf3..eb06a74f711 100644 --- a/service/s3control/api_op_DescribeJob.go +++ b/service/s3control/api_op_DescribeJob.go @@ -81,6 +81,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetAccessPoint.go b/service/s3control/api_op_GetAccessPoint.go index f4460795bd4..442f0cc5f33 100644 --- a/service/s3control/api_op_GetAccessPoint.go +++ b/service/s3control/api_op_GetAccessPoint.go @@ -114,6 +114,9 @@ func addOperationGetAccessPointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationGetAccessPointMiddlewares(stack *middleware.Stack, options Opti if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetAccessPointPolicy.go b/service/s3control/api_op_GetAccessPointPolicy.go index f579f375862..648c738b506 100644 --- a/service/s3control/api_op_GetAccessPointPolicy.go +++ b/service/s3control/api_op_GetAccessPointPolicy.go @@ -74,6 +74,9 @@ func addOperationGetAccessPointPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetAccessPointPolicyMiddlewares(stack *middleware.Stack, option if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetAccessPointPolicyStatus.go b/service/s3control/api_op_GetAccessPointPolicyStatus.go index af4d176b69c..e17d6eb3e3e 100644 --- a/service/s3control/api_op_GetAccessPointPolicyStatus.go +++ b/service/s3control/api_op_GetAccessPointPolicyStatus.go @@ -65,6 +65,9 @@ func addOperationGetAccessPointPolicyStatusMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetAccessPointPolicyStatusMiddlewares(stack *middleware.Stack, if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetBucket.go b/service/s3control/api_op_GetBucket.go index 1b625a56371..a344077c0b8 100644 --- a/service/s3control/api_op_GetBucket.go +++ b/service/s3control/api_op_GetBucket.go @@ -86,6 +86,9 @@ func addOperationGetBucketMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationGetBucketMiddlewares(stack *middleware.Stack, options Options) if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetBucketLifecycleConfiguration.go b/service/s3control/api_op_GetBucketLifecycleConfiguration.go index 02170ff1f52..d7144b8f40a 100644 --- a/service/s3control/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_GetBucketLifecycleConfiguration.go @@ -112,6 +112,9 @@ func addOperationGetBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationGetBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetBucketPolicy.go b/service/s3control/api_op_GetBucketPolicy.go index ee71151ac19..9f967592b90 100644 --- a/service/s3control/api_op_GetBucketPolicy.go +++ b/service/s3control/api_op_GetBucketPolicy.go @@ -101,6 +101,9 @@ func addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetBucketTagging.go b/service/s3control/api_op_GetBucketTagging.go index e345fae0ed2..7be3a07ad49 100644 --- a/service/s3control/api_op_GetBucketTagging.go +++ b/service/s3control/api_op_GetBucketTagging.go @@ -100,6 +100,9 @@ func addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetJobTagging.go b/service/s3control/api_op_GetJobTagging.go index 388dab58042..c5b6f831eba 100644 --- a/service/s3control/api_op_GetJobTagging.go +++ b/service/s3control/api_op_GetJobTagging.go @@ -77,6 +77,9 @@ func addOperationGetJobTaggingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetJobTaggingMiddlewares(stack *middleware.Stack, options Optio if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_GetPublicAccessBlock.go b/service/s3control/api_op_GetPublicAccessBlock.go index 030cb86b5fc..c936f2470db 100644 --- a/service/s3control/api_op_GetPublicAccessBlock.go +++ b/service/s3control/api_op_GetPublicAccessBlock.go @@ -67,6 +67,9 @@ func addOperationGetPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_ListAccessPoints.go b/service/s3control/api_op_ListAccessPoints.go index 89da9b8633d..b58d3131d22 100644 --- a/service/s3control/api_op_ListAccessPoints.go +++ b/service/s3control/api_op_ListAccessPoints.go @@ -105,6 +105,9 @@ func addOperationListAccessPointsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationListAccessPointsMiddlewares(stack *middleware.Stack, options Op if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_ListJobs.go b/service/s3control/api_op_ListJobs.go index b2c00028b8d..580ba919af7 100644 --- a/service/s3control/api_op_ListJobs.go +++ b/service/s3control/api_op_ListJobs.go @@ -96,6 +96,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_ListRegionalBuckets.go b/service/s3control/api_op_ListRegionalBuckets.go index 4fedeeb7321..5ef02d5d309 100644 --- a/service/s3control/api_op_ListRegionalBuckets.go +++ b/service/s3control/api_op_ListRegionalBuckets.go @@ -77,6 +77,9 @@ func addOperationListRegionalBucketsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListRegionalBucketsMiddlewares(stack *middleware.Stack, options if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_PutAccessPointPolicy.go b/service/s3control/api_op_PutAccessPointPolicy.go index df6b6426313..d3e64e15106 100644 --- a/service/s3control/api_op_PutAccessPointPolicy.go +++ b/service/s3control/api_op_PutAccessPointPolicy.go @@ -89,6 +89,9 @@ func addOperationPutAccessPointPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationPutAccessPointPolicyMiddlewares(stack *middleware.Stack, option if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_PutBucketLifecycleConfiguration.go b/service/s3control/api_op_PutBucketLifecycleConfiguration.go index a730018a57c..f1fc94b0115 100644 --- a/service/s3control/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_PutBucketLifecycleConfiguration.go @@ -84,6 +84,9 @@ func addOperationPutBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationPutBucketLifecycleConfigurationMiddlewares(stack *middleware.St if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3control/api_op_PutBucketPolicy.go b/service/s3control/api_op_PutBucketPolicy.go index b2fe585b576..7c6cdf10837 100644 --- a/service/s3control/api_op_PutBucketPolicy.go +++ b/service/s3control/api_op_PutBucketPolicy.go @@ -103,6 +103,9 @@ func addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack, options Opt if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3control/api_op_PutBucketTagging.go b/service/s3control/api_op_PutBucketTagging.go index bccb3f26602..0fb655ff07b 100644 --- a/service/s3control/api_op_PutBucketTagging.go +++ b/service/s3control/api_op_PutBucketTagging.go @@ -139,6 +139,9 @@ func addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack, options Op if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } if err = smithyhttp.AddContentChecksumMiddleware(stack); err != nil { return err } diff --git a/service/s3control/api_op_PutJobTagging.go b/service/s3control/api_op_PutJobTagging.go index 62103c52530..bc50640862e 100644 --- a/service/s3control/api_op_PutJobTagging.go +++ b/service/s3control/api_op_PutJobTagging.go @@ -120,6 +120,9 @@ func addOperationPutJobTaggingMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationPutJobTaggingMiddlewares(stack *middleware.Stack, options Optio if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_PutPublicAccessBlock.go b/service/s3control/api_op_PutPublicAccessBlock.go index ca246c73492..a26739e71fa 100644 --- a/service/s3control/api_op_PutPublicAccessBlock.go +++ b/service/s3control/api_op_PutPublicAccessBlock.go @@ -69,6 +69,9 @@ func addOperationPutPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationPutPublicAccessBlockMiddlewares(stack *middleware.Stack, option if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_UpdateJobPriority.go b/service/s3control/api_op_UpdateJobPriority.go index 59b1403547c..a337bc46981 100644 --- a/service/s3control/api_op_UpdateJobPriority.go +++ b/service/s3control/api_op_UpdateJobPriority.go @@ -91,6 +91,9 @@ func addOperationUpdateJobPriorityMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationUpdateJobPriorityMiddlewares(stack *middleware.Stack, options O if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/api_op_UpdateJobStatus.go b/service/s3control/api_op_UpdateJobStatus.go index c596e014489..78950698668 100644 --- a/service/s3control/api_op_UpdateJobStatus.go +++ b/service/s3control/api_op_UpdateJobStatus.go @@ -96,6 +96,9 @@ func addOperationUpdateJobStatusMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationUpdateJobStatusMiddlewares(stack *middleware.Stack, options Opt if err = v4.AddContentSHA256HeaderMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3control/go.mod b/service/s3control/go.mod index 5828d7cd574..8d2d952a19f 100644 --- a/service/s3control/go.mod +++ b/service/s3control/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v0.29.0 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3control/go.sum b/service/s3control/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/s3control/go.sum +++ b/service/s3control/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3outposts/api_client.go b/service/s3outposts/api_client.go index c58fe2696ae..ef2e5898f82 100644 --- a/service/s3outposts/api_client.go +++ b/service/s3outposts/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/s3outposts/api_op_CreateEndpoint.go b/service/s3outposts/api_op_CreateEndpoint.go index 5b342f02d6a..2507fe19e59 100644 --- a/service/s3outposts/api_op_CreateEndpoint.go +++ b/service/s3outposts/api_op_CreateEndpoint.go @@ -73,6 +73,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3outposts/api_op_DeleteEndpoint.go b/service/s3outposts/api_op_DeleteEndpoint.go index e854f134967..400212ce0db 100644 --- a/service/s3outposts/api_op_DeleteEndpoint.go +++ b/service/s3outposts/api_op_DeleteEndpoint.go @@ -64,6 +64,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3outposts/api_op_ListEndpoints.go b/service/s3outposts/api_op_ListEndpoints.go index eec0555541c..2971fa308e9 100644 --- a/service/s3outposts/api_op_ListEndpoints.go +++ b/service/s3outposts/api_op_ListEndpoints.go @@ -68,6 +68,9 @@ func addOperationListEndpointsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListEndpointsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/s3outposts/go.mod b/service/s3outposts/go.mod index 31b7e0fe908..6ad758e7d7b 100644 --- a/service/s3outposts/go.mod +++ b/service/s3outposts/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/s3outposts go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3outposts/go.sum b/service/s3outposts/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/s3outposts/go.sum +++ b/service/s3outposts/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemaker/api_client.go b/service/sagemaker/api_client.go index a66e4d1f81d..d462ea434a0 100644 --- a/service/sagemaker/api_client.go +++ b/service/sagemaker/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sagemaker/api_op_AddTags.go b/service/sagemaker/api_op_AddTags.go index 6d7bdb60458..14f41da7c13 100644 --- a/service/sagemaker/api_op_AddTags.go +++ b/service/sagemaker/api_op_AddTags.go @@ -74,6 +74,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationAddTagsMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_AssociateTrialComponent.go b/service/sagemaker/api_op_AssociateTrialComponent.go index ca71468a455..c96af963b32 100644 --- a/service/sagemaker/api_op_AssociateTrialComponent.go +++ b/service/sagemaker/api_op_AssociateTrialComponent.go @@ -62,6 +62,9 @@ func addOperationAssociateTrialComponentMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAssociateTrialComponentMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateAlgorithm.go b/service/sagemaker/api_op_CreateAlgorithm.go index 1d6ce9759a3..e511475f2fc 100644 --- a/service/sagemaker/api_op_CreateAlgorithm.go +++ b/service/sagemaker/api_op_CreateAlgorithm.go @@ -108,6 +108,9 @@ func addOperationCreateAlgorithmMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationCreateAlgorithmMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateApp.go b/service/sagemaker/api_op_CreateApp.go index e82bc18ee39..6c35a49226a 100644 --- a/service/sagemaker/api_op_CreateApp.go +++ b/service/sagemaker/api_op_CreateApp.go @@ -80,6 +80,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateAppImageConfig.go b/service/sagemaker/api_op_CreateAppImageConfig.go index 005d28b2edd..09ccbab3bba 100644 --- a/service/sagemaker/api_op_CreateAppImageConfig.go +++ b/service/sagemaker/api_op_CreateAppImageConfig.go @@ -60,6 +60,9 @@ func addOperationCreateAppImageConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateAppImageConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateAutoMLJob.go b/service/sagemaker/api_op_CreateAutoMLJob.go index 647badd8ba7..e1b918b694c 100644 --- a/service/sagemaker/api_op_CreateAutoMLJob.go +++ b/service/sagemaker/api_op_CreateAutoMLJob.go @@ -99,6 +99,9 @@ func addOperationCreateAutoMLJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationCreateAutoMLJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateCodeRepository.go b/service/sagemaker/api_op_CreateCodeRepository.go index 82d7a351a23..7afdb46bc41 100644 --- a/service/sagemaker/api_op_CreateCodeRepository.go +++ b/service/sagemaker/api_op_CreateCodeRepository.go @@ -70,6 +70,9 @@ func addOperationCreateCodeRepositoryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationCreateCodeRepositoryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateCompilationJob.go b/service/sagemaker/api_op_CreateCompilationJob.go index cd86dc49ae5..73c82025f0c 100644 --- a/service/sagemaker/api_op_CreateCompilationJob.go +++ b/service/sagemaker/api_op_CreateCompilationJob.go @@ -132,6 +132,9 @@ func addOperationCreateCompilationJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationCreateCompilationJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateDomain.go b/service/sagemaker/api_op_CreateDomain.go index 43f25c7f354..43f9c6e5184 100644 --- a/service/sagemaker/api_op_CreateDomain.go +++ b/service/sagemaker/api_op_CreateDomain.go @@ -123,6 +123,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationCreateDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateEndpoint.go b/service/sagemaker/api_op_CreateEndpoint.go index 216bd19f7e2..d1edceae3ed 100644 --- a/service/sagemaker/api_op_CreateEndpoint.go +++ b/service/sagemaker/api_op_CreateEndpoint.go @@ -105,6 +105,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateEndpointConfig.go b/service/sagemaker/api_op_CreateEndpointConfig.go index ed8dfc8990b..0ac8dee71f9 100644 --- a/service/sagemaker/api_op_CreateEndpointConfig.go +++ b/service/sagemaker/api_op_CreateEndpointConfig.go @@ -133,6 +133,9 @@ func addOperationCreateEndpointConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationCreateEndpointConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateExperiment.go b/service/sagemaker/api_op_CreateExperiment.go index efcd52cc87a..aaba899942e 100644 --- a/service/sagemaker/api_op_CreateExperiment.go +++ b/service/sagemaker/api_op_CreateExperiment.go @@ -81,6 +81,9 @@ func addOperationCreateExperimentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationCreateExperimentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateFlowDefinition.go b/service/sagemaker/api_op_CreateFlowDefinition.go index 7e7f27066d6..f6a782c8af4 100644 --- a/service/sagemaker/api_op_CreateFlowDefinition.go +++ b/service/sagemaker/api_op_CreateFlowDefinition.go @@ -86,6 +86,9 @@ func addOperationCreateFlowDefinitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateFlowDefinitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateHumanTaskUi.go b/service/sagemaker/api_op_CreateHumanTaskUi.go index 5b8639aedb2..45af213179b 100644 --- a/service/sagemaker/api_op_CreateHumanTaskUi.go +++ b/service/sagemaker/api_op_CreateHumanTaskUi.go @@ -68,6 +68,9 @@ func addOperationCreateHumanTaskUiMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateHumanTaskUiMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateHyperParameterTuningJob.go b/service/sagemaker/api_op_CreateHyperParameterTuningJob.go index 2c267400a4e..d068208ce74 100644 --- a/service/sagemaker/api_op_CreateHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_CreateHyperParameterTuningJob.go @@ -105,6 +105,9 @@ func addOperationCreateHyperParameterTuningJobMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationCreateHyperParameterTuningJobMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateImage.go b/service/sagemaker/api_op_CreateImage.go index 3fa87f14c06..c6dfad5ddf1 100644 --- a/service/sagemaker/api_op_CreateImage.go +++ b/service/sagemaker/api_op_CreateImage.go @@ -71,6 +71,9 @@ func addOperationCreateImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateImageVersion.go b/service/sagemaker/api_op_CreateImageVersion.go index e80ce9b1717..9a89c672515 100644 --- a/service/sagemaker/api_op_CreateImageVersion.go +++ b/service/sagemaker/api_op_CreateImageVersion.go @@ -68,6 +68,9 @@ func addOperationCreateImageVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateImageVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateLabelingJob.go b/service/sagemaker/api_op_CreateLabelingJob.go index 7be4585e3af..f855d1f298a 100644 --- a/service/sagemaker/api_op_CreateLabelingJob.go +++ b/service/sagemaker/api_op_CreateLabelingJob.go @@ -177,6 +177,9 @@ func addOperationCreateLabelingJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -219,6 +222,9 @@ func addOperationCreateLabelingJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateModel.go b/service/sagemaker/api_op_CreateModel.go index f6af69b5fd4..28e00e948b1 100644 --- a/service/sagemaker/api_op_CreateModel.go +++ b/service/sagemaker/api_op_CreateModel.go @@ -114,6 +114,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationCreateModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateModelPackage.go b/service/sagemaker/api_op_CreateModelPackage.go index 7a86446de93..84787e081fa 100644 --- a/service/sagemaker/api_op_CreateModelPackage.go +++ b/service/sagemaker/api_op_CreateModelPackage.go @@ -87,6 +87,9 @@ func addOperationCreateModelPackageMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateModelPackageMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateMonitoringSchedule.go b/service/sagemaker/api_op_CreateMonitoringSchedule.go index cafef039fc1..2fe878838ac 100644 --- a/service/sagemaker/api_op_CreateMonitoringSchedule.go +++ b/service/sagemaker/api_op_CreateMonitoringSchedule.go @@ -69,6 +69,9 @@ func addOperationCreateMonitoringScheduleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateMonitoringScheduleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateNotebookInstance.go b/service/sagemaker/api_op_CreateNotebookInstance.go index 3e1c55e9cb2..11712acda66 100644 --- a/service/sagemaker/api_op_CreateNotebookInstance.go +++ b/service/sagemaker/api_op_CreateNotebookInstance.go @@ -177,6 +177,9 @@ func addOperationCreateNotebookInstanceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -219,6 +222,9 @@ func addOperationCreateNotebookInstanceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go index 287f07f5eff..2d02fe7424e 100644 --- a/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go @@ -74,6 +74,9 @@ func addOperationCreateNotebookInstanceLifecycleConfigMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateNotebookInstanceLifecycleConfigMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreatePresignedDomainUrl.go b/service/sagemaker/api_op_CreatePresignedDomainUrl.go index c1982d52750..83f03203b4e 100644 --- a/service/sagemaker/api_op_CreatePresignedDomainUrl.go +++ b/service/sagemaker/api_op_CreatePresignedDomainUrl.go @@ -67,6 +67,9 @@ func addOperationCreatePresignedDomainUrlMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreatePresignedDomainUrlMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go b/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go index 42e8ac9fbe6..ab282591e0e 100644 --- a/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go +++ b/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go @@ -72,6 +72,9 @@ func addOperationCreatePresignedNotebookInstanceUrlMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreatePresignedNotebookInstanceUrlMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateProcessingJob.go b/service/sagemaker/api_op_CreateProcessingJob.go index bca5e5cd137..f5d0a69b3f4 100644 --- a/service/sagemaker/api_op_CreateProcessingJob.go +++ b/service/sagemaker/api_op_CreateProcessingJob.go @@ -107,6 +107,9 @@ func addOperationCreateProcessingJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationCreateProcessingJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateTrainingJob.go b/service/sagemaker/api_op_CreateTrainingJob.go index 25d06d12916..9d0eab6ebdd 100644 --- a/service/sagemaker/api_op_CreateTrainingJob.go +++ b/service/sagemaker/api_op_CreateTrainingJob.go @@ -241,6 +241,9 @@ func addOperationCreateTrainingJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -283,6 +286,9 @@ func addOperationCreateTrainingJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateTransformJob.go b/service/sagemaker/api_op_CreateTransformJob.go index 8a62b79b50e..ac1a95235b3 100644 --- a/service/sagemaker/api_op_CreateTransformJob.go +++ b/service/sagemaker/api_op_CreateTransformJob.go @@ -172,6 +172,9 @@ func addOperationCreateTransformJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -214,6 +217,9 @@ func addOperationCreateTransformJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateTrial.go b/service/sagemaker/api_op_CreateTrial.go index 571dc8487b9..31dad33aeba 100644 --- a/service/sagemaker/api_op_CreateTrial.go +++ b/service/sagemaker/api_op_CreateTrial.go @@ -76,6 +76,9 @@ func addOperationCreateTrialMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateTrialMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateTrialComponent.go b/service/sagemaker/api_op_CreateTrialComponent.go index 4672f22c496..9784b505773 100644 --- a/service/sagemaker/api_op_CreateTrialComponent.go +++ b/service/sagemaker/api_op_CreateTrialComponent.go @@ -101,6 +101,9 @@ func addOperationCreateTrialComponentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationCreateTrialComponentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateUserProfile.go b/service/sagemaker/api_op_CreateUserProfile.go index e2b8acf6458..dd9432750fa 100644 --- a/service/sagemaker/api_op_CreateUserProfile.go +++ b/service/sagemaker/api_op_CreateUserProfile.go @@ -83,6 +83,9 @@ func addOperationCreateUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationCreateUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateWorkforce.go b/service/sagemaker/api_op_CreateWorkforce.go index 41e3d2cf8a5..dcc3e650acb 100644 --- a/service/sagemaker/api_op_CreateWorkforce.go +++ b/service/sagemaker/api_op_CreateWorkforce.go @@ -92,6 +92,9 @@ func addOperationCreateWorkforceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreateWorkforceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_CreateWorkteam.go b/service/sagemaker/api_op_CreateWorkteam.go index 4e1e61a00c8..35e626aa42c 100644 --- a/service/sagemaker/api_op_CreateWorkteam.go +++ b/service/sagemaker/api_op_CreateWorkteam.go @@ -95,6 +95,9 @@ func addOperationCreateWorkteamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateWorkteamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteAlgorithm.go b/service/sagemaker/api_op_DeleteAlgorithm.go index 5b3bb8d1803..9f706212403 100644 --- a/service/sagemaker/api_op_DeleteAlgorithm.go +++ b/service/sagemaker/api_op_DeleteAlgorithm.go @@ -48,6 +48,9 @@ func addOperationDeleteAlgorithmMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAlgorithmMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteApp.go b/service/sagemaker/api_op_DeleteApp.go index ccac771d67b..cde191529a3 100644 --- a/service/sagemaker/api_op_DeleteApp.go +++ b/service/sagemaker/api_op_DeleteApp.go @@ -64,6 +64,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteAppImageConfig.go b/service/sagemaker/api_op_DeleteAppImageConfig.go index 56bbded2052..02fccabb0d7 100644 --- a/service/sagemaker/api_op_DeleteAppImageConfig.go +++ b/service/sagemaker/api_op_DeleteAppImageConfig.go @@ -48,6 +48,9 @@ func addOperationDeleteAppImageConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAppImageConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteCodeRepository.go b/service/sagemaker/api_op_DeleteCodeRepository.go index ebf250c352f..3a281e1da54 100644 --- a/service/sagemaker/api_op_DeleteCodeRepository.go +++ b/service/sagemaker/api_op_DeleteCodeRepository.go @@ -48,6 +48,9 @@ func addOperationDeleteCodeRepositoryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteCodeRepositoryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteDomain.go b/service/sagemaker/api_op_DeleteDomain.go index 9bc9bcbbdb2..a438586d658 100644 --- a/service/sagemaker/api_op_DeleteDomain.go +++ b/service/sagemaker/api_op_DeleteDomain.go @@ -57,6 +57,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteEndpoint.go b/service/sagemaker/api_op_DeleteEndpoint.go index 29e7fa32215..2e6e23221f9 100644 --- a/service/sagemaker/api_op_DeleteEndpoint.go +++ b/service/sagemaker/api_op_DeleteEndpoint.go @@ -53,6 +53,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteEndpointConfig.go b/service/sagemaker/api_op_DeleteEndpointConfig.go index 92ef752cb19..54d3d44f342 100644 --- a/service/sagemaker/api_op_DeleteEndpointConfig.go +++ b/service/sagemaker/api_op_DeleteEndpointConfig.go @@ -55,6 +55,9 @@ func addOperationDeleteEndpointConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteEndpointConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteExperiment.go b/service/sagemaker/api_op_DeleteExperiment.go index bbdc4761f6c..36d4156ec1f 100644 --- a/service/sagemaker/api_op_DeleteExperiment.go +++ b/service/sagemaker/api_op_DeleteExperiment.go @@ -54,6 +54,9 @@ func addOperationDeleteExperimentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteExperimentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteFlowDefinition.go b/service/sagemaker/api_op_DeleteFlowDefinition.go index 9ad314d270b..9f308296239 100644 --- a/service/sagemaker/api_op_DeleteFlowDefinition.go +++ b/service/sagemaker/api_op_DeleteFlowDefinition.go @@ -48,6 +48,9 @@ func addOperationDeleteFlowDefinitionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteFlowDefinitionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteHumanTaskUi.go b/service/sagemaker/api_op_DeleteHumanTaskUi.go index 84650f01a65..b617e03a504 100644 --- a/service/sagemaker/api_op_DeleteHumanTaskUi.go +++ b/service/sagemaker/api_op_DeleteHumanTaskUi.go @@ -52,6 +52,9 @@ func addOperationDeleteHumanTaskUiMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteHumanTaskUiMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteImage.go b/service/sagemaker/api_op_DeleteImage.go index 7d8ce3a38ee..16e8ddc7d7e 100644 --- a/service/sagemaker/api_op_DeleteImage.go +++ b/service/sagemaker/api_op_DeleteImage.go @@ -49,6 +49,9 @@ func addOperationDeleteImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteImageVersion.go b/service/sagemaker/api_op_DeleteImageVersion.go index 5af88d9c9c1..096b415753e 100644 --- a/service/sagemaker/api_op_DeleteImageVersion.go +++ b/service/sagemaker/api_op_DeleteImageVersion.go @@ -54,6 +54,9 @@ func addOperationDeleteImageVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteImageVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteModel.go b/service/sagemaker/api_op_DeleteModel.go index d138851b66c..16f473991ff 100644 --- a/service/sagemaker/api_op_DeleteModel.go +++ b/service/sagemaker/api_op_DeleteModel.go @@ -51,6 +51,9 @@ func addOperationDeleteModelMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteModelMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteModelPackage.go b/service/sagemaker/api_op_DeleteModelPackage.go index 68c97200b81..4289fe95454 100644 --- a/service/sagemaker/api_op_DeleteModelPackage.go +++ b/service/sagemaker/api_op_DeleteModelPackage.go @@ -51,6 +51,9 @@ func addOperationDeleteModelPackageMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteModelPackageMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteMonitoringSchedule.go b/service/sagemaker/api_op_DeleteMonitoringSchedule.go index a56017705b2..dd9f3d26bb4 100644 --- a/service/sagemaker/api_op_DeleteMonitoringSchedule.go +++ b/service/sagemaker/api_op_DeleteMonitoringSchedule.go @@ -50,6 +50,9 @@ func addOperationDeleteMonitoringScheduleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteMonitoringScheduleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteNotebookInstance.go b/service/sagemaker/api_op_DeleteNotebookInstance.go index 57b108c36d4..5f8fbc73c30 100644 --- a/service/sagemaker/api_op_DeleteNotebookInstance.go +++ b/service/sagemaker/api_op_DeleteNotebookInstance.go @@ -52,6 +52,9 @@ func addOperationDeleteNotebookInstanceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteNotebookInstanceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go index 4a2063dcaf6..63004ec4f6f 100644 --- a/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go @@ -48,6 +48,9 @@ func addOperationDeleteNotebookInstanceLifecycleConfigMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteNotebookInstanceLifecycleConfigMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteTags.go b/service/sagemaker/api_op_DeleteTags.go index 5368a8c0556..01bf7e420bd 100644 --- a/service/sagemaker/api_op_DeleteTags.go +++ b/service/sagemaker/api_op_DeleteTags.go @@ -56,6 +56,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteTrial.go b/service/sagemaker/api_op_DeleteTrial.go index 14452d9df1f..7e099b27b1f 100644 --- a/service/sagemaker/api_op_DeleteTrial.go +++ b/service/sagemaker/api_op_DeleteTrial.go @@ -54,6 +54,9 @@ func addOperationDeleteTrialMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteTrialMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteTrialComponent.go b/service/sagemaker/api_op_DeleteTrialComponent.go index c538416e2b1..3aafcb96c5a 100644 --- a/service/sagemaker/api_op_DeleteTrialComponent.go +++ b/service/sagemaker/api_op_DeleteTrialComponent.go @@ -54,6 +54,9 @@ func addOperationDeleteTrialComponentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteTrialComponentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteUserProfile.go b/service/sagemaker/api_op_DeleteUserProfile.go index 308123f89ed..8a722ed6bee 100644 --- a/service/sagemaker/api_op_DeleteUserProfile.go +++ b/service/sagemaker/api_op_DeleteUserProfile.go @@ -54,6 +54,9 @@ func addOperationDeleteUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteWorkforce.go b/service/sagemaker/api_op_DeleteWorkforce.go index 4dc830e6c8d..a458ddf6be9 100644 --- a/service/sagemaker/api_op_DeleteWorkforce.go +++ b/service/sagemaker/api_op_DeleteWorkforce.go @@ -53,6 +53,9 @@ func addOperationDeleteWorkforceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteWorkforceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DeleteWorkteam.go b/service/sagemaker/api_op_DeleteWorkteam.go index bc519224032..4ee201a4999 100644 --- a/service/sagemaker/api_op_DeleteWorkteam.go +++ b/service/sagemaker/api_op_DeleteWorkteam.go @@ -55,6 +55,9 @@ func addOperationDeleteWorkteamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteWorkteamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeAlgorithm.go b/service/sagemaker/api_op_DescribeAlgorithm.go index e743aeabfe4..200449fb6d4 100644 --- a/service/sagemaker/api_op_DescribeAlgorithm.go +++ b/service/sagemaker/api_op_DescribeAlgorithm.go @@ -97,6 +97,9 @@ func addOperationDescribeAlgorithmMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationDescribeAlgorithmMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeApp.go b/service/sagemaker/api_op_DescribeApp.go index 41b565a59ea..24c8114899a 100644 --- a/service/sagemaker/api_op_DescribeApp.go +++ b/service/sagemaker/api_op_DescribeApp.go @@ -100,6 +100,9 @@ func addOperationDescribeAppMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationDescribeAppMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeAppImageConfig.go b/service/sagemaker/api_op_DescribeAppImageConfig.go index ea3d10a161b..e182d72866c 100644 --- a/service/sagemaker/api_op_DescribeAppImageConfig.go +++ b/service/sagemaker/api_op_DescribeAppImageConfig.go @@ -66,6 +66,9 @@ func addOperationDescribeAppImageConfigMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeAppImageConfigMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeAutoMLJob.go b/service/sagemaker/api_op_DescribeAutoMLJob.go index 46ca6184a80..f6ba4c284bd 100644 --- a/service/sagemaker/api_op_DescribeAutoMLJob.go +++ b/service/sagemaker/api_op_DescribeAutoMLJob.go @@ -127,6 +127,9 @@ func addOperationDescribeAutoMLJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationDescribeAutoMLJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeCodeRepository.go b/service/sagemaker/api_op_DescribeCodeRepository.go index 02aab774214..291496b6c47 100644 --- a/service/sagemaker/api_op_DescribeCodeRepository.go +++ b/service/sagemaker/api_op_DescribeCodeRepository.go @@ -77,6 +77,9 @@ func addOperationDescribeCodeRepositoryMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeCodeRepositoryMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeCompilationJob.go b/service/sagemaker/api_op_DescribeCompilationJob.go index 85a78703577..04d0f204281 100644 --- a/service/sagemaker/api_op_DescribeCompilationJob.go +++ b/service/sagemaker/api_op_DescribeCompilationJob.go @@ -129,6 +129,9 @@ func addOperationDescribeCompilationJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationDescribeCompilationJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeDomain.go b/service/sagemaker/api_op_DescribeDomain.go index f3214d59dec..1dc3eaae3be 100644 --- a/service/sagemaker/api_op_DescribeDomain.go +++ b/service/sagemaker/api_op_DescribeDomain.go @@ -108,6 +108,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeEndpoint.go b/service/sagemaker/api_op_DescribeEndpoint.go index 77d10a2e7c1..0813eb71cb7 100644 --- a/service/sagemaker/api_op_DescribeEndpoint.go +++ b/service/sagemaker/api_op_DescribeEndpoint.go @@ -123,6 +123,9 @@ func addOperationDescribeEndpointMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationDescribeEndpointMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeEndpointConfig.go b/service/sagemaker/api_op_DescribeEndpointConfig.go index 2c1a00cccd4..c7028c65185 100644 --- a/service/sagemaker/api_op_DescribeEndpointConfig.go +++ b/service/sagemaker/api_op_DescribeEndpointConfig.go @@ -80,6 +80,9 @@ func addOperationDescribeEndpointConfigMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeEndpointConfigMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeExperiment.go b/service/sagemaker/api_op_DescribeExperiment.go index 90583e6c290..abe8c521d48 100644 --- a/service/sagemaker/api_op_DescribeExperiment.go +++ b/service/sagemaker/api_op_DescribeExperiment.go @@ -79,6 +79,9 @@ func addOperationDescribeExperimentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeExperimentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeFlowDefinition.go b/service/sagemaker/api_op_DescribeFlowDefinition.go index 30a487dd959..329b93392e4 100644 --- a/service/sagemaker/api_op_DescribeFlowDefinition.go +++ b/service/sagemaker/api_op_DescribeFlowDefinition.go @@ -98,6 +98,9 @@ func addOperationDescribeFlowDefinitionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationDescribeFlowDefinitionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeHumanTaskUi.go b/service/sagemaker/api_op_DescribeHumanTaskUi.go index e3f26754eda..47319f68927 100644 --- a/service/sagemaker/api_op_DescribeHumanTaskUi.go +++ b/service/sagemaker/api_op_DescribeHumanTaskUi.go @@ -78,6 +78,9 @@ func addOperationDescribeHumanTaskUiMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeHumanTaskUiMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go b/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go index 5b66a635bb8..1c3e88fffac 100644 --- a/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go @@ -125,6 +125,9 @@ func addOperationDescribeHyperParameterTuningJobMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -167,6 +170,9 @@ func addOperationDescribeHyperParameterTuningJobMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeImage.go b/service/sagemaker/api_op_DescribeImage.go index 4f6676cd245..b68e7f6a53f 100644 --- a/service/sagemaker/api_op_DescribeImage.go +++ b/service/sagemaker/api_op_DescribeImage.go @@ -79,6 +79,9 @@ func addOperationDescribeImageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeImageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeImageVersion.go b/service/sagemaker/api_op_DescribeImageVersion.go index 748228e3c65..f4c55fb0a38 100644 --- a/service/sagemaker/api_op_DescribeImageVersion.go +++ b/service/sagemaker/api_op_DescribeImageVersion.go @@ -81,6 +81,9 @@ func addOperationDescribeImageVersionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeImageVersionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeLabelingJob.go b/service/sagemaker/api_op_DescribeLabelingJob.go index f5fea29b296..2e99d9e9928 100644 --- a/service/sagemaker/api_op_DescribeLabelingJob.go +++ b/service/sagemaker/api_op_DescribeLabelingJob.go @@ -177,6 +177,9 @@ func addOperationDescribeLabelingJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -219,6 +222,9 @@ func addOperationDescribeLabelingJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeModel.go b/service/sagemaker/api_op_DescribeModel.go index 849844413dd..f02b5c8f1ab 100644 --- a/service/sagemaker/api_op_DescribeModel.go +++ b/service/sagemaker/api_op_DescribeModel.go @@ -87,6 +87,9 @@ func addOperationDescribeModelMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeModelMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeModelPackage.go b/service/sagemaker/api_op_DescribeModelPackage.go index 2943c1859b0..23feae73e50 100644 --- a/service/sagemaker/api_op_DescribeModelPackage.go +++ b/service/sagemaker/api_op_DescribeModelPackage.go @@ -96,6 +96,9 @@ func addOperationDescribeModelPackageMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationDescribeModelPackageMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeMonitoringSchedule.go b/service/sagemaker/api_op_DescribeMonitoringSchedule.go index 169da3176e9..249ff37d963 100644 --- a/service/sagemaker/api_op_DescribeMonitoringSchedule.go +++ b/service/sagemaker/api_op_DescribeMonitoringSchedule.go @@ -92,6 +92,9 @@ func addOperationDescribeMonitoringScheduleMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeMonitoringScheduleMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeNotebookInstance.go b/service/sagemaker/api_op_DescribeNotebookInstance.go index 4bdb5166437..74f01342a40 100644 --- a/service/sagemaker/api_op_DescribeNotebookInstance.go +++ b/service/sagemaker/api_op_DescribeNotebookInstance.go @@ -144,6 +144,9 @@ func addOperationDescribeNotebookInstanceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -186,6 +189,9 @@ func addOperationDescribeNotebookInstanceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go index fb6ec91be58..5e37b057320 100644 --- a/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go @@ -73,6 +73,9 @@ func addOperationDescribeNotebookInstanceLifecycleConfigMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeNotebookInstanceLifecycleConfigMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeProcessingJob.go b/service/sagemaker/api_op_DescribeProcessingJob.go index 6db071936e8..afce973b51a 100644 --- a/service/sagemaker/api_op_DescribeProcessingJob.go +++ b/service/sagemaker/api_op_DescribeProcessingJob.go @@ -134,6 +134,9 @@ func addOperationDescribeProcessingJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationDescribeProcessingJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeSubscribedWorkteam.go b/service/sagemaker/api_op_DescribeSubscribedWorkteam.go index d68f43484c8..b44efe9438a 100644 --- a/service/sagemaker/api_op_DescribeSubscribedWorkteam.go +++ b/service/sagemaker/api_op_DescribeSubscribedWorkteam.go @@ -56,6 +56,9 @@ func addOperationDescribeSubscribedWorkteamMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeSubscribedWorkteamMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeTrainingJob.go b/service/sagemaker/api_op_DescribeTrainingJob.go index 7e6de06607f..6c0cd97bb8d 100644 --- a/service/sagemaker/api_op_DescribeTrainingJob.go +++ b/service/sagemaker/api_op_DescribeTrainingJob.go @@ -292,6 +292,9 @@ func addOperationDescribeTrainingJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -334,6 +337,9 @@ func addOperationDescribeTrainingJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeTransformJob.go b/service/sagemaker/api_op_DescribeTransformJob.go index 74d9f47ee4d..a6e59b5e00f 100644 --- a/service/sagemaker/api_op_DescribeTransformJob.go +++ b/service/sagemaker/api_op_DescribeTransformJob.go @@ -158,6 +158,9 @@ func addOperationDescribeTransformJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -200,6 +203,9 @@ func addOperationDescribeTransformJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeTrial.go b/service/sagemaker/api_op_DescribeTrial.go index 472a1dad01a..87b6534467b 100644 --- a/service/sagemaker/api_op_DescribeTrial.go +++ b/service/sagemaker/api_op_DescribeTrial.go @@ -79,6 +79,9 @@ func addOperationDescribeTrialMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeTrialMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeTrialComponent.go b/service/sagemaker/api_op_DescribeTrialComponent.go index 2db9c24af5c..4bfe6961ec3 100644 --- a/service/sagemaker/api_op_DescribeTrialComponent.go +++ b/service/sagemaker/api_op_DescribeTrialComponent.go @@ -104,6 +104,9 @@ func addOperationDescribeTrialComponentMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationDescribeTrialComponentMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeUserProfile.go b/service/sagemaker/api_op_DescribeUserProfile.go index f26462115d3..2d43bda7fc9 100644 --- a/service/sagemaker/api_op_DescribeUserProfile.go +++ b/service/sagemaker/api_op_DescribeUserProfile.go @@ -89,6 +89,9 @@ func addOperationDescribeUserProfileMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeUserProfileMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeWorkforce.go b/service/sagemaker/api_op_DescribeWorkforce.go index e7e9a98735a..d3daba94416 100644 --- a/service/sagemaker/api_op_DescribeWorkforce.go +++ b/service/sagemaker/api_op_DescribeWorkforce.go @@ -66,6 +66,9 @@ func addOperationDescribeWorkforceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeWorkforceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DescribeWorkteam.go b/service/sagemaker/api_op_DescribeWorkteam.go index 24ced4af327..1d7bf2f4233 100644 --- a/service/sagemaker/api_op_DescribeWorkteam.go +++ b/service/sagemaker/api_op_DescribeWorkteam.go @@ -57,6 +57,9 @@ func addOperationDescribeWorkteamMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeWorkteamMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_DisassociateTrialComponent.go b/service/sagemaker/api_op_DisassociateTrialComponent.go index 600ae8dd58a..275c1bf7855 100644 --- a/service/sagemaker/api_op_DisassociateTrialComponent.go +++ b/service/sagemaker/api_op_DisassociateTrialComponent.go @@ -66,6 +66,9 @@ func addOperationDisassociateTrialComponentMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDisassociateTrialComponentMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_GetSearchSuggestions.go b/service/sagemaker/api_op_GetSearchSuggestions.go index e27e1a285fb..c852b9370c4 100644 --- a/service/sagemaker/api_op_GetSearchSuggestions.go +++ b/service/sagemaker/api_op_GetSearchSuggestions.go @@ -58,6 +58,9 @@ func addOperationGetSearchSuggestionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetSearchSuggestionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListAlgorithms.go b/service/sagemaker/api_op_ListAlgorithms.go index 359a19aa7af..e9624aca3b5 100644 --- a/service/sagemaker/api_op_ListAlgorithms.go +++ b/service/sagemaker/api_op_ListAlgorithms.go @@ -81,6 +81,9 @@ func addOperationListAlgorithmsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListAlgorithmsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListAppImageConfigs.go b/service/sagemaker/api_op_ListAppImageConfigs.go index 6cfa3c924c5..a93f8b1656d 100644 --- a/service/sagemaker/api_op_ListAppImageConfigs.go +++ b/service/sagemaker/api_op_ListAppImageConfigs.go @@ -89,6 +89,9 @@ func addOperationListAppImageConfigsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListAppImageConfigsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListApps.go b/service/sagemaker/api_op_ListApps.go index bd12785d35d..e5b8aca995e 100644 --- a/service/sagemaker/api_op_ListApps.go +++ b/service/sagemaker/api_op_ListApps.go @@ -71,6 +71,9 @@ func addOperationListAppsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListAppsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListAutoMLJobs.go b/service/sagemaker/api_op_ListAutoMLJobs.go index cbabd798515..1f691201be5 100644 --- a/service/sagemaker/api_op_ListAutoMLJobs.go +++ b/service/sagemaker/api_op_ListAutoMLJobs.go @@ -86,6 +86,9 @@ func addOperationListAutoMLJobsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationListAutoMLJobsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go b/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go index 0c7d91a7c08..e7bab993ac2 100644 --- a/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go +++ b/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go @@ -78,6 +78,9 @@ func addOperationListCandidatesForAutoMLJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListCandidatesForAutoMLJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListCodeRepositories.go b/service/sagemaker/api_op_ListCodeRepositories.go index f66396ebe29..2083a7cc33b 100644 --- a/service/sagemaker/api_op_ListCodeRepositories.go +++ b/service/sagemaker/api_op_ListCodeRepositories.go @@ -104,6 +104,9 @@ func addOperationListCodeRepositoriesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationListCodeRepositoriesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListCompilationJobs.go b/service/sagemaker/api_op_ListCompilationJobs.go index cd54ae4991e..f684e4d35e1 100644 --- a/service/sagemaker/api_op_ListCompilationJobs.go +++ b/service/sagemaker/api_op_ListCompilationJobs.go @@ -97,6 +97,9 @@ func addOperationListCompilationJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationListCompilationJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListDomains.go b/service/sagemaker/api_op_ListDomains.go index 42023bbe50f..c5e7d11a71f 100644 --- a/service/sagemaker/api_op_ListDomains.go +++ b/service/sagemaker/api_op_ListDomains.go @@ -59,6 +59,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListEndpointConfigs.go b/service/sagemaker/api_op_ListEndpointConfigs.go index 75ce355c67d..98029015c89 100644 --- a/service/sagemaker/api_op_ListEndpointConfigs.go +++ b/service/sagemaker/api_op_ListEndpointConfigs.go @@ -81,6 +81,9 @@ func addOperationListEndpointConfigsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListEndpointConfigsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListEndpoints.go b/service/sagemaker/api_op_ListEndpoints.go index 8aabce17ff7..baeddf0ef7b 100644 --- a/service/sagemaker/api_op_ListEndpoints.go +++ b/service/sagemaker/api_op_ListEndpoints.go @@ -92,6 +92,9 @@ func addOperationListEndpointsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListEndpointsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListExperiments.go b/service/sagemaker/api_op_ListExperiments.go index 6709f74e4ad..29b6f04ea31 100644 --- a/service/sagemaker/api_op_ListExperiments.go +++ b/service/sagemaker/api_op_ListExperiments.go @@ -74,6 +74,9 @@ func addOperationListExperimentsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListExperimentsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListFlowDefinitions.go b/service/sagemaker/api_op_ListFlowDefinitions.go index d9a24751568..abb9ade21be 100644 --- a/service/sagemaker/api_op_ListFlowDefinitions.go +++ b/service/sagemaker/api_op_ListFlowDefinitions.go @@ -74,6 +74,9 @@ func addOperationListFlowDefinitionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListFlowDefinitionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListHumanTaskUis.go b/service/sagemaker/api_op_ListHumanTaskUis.go index bd55db87e6f..2e3f5239f0c 100644 --- a/service/sagemaker/api_op_ListHumanTaskUis.go +++ b/service/sagemaker/api_op_ListHumanTaskUis.go @@ -74,6 +74,9 @@ func addOperationListHumanTaskUisMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListHumanTaskUisMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListHyperParameterTuningJobs.go b/service/sagemaker/api_op_ListHyperParameterTuningJobs.go index 111399cb8ca..e5961a3c6b3 100644 --- a/service/sagemaker/api_op_ListHyperParameterTuningJobs.go +++ b/service/sagemaker/api_op_ListHyperParameterTuningJobs.go @@ -95,6 +95,9 @@ func addOperationListHyperParameterTuningJobsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationListHyperParameterTuningJobsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListImageVersions.go b/service/sagemaker/api_op_ListImageVersions.go index 53b27bb2064..c70bc8e157c 100644 --- a/service/sagemaker/api_op_ListImageVersions.go +++ b/service/sagemaker/api_op_ListImageVersions.go @@ -84,6 +84,9 @@ func addOperationListImageVersionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListImageVersionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListImages.go b/service/sagemaker/api_op_ListImages.go index 784aba40677..f56b0f136a0 100644 --- a/service/sagemaker/api_op_ListImages.go +++ b/service/sagemaker/api_op_ListImages.go @@ -82,6 +82,9 @@ func addOperationListImagesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListImagesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListLabelingJobs.go b/service/sagemaker/api_op_ListLabelingJobs.go index b545e10c05e..1abf0c6b780 100644 --- a/service/sagemaker/api_op_ListLabelingJobs.go +++ b/service/sagemaker/api_op_ListLabelingJobs.go @@ -90,6 +90,9 @@ func addOperationListLabelingJobsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListLabelingJobsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go b/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go index e675839700a..9e9823395fc 100644 --- a/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go +++ b/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go @@ -87,6 +87,9 @@ func addOperationListLabelingJobsForWorkteamMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListLabelingJobsForWorkteamMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListModelPackages.go b/service/sagemaker/api_op_ListModelPackages.go index ee0d9aa922f..e163842b6db 100644 --- a/service/sagemaker/api_op_ListModelPackages.go +++ b/service/sagemaker/api_op_ListModelPackages.go @@ -81,6 +81,9 @@ func addOperationListModelPackagesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListModelPackagesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListModels.go b/service/sagemaker/api_op_ListModels.go index 48ec3f338ab..aa46abe7fcc 100644 --- a/service/sagemaker/api_op_ListModels.go +++ b/service/sagemaker/api_op_ListModels.go @@ -80,6 +80,9 @@ func addOperationListModelsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListModelsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListMonitoringExecutions.go b/service/sagemaker/api_op_ListMonitoringExecutions.go index 53704a4083c..5cdc0105561 100644 --- a/service/sagemaker/api_op_ListMonitoringExecutions.go +++ b/service/sagemaker/api_op_ListMonitoringExecutions.go @@ -97,6 +97,9 @@ func addOperationListMonitoringExecutionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationListMonitoringExecutionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListMonitoringSchedules.go b/service/sagemaker/api_op_ListMonitoringSchedules.go index f8abc2a52a6..26ddd9c2c2e 100644 --- a/service/sagemaker/api_op_ListMonitoringSchedules.go +++ b/service/sagemaker/api_op_ListMonitoringSchedules.go @@ -93,6 +93,9 @@ func addOperationListMonitoringSchedulesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationListMonitoringSchedulesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go b/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go index e51e5e36f54..0d7aff45bfa 100644 --- a/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go +++ b/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go @@ -89,6 +89,9 @@ func addOperationListNotebookInstanceLifecycleConfigsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListNotebookInstanceLifecycleConfigsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListNotebookInstances.go b/service/sagemaker/api_op_ListNotebookInstances.go index e01e33f9a9c..c5fdde4b4c0 100644 --- a/service/sagemaker/api_op_ListNotebookInstances.go +++ b/service/sagemaker/api_op_ListNotebookInstances.go @@ -110,6 +110,9 @@ func addOperationListNotebookInstancesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationListNotebookInstancesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListProcessingJobs.go b/service/sagemaker/api_op_ListProcessingJobs.go index 5d0ef997fc7..ab472820984 100644 --- a/service/sagemaker/api_op_ListProcessingJobs.go +++ b/service/sagemaker/api_op_ListProcessingJobs.go @@ -88,6 +88,9 @@ func addOperationListProcessingJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListProcessingJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListSubscribedWorkteams.go b/service/sagemaker/api_op_ListSubscribedWorkteams.go index 62b751f80ee..5e043bf5330 100644 --- a/service/sagemaker/api_op_ListSubscribedWorkteams.go +++ b/service/sagemaker/api_op_ListSubscribedWorkteams.go @@ -68,6 +68,9 @@ func addOperationListSubscribedWorkteamsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListSubscribedWorkteamsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListTags.go b/service/sagemaker/api_op_ListTags.go index 207ee29a931..9597492bb51 100644 --- a/service/sagemaker/api_op_ListTags.go +++ b/service/sagemaker/api_op_ListTags.go @@ -65,6 +65,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListTagsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListTrainingJobs.go b/service/sagemaker/api_op_ListTrainingJobs.go index f44e48a1cc7..45f3fea683a 100644 --- a/service/sagemaker/api_op_ListTrainingJobs.go +++ b/service/sagemaker/api_op_ListTrainingJobs.go @@ -92,6 +92,9 @@ func addOperationListTrainingJobsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListTrainingJobsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go b/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go index d36edcb9689..e64deb20970 100644 --- a/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go @@ -81,6 +81,9 @@ func addOperationListTrainingJobsForHyperParameterTuningJobMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationListTrainingJobsForHyperParameterTuningJobMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListTransformJobs.go b/service/sagemaker/api_op_ListTransformJobs.go index 0fb8f535983..06548d79715 100644 --- a/service/sagemaker/api_op_ListTransformJobs.go +++ b/service/sagemaker/api_op_ListTransformJobs.go @@ -89,6 +89,9 @@ func addOperationListTransformJobsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListTransformJobsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListTrialComponents.go b/service/sagemaker/api_op_ListTrialComponents.go index 1a18453d621..8cf20ea8a23 100644 --- a/service/sagemaker/api_op_ListTrialComponents.go +++ b/service/sagemaker/api_op_ListTrialComponents.go @@ -94,6 +94,9 @@ func addOperationListTrialComponentsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListTrialComponentsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListTrials.go b/service/sagemaker/api_op_ListTrials.go index 93c9a1482c9..a6e1893f8e8 100644 --- a/service/sagemaker/api_op_ListTrials.go +++ b/service/sagemaker/api_op_ListTrials.go @@ -82,6 +82,9 @@ func addOperationListTrialsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListTrialsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListUserProfiles.go b/service/sagemaker/api_op_ListUserProfiles.go index 3a77ea3434c..fd22ad72765 100644 --- a/service/sagemaker/api_op_ListUserProfiles.go +++ b/service/sagemaker/api_op_ListUserProfiles.go @@ -71,6 +71,9 @@ func addOperationListUserProfilesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListUserProfilesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListWorkforces.go b/service/sagemaker/api_op_ListWorkforces.go index 5ad33f6dadc..947536a0f4b 100644 --- a/service/sagemaker/api_op_ListWorkforces.go +++ b/service/sagemaker/api_op_ListWorkforces.go @@ -69,6 +69,9 @@ func addOperationListWorkforcesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListWorkforcesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_ListWorkteams.go b/service/sagemaker/api_op_ListWorkteams.go index 150ff36fd96..f60974b39b4 100644 --- a/service/sagemaker/api_op_ListWorkteams.go +++ b/service/sagemaker/api_op_ListWorkteams.go @@ -74,6 +74,9 @@ func addOperationListWorkteamsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListWorkteamsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_RenderUiTemplate.go b/service/sagemaker/api_op_RenderUiTemplate.go index 8285cbd35e9..8cf0a1267d8 100644 --- a/service/sagemaker/api_op_RenderUiTemplate.go +++ b/service/sagemaker/api_op_RenderUiTemplate.go @@ -75,6 +75,9 @@ func addOperationRenderUiTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationRenderUiTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_Search.go b/service/sagemaker/api_op_Search.go index b92c94b6657..2c78acff4b0 100644 --- a/service/sagemaker/api_op_Search.go +++ b/service/sagemaker/api_op_Search.go @@ -84,6 +84,9 @@ func addOperationSearchMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationSearchMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StartMonitoringSchedule.go b/service/sagemaker/api_op_StartMonitoringSchedule.go index 9874554d670..81dbc04539e 100644 --- a/service/sagemaker/api_op_StartMonitoringSchedule.go +++ b/service/sagemaker/api_op_StartMonitoringSchedule.go @@ -49,6 +49,9 @@ func addOperationStartMonitoringScheduleMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationStartMonitoringScheduleMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StartNotebookInstance.go b/service/sagemaker/api_op_StartNotebookInstance.go index 85227a2f884..17b7fba795b 100644 --- a/service/sagemaker/api_op_StartNotebookInstance.go +++ b/service/sagemaker/api_op_StartNotebookInstance.go @@ -51,6 +51,9 @@ func addOperationStartNotebookInstanceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationStartNotebookInstanceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopAutoMLJob.go b/service/sagemaker/api_op_StopAutoMLJob.go index 678a18cf3f0..482c4695b77 100644 --- a/service/sagemaker/api_op_StopAutoMLJob.go +++ b/service/sagemaker/api_op_StopAutoMLJob.go @@ -48,6 +48,9 @@ func addOperationStopAutoMLJobMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopAutoMLJobMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopCompilationJob.go b/service/sagemaker/api_op_StopCompilationJob.go index cd01a42ad56..c3aa5ae44af 100644 --- a/service/sagemaker/api_op_StopCompilationJob.go +++ b/service/sagemaker/api_op_StopCompilationJob.go @@ -54,6 +54,9 @@ func addOperationStopCompilationJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStopCompilationJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopHyperParameterTuningJob.go b/service/sagemaker/api_op_StopHyperParameterTuningJob.go index 56678c5b7ad..38bc5e0c3a9 100644 --- a/service/sagemaker/api_op_StopHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_StopHyperParameterTuningJob.go @@ -53,6 +53,9 @@ func addOperationStopHyperParameterTuningJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopHyperParameterTuningJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopLabelingJob.go b/service/sagemaker/api_op_StopLabelingJob.go index 05b8d3ca60d..c456f4671f6 100644 --- a/service/sagemaker/api_op_StopLabelingJob.go +++ b/service/sagemaker/api_op_StopLabelingJob.go @@ -50,6 +50,9 @@ func addOperationStopLabelingJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationStopLabelingJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopMonitoringSchedule.go b/service/sagemaker/api_op_StopMonitoringSchedule.go index 7211c834b80..0633b2523f4 100644 --- a/service/sagemaker/api_op_StopMonitoringSchedule.go +++ b/service/sagemaker/api_op_StopMonitoringSchedule.go @@ -48,6 +48,9 @@ func addOperationStopMonitoringScheduleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopMonitoringScheduleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopNotebookInstance.go b/service/sagemaker/api_op_StopNotebookInstance.go index 6baff4cc6cc..f81f331bee6 100644 --- a/service/sagemaker/api_op_StopNotebookInstance.go +++ b/service/sagemaker/api_op_StopNotebookInstance.go @@ -55,6 +55,9 @@ func addOperationStopNotebookInstanceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStopNotebookInstanceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopProcessingJob.go b/service/sagemaker/api_op_StopProcessingJob.go index d9d2ffc084a..502e7b3875c 100644 --- a/service/sagemaker/api_op_StopProcessingJob.go +++ b/service/sagemaker/api_op_StopProcessingJob.go @@ -48,6 +48,9 @@ func addOperationStopProcessingJobMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopProcessingJobMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopTrainingJob.go b/service/sagemaker/api_op_StopTrainingJob.go index 0fe83a4690b..ddf46ed2d24 100644 --- a/service/sagemaker/api_op_StopTrainingJob.go +++ b/service/sagemaker/api_op_StopTrainingJob.go @@ -53,6 +53,9 @@ func addOperationStopTrainingJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopTrainingJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_StopTransformJob.go b/service/sagemaker/api_op_StopTransformJob.go index 15a8c703602..e4edfb2dad1 100644 --- a/service/sagemaker/api_op_StopTransformJob.go +++ b/service/sagemaker/api_op_StopTransformJob.go @@ -51,6 +51,9 @@ func addOperationStopTransformJobMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationStopTransformJobMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateAppImageConfig.go b/service/sagemaker/api_op_UpdateAppImageConfig.go index 24eb8d7f67a..52dcfceaa0e 100644 --- a/service/sagemaker/api_op_UpdateAppImageConfig.go +++ b/service/sagemaker/api_op_UpdateAppImageConfig.go @@ -56,6 +56,9 @@ func addOperationUpdateAppImageConfigMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateAppImageConfigMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateCodeRepository.go b/service/sagemaker/api_op_UpdateCodeRepository.go index 80c2c6c79e7..ffdef038b1f 100644 --- a/service/sagemaker/api_op_UpdateCodeRepository.go +++ b/service/sagemaker/api_op_UpdateCodeRepository.go @@ -62,6 +62,9 @@ func addOperationUpdateCodeRepositoryMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateCodeRepositoryMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateDomain.go b/service/sagemaker/api_op_UpdateDomain.go index 64e46e2d8c3..63d080814cc 100644 --- a/service/sagemaker/api_op_UpdateDomain.go +++ b/service/sagemaker/api_op_UpdateDomain.go @@ -56,6 +56,9 @@ func addOperationUpdateDomainMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateDomainMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateEndpoint.go b/service/sagemaker/api_op_UpdateEndpoint.go index 01f2742f2e7..f4fea02d6f5 100644 --- a/service/sagemaker/api_op_UpdateEndpoint.go +++ b/service/sagemaker/api_op_UpdateEndpoint.go @@ -86,6 +86,9 @@ func addOperationUpdateEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationUpdateEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go b/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go index 755af786fdf..33e62d41c71 100644 --- a/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go +++ b/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go @@ -64,6 +64,9 @@ func addOperationUpdateEndpointWeightsAndCapacitiesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateEndpointWeightsAndCapacitiesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateExperiment.go b/service/sagemaker/api_op_UpdateExperiment.go index 4a5bd838a1c..c430dee3752 100644 --- a/service/sagemaker/api_op_UpdateExperiment.go +++ b/service/sagemaker/api_op_UpdateExperiment.go @@ -60,6 +60,9 @@ func addOperationUpdateExperimentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateExperimentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateImage.go b/service/sagemaker/api_op_UpdateImage.go index 70cec0a2bc2..9ca2f577a26 100644 --- a/service/sagemaker/api_op_UpdateImage.go +++ b/service/sagemaker/api_op_UpdateImage.go @@ -67,6 +67,9 @@ func addOperationUpdateImageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateImageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateMonitoringSchedule.go b/service/sagemaker/api_op_UpdateMonitoringSchedule.go index 937aaee3708..32337bd8f23 100644 --- a/service/sagemaker/api_op_UpdateMonitoringSchedule.go +++ b/service/sagemaker/api_op_UpdateMonitoringSchedule.go @@ -62,6 +62,9 @@ func addOperationUpdateMonitoringScheduleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateMonitoringScheduleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateNotebookInstance.go b/service/sagemaker/api_op_UpdateNotebookInstance.go index 94640a73843..9e071276fe2 100644 --- a/service/sagemaker/api_op_UpdateNotebookInstance.go +++ b/service/sagemaker/api_op_UpdateNotebookInstance.go @@ -131,6 +131,9 @@ func addOperationUpdateNotebookInstanceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationUpdateNotebookInstanceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go index 07b26c038cd..2138a57ca91 100644 --- a/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go @@ -59,6 +59,9 @@ func addOperationUpdateNotebookInstanceLifecycleConfigMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateNotebookInstanceLifecycleConfigMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateTrial.go b/service/sagemaker/api_op_UpdateTrial.go index bc16f54836b..a04612e84e7 100644 --- a/service/sagemaker/api_op_UpdateTrial.go +++ b/service/sagemaker/api_op_UpdateTrial.go @@ -56,6 +56,9 @@ func addOperationUpdateTrialMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateTrialMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateTrialComponent.go b/service/sagemaker/api_op_UpdateTrialComponent.go index 6669feaefb0..d74a6b15c92 100644 --- a/service/sagemaker/api_op_UpdateTrialComponent.go +++ b/service/sagemaker/api_op_UpdateTrialComponent.go @@ -86,6 +86,9 @@ func addOperationUpdateTrialComponentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationUpdateTrialComponentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateUserProfile.go b/service/sagemaker/api_op_UpdateUserProfile.go index 1c3f1bc5b51..06ab5ba5a50 100644 --- a/service/sagemaker/api_op_UpdateUserProfile.go +++ b/service/sagemaker/api_op_UpdateUserProfile.go @@ -61,6 +61,9 @@ func addOperationUpdateUserProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateUserProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateWorkforce.go b/service/sagemaker/api_op_UpdateWorkforce.go index 5e224e5a28e..ae7fb458ad3 100644 --- a/service/sagemaker/api_op_UpdateWorkforce.go +++ b/service/sagemaker/api_op_UpdateWorkforce.go @@ -84,6 +84,9 @@ func addOperationUpdateWorkforceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationUpdateWorkforceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/api_op_UpdateWorkteam.go b/service/sagemaker/api_op_UpdateWorkteam.go index f980478feff..f8b890f4ab1 100644 --- a/service/sagemaker/api_op_UpdateWorkteam.go +++ b/service/sagemaker/api_op_UpdateWorkteam.go @@ -82,6 +82,9 @@ func addOperationUpdateWorkteamMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateWorkteamMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemaker/go.mod b/service/sagemaker/go.mod index e2f82b5e868..2cd613aeca8 100644 --- a/service/sagemaker/go.mod +++ b/service/sagemaker/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sagemaker go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemaker/go.sum b/service/sagemaker/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sagemaker/go.sum +++ b/service/sagemaker/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemakera2iruntime/api_client.go b/service/sagemakera2iruntime/api_client.go index 882259622e1..f38f3fe4db2 100644 --- a/service/sagemakera2iruntime/api_client.go +++ b/service/sagemakera2iruntime/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go b/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go index e21f676022c..f6410c13965 100644 --- a/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go @@ -48,6 +48,9 @@ func addOperationDeleteHumanLoopMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteHumanLoopMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go b/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go index 279e34b1c5c..f29eeded6c4 100644 --- a/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go @@ -88,6 +88,9 @@ func addOperationDescribeHumanLoopMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeHumanLoopMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemakera2iruntime/api_op_ListHumanLoops.go b/service/sagemakera2iruntime/api_op_ListHumanLoops.go index 03aeb556d4f..5f7ac38f17b 100644 --- a/service/sagemakera2iruntime/api_op_ListHumanLoops.go +++ b/service/sagemakera2iruntime/api_op_ListHumanLoops.go @@ -80,6 +80,9 @@ func addOperationListHumanLoopsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListHumanLoopsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemakera2iruntime/api_op_StartHumanLoop.go b/service/sagemakera2iruntime/api_op_StartHumanLoop.go index 4de459bd5af..f8faff36d80 100644 --- a/service/sagemakera2iruntime/api_op_StartHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_StartHumanLoop.go @@ -68,6 +68,9 @@ func addOperationStartHumanLoopMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationStartHumanLoopMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemakera2iruntime/api_op_StopHumanLoop.go b/service/sagemakera2iruntime/api_op_StopHumanLoop.go index cfa82a48dab..48d5d65ffa2 100644 --- a/service/sagemakera2iruntime/api_op_StopHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_StopHumanLoop.go @@ -48,6 +48,9 @@ func addOperationStopHumanLoopMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationStopHumanLoopMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemakera2iruntime/go.mod b/service/sagemakera2iruntime/go.mod index 0c0ad561526..9d15c1aab4a 100644 --- a/service/sagemakera2iruntime/go.mod +++ b/service/sagemakera2iruntime/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakera2iruntime go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakera2iruntime/go.sum b/service/sagemakera2iruntime/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sagemakera2iruntime/go.sum +++ b/service/sagemakera2iruntime/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemakerruntime/api_client.go b/service/sagemakerruntime/api_client.go index 3f105178ff2..a3105809d64 100644 --- a/service/sagemakerruntime/api_client.go +++ b/service/sagemakerruntime/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sagemakerruntime/api_op_InvokeEndpoint.go b/service/sagemakerruntime/api_op_InvokeEndpoint.go index cfb90a144f8..50ebcdcfc43 100644 --- a/service/sagemakerruntime/api_op_InvokeEndpoint.go +++ b/service/sagemakerruntime/api_op_InvokeEndpoint.go @@ -129,6 +129,9 @@ func addOperationInvokeEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationInvokeEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sagemakerruntime/go.mod b/service/sagemakerruntime/go.mod index 2e63c42b7f6..f7e90433281 100644 --- a/service/sagemakerruntime/go.mod +++ b/service/sagemakerruntime/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakerruntime go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakerruntime/go.sum b/service/sagemakerruntime/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sagemakerruntime/go.sum +++ b/service/sagemakerruntime/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/savingsplans/api_client.go b/service/savingsplans/api_client.go index 2b67b20759f..002db74057f 100644 --- a/service/savingsplans/api_client.go +++ b/service/savingsplans/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/savingsplans/api_op_CreateSavingsPlan.go b/service/savingsplans/api_op_CreateSavingsPlan.go index b9749f3614e..59de516c2e4 100644 --- a/service/savingsplans/api_op_CreateSavingsPlan.go +++ b/service/savingsplans/api_op_CreateSavingsPlan.go @@ -76,6 +76,9 @@ func addOperationCreateSavingsPlanMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateSavingsPlanMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_DeleteQueuedSavingsPlan.go b/service/savingsplans/api_op_DeleteQueuedSavingsPlan.go index 9c06b962acc..de38b2c1a69 100644 --- a/service/savingsplans/api_op_DeleteQueuedSavingsPlan.go +++ b/service/savingsplans/api_op_DeleteQueuedSavingsPlan.go @@ -48,6 +48,9 @@ func addOperationDeleteQueuedSavingsPlanMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteQueuedSavingsPlanMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_DescribeSavingsPlanRates.go b/service/savingsplans/api_op_DescribeSavingsPlanRates.go index 3fe46ed9a31..b633b3ea668 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlanRates.go +++ b/service/savingsplans/api_op_DescribeSavingsPlanRates.go @@ -70,6 +70,9 @@ func addOperationDescribeSavingsPlanRatesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeSavingsPlanRatesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_DescribeSavingsPlans.go b/service/savingsplans/api_op_DescribeSavingsPlans.go index f95223bd6f7..3bb255d5d95 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlans.go +++ b/service/savingsplans/api_op_DescribeSavingsPlans.go @@ -71,6 +71,9 @@ func addOperationDescribeSavingsPlansMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeSavingsPlansMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go b/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go index 33286845cbf..4f49f70b048 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go +++ b/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go @@ -83,6 +83,9 @@ func addOperationDescribeSavingsPlansOfferingRatesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDescribeSavingsPlansOfferingRatesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go b/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go index 3b29c1c368e..dda2a6a9cec 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go +++ b/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go @@ -92,6 +92,9 @@ func addOperationDescribeSavingsPlansOfferingsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeSavingsPlansOfferingsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_ListTagsForResource.go b/service/savingsplans/api_op_ListTagsForResource.go index e7c4bfa2ceb..7c4974b96ca 100644 --- a/service/savingsplans/api_op_ListTagsForResource.go +++ b/service/savingsplans/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_TagResource.go b/service/savingsplans/api_op_TagResource.go index 93725f620bb..b0e43e0c990 100644 --- a/service/savingsplans/api_op_TagResource.go +++ b/service/savingsplans/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/api_op_UntagResource.go b/service/savingsplans/api_op_UntagResource.go index eec55e6fae6..89b0d143eb4 100644 --- a/service/savingsplans/api_op_UntagResource.go +++ b/service/savingsplans/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/savingsplans/go.mod b/service/savingsplans/go.mod index 6e3d0b0b9b6..fe4fa9b4229 100644 --- a/service/savingsplans/go.mod +++ b/service/savingsplans/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/savingsplans go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/savingsplans/go.sum b/service/savingsplans/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/savingsplans/go.sum +++ b/service/savingsplans/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/schemas/api_client.go b/service/schemas/api_client.go index 4f9812cf7ea..bed7220c4f5 100644 --- a/service/schemas/api_client.go +++ b/service/schemas/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/schemas/api_op_CreateDiscoverer.go b/service/schemas/api_op_CreateDiscoverer.go index 492f0b19ad7..0c921c6e058 100644 --- a/service/schemas/api_op_CreateDiscoverer.go +++ b/service/schemas/api_op_CreateDiscoverer.go @@ -74,6 +74,9 @@ func addOperationCreateDiscovererMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateDiscovererMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_CreateRegistry.go b/service/schemas/api_op_CreateRegistry.go index 630b973e430..b77c7f6d44f 100644 --- a/service/schemas/api_op_CreateRegistry.go +++ b/service/schemas/api_op_CreateRegistry.go @@ -67,6 +67,9 @@ func addOperationCreateRegistryMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateRegistryMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_CreateSchema.go b/service/schemas/api_op_CreateSchema.go index a99308c685b..4a859e4b2b0 100644 --- a/service/schemas/api_op_CreateSchema.go +++ b/service/schemas/api_op_CreateSchema.go @@ -96,6 +96,9 @@ func addOperationCreateSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DeleteDiscoverer.go b/service/schemas/api_op_DeleteDiscoverer.go index 823158e7a52..58e15b5905c 100644 --- a/service/schemas/api_op_DeleteDiscoverer.go +++ b/service/schemas/api_op_DeleteDiscoverer.go @@ -48,6 +48,9 @@ func addOperationDeleteDiscovererMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteDiscovererMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DeleteRegistry.go b/service/schemas/api_op_DeleteRegistry.go index c5b1695464c..33a506c31fd 100644 --- a/service/schemas/api_op_DeleteRegistry.go +++ b/service/schemas/api_op_DeleteRegistry.go @@ -48,6 +48,9 @@ func addOperationDeleteRegistryMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteRegistryMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DeleteResourcePolicy.go b/service/schemas/api_op_DeleteResourcePolicy.go index 14ff15b8c5b..c6cde4cbc38 100644 --- a/service/schemas/api_op_DeleteResourcePolicy.go +++ b/service/schemas/api_op_DeleteResourcePolicy.go @@ -46,6 +46,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DeleteSchema.go b/service/schemas/api_op_DeleteSchema.go index 5860a3019f6..dadb1e7baed 100644 --- a/service/schemas/api_op_DeleteSchema.go +++ b/service/schemas/api_op_DeleteSchema.go @@ -53,6 +53,9 @@ func addOperationDeleteSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DeleteSchemaVersion.go b/service/schemas/api_op_DeleteSchemaVersion.go index b17416e0654..c03f0fcbd6c 100644 --- a/service/schemas/api_op_DeleteSchemaVersion.go +++ b/service/schemas/api_op_DeleteSchemaVersion.go @@ -58,6 +58,9 @@ func addOperationDeleteSchemaVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteSchemaVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DescribeCodeBinding.go b/service/schemas/api_op_DescribeCodeBinding.go index e6d2daafdce..7fa7fa0e8cd 100644 --- a/service/schemas/api_op_DescribeCodeBinding.go +++ b/service/schemas/api_op_DescribeCodeBinding.go @@ -76,6 +76,9 @@ func addOperationDescribeCodeBindingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeCodeBindingMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DescribeDiscoverer.go b/service/schemas/api_op_DescribeDiscoverer.go index 29ae96f55e3..72d3d2e7435 100644 --- a/service/schemas/api_op_DescribeDiscoverer.go +++ b/service/schemas/api_op_DescribeDiscoverer.go @@ -68,6 +68,9 @@ func addOperationDescribeDiscovererMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeDiscovererMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DescribeRegistry.go b/service/schemas/api_op_DescribeRegistry.go index f16c44c71e6..dc6da18e6eb 100644 --- a/service/schemas/api_op_DescribeRegistry.go +++ b/service/schemas/api_op_DescribeRegistry.go @@ -61,6 +61,9 @@ func addOperationDescribeRegistryMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeRegistryMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_DescribeSchema.go b/service/schemas/api_op_DescribeSchema.go index a874388409e..9258a6e1f74 100644 --- a/service/schemas/api_op_DescribeSchema.go +++ b/service/schemas/api_op_DescribeSchema.go @@ -85,6 +85,9 @@ func addOperationDescribeSchemaMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribeSchemaMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_ExportSchema.go b/service/schemas/api_op_ExportSchema.go index 36e4850e528..c0e1c33d1df 100644 --- a/service/schemas/api_op_ExportSchema.go +++ b/service/schemas/api_op_ExportSchema.go @@ -67,6 +67,9 @@ func addOperationExportSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationExportSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_GetCodeBindingSource.go b/service/schemas/api_op_GetCodeBindingSource.go index 3f6137a9cd0..442c704890e 100644 --- a/service/schemas/api_op_GetCodeBindingSource.go +++ b/service/schemas/api_op_GetCodeBindingSource.go @@ -63,6 +63,9 @@ func addOperationGetCodeBindingSourceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetCodeBindingSourceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_GetDiscoveredSchema.go b/service/schemas/api_op_GetDiscoveredSchema.go index 529f09f282a..3b530a7b01d 100644 --- a/service/schemas/api_op_GetDiscoveredSchema.go +++ b/service/schemas/api_op_GetDiscoveredSchema.go @@ -60,6 +60,9 @@ func addOperationGetDiscoveredSchemaMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetDiscoveredSchemaMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_GetResourcePolicy.go b/service/schemas/api_op_GetResourcePolicy.go index e591c794276..5586535c6bb 100644 --- a/service/schemas/api_op_GetResourcePolicy.go +++ b/service/schemas/api_op_GetResourcePolicy.go @@ -54,6 +54,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_ListDiscoverers.go b/service/schemas/api_op_ListDiscoverers.go index 67fe587fe2e..d5468b73c71 100644 --- a/service/schemas/api_op_ListDiscoverers.go +++ b/service/schemas/api_op_ListDiscoverers.go @@ -68,6 +68,9 @@ func addOperationListDiscoverersMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListDiscoverersMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_ListRegistries.go b/service/schemas/api_op_ListRegistries.go index 07b87b851be..04070f0e331 100644 --- a/service/schemas/api_op_ListRegistries.go +++ b/service/schemas/api_op_ListRegistries.go @@ -67,6 +67,9 @@ func addOperationListRegistriesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListRegistriesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_ListSchemaVersions.go b/service/schemas/api_op_ListSchemaVersions.go index 0f0366c278a..05170afe591 100644 --- a/service/schemas/api_op_ListSchemaVersions.go +++ b/service/schemas/api_op_ListSchemaVersions.go @@ -70,6 +70,9 @@ func addOperationListSchemaVersionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListSchemaVersionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_ListSchemas.go b/service/schemas/api_op_ListSchemas.go index f3f2bfe8606..5084aa0ffb6 100644 --- a/service/schemas/api_op_ListSchemas.go +++ b/service/schemas/api_op_ListSchemas.go @@ -69,6 +69,9 @@ func addOperationListSchemasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListSchemasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_ListTagsForResource.go b/service/schemas/api_op_ListTagsForResource.go index fed05d535cd..f7f1b2ec8b2 100644 --- a/service/schemas/api_op_ListTagsForResource.go +++ b/service/schemas/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_PutCodeBinding.go b/service/schemas/api_op_PutCodeBinding.go index 8990aa47213..760cd81f693 100644 --- a/service/schemas/api_op_PutCodeBinding.go +++ b/service/schemas/api_op_PutCodeBinding.go @@ -76,6 +76,9 @@ func addOperationPutCodeBindingMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationPutCodeBindingMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_PutResourcePolicy.go b/service/schemas/api_op_PutResourcePolicy.go index 5ea2496b6aa..d9ae8f7d2cd 100644 --- a/service/schemas/api_op_PutResourcePolicy.go +++ b/service/schemas/api_op_PutResourcePolicy.go @@ -64,6 +64,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_SearchSchemas.go b/service/schemas/api_op_SearchSchemas.go index 5afc719e8ec..cc59693cf77 100644 --- a/service/schemas/api_op_SearchSchemas.go +++ b/service/schemas/api_op_SearchSchemas.go @@ -71,6 +71,9 @@ func addOperationSearchSchemasMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationSearchSchemasMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_StartDiscoverer.go b/service/schemas/api_op_StartDiscoverer.go index aa746a29fee..6153d6d2128 100644 --- a/service/schemas/api_op_StartDiscoverer.go +++ b/service/schemas/api_op_StartDiscoverer.go @@ -56,6 +56,9 @@ func addOperationStartDiscovererMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStartDiscovererMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_StopDiscoverer.go b/service/schemas/api_op_StopDiscoverer.go index ba2a3341262..37ad5292854 100644 --- a/service/schemas/api_op_StopDiscoverer.go +++ b/service/schemas/api_op_StopDiscoverer.go @@ -56,6 +56,9 @@ func addOperationStopDiscovererMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopDiscovererMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_TagResource.go b/service/schemas/api_op_TagResource.go index b723f8fadb9..db8e6aeb4c6 100644 --- a/service/schemas/api_op_TagResource.go +++ b/service/schemas/api_op_TagResource.go @@ -54,6 +54,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_UntagResource.go b/service/schemas/api_op_UntagResource.go index 0fe6e265f36..2ae044662c8 100644 --- a/service/schemas/api_op_UntagResource.go +++ b/service/schemas/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_UpdateDiscoverer.go b/service/schemas/api_op_UpdateDiscoverer.go index 38a07569445..f190f5fe40a 100644 --- a/service/schemas/api_op_UpdateDiscoverer.go +++ b/service/schemas/api_op_UpdateDiscoverer.go @@ -71,6 +71,9 @@ func addOperationUpdateDiscovererMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateDiscovererMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_UpdateRegistry.go b/service/schemas/api_op_UpdateRegistry.go index 2ff255d8261..e38f464983e 100644 --- a/service/schemas/api_op_UpdateRegistry.go +++ b/service/schemas/api_op_UpdateRegistry.go @@ -65,6 +65,9 @@ func addOperationUpdateRegistryMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateRegistryMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/api_op_UpdateSchema.go b/service/schemas/api_op_UpdateSchema.go index 5bcb390ac35..0ff99b4a0c4 100644 --- a/service/schemas/api_op_UpdateSchema.go +++ b/service/schemas/api_op_UpdateSchema.go @@ -93,6 +93,9 @@ func addOperationUpdateSchemaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationUpdateSchemaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/schemas/go.mod b/service/schemas/go.mod index 26e2bc32686..442a554b8a8 100644 --- a/service/schemas/go.mod +++ b/service/schemas/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/schemas go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/schemas/go.sum b/service/schemas/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/schemas/go.sum +++ b/service/schemas/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/secretsmanager/api_client.go b/service/secretsmanager/api_client.go index d8865ed1135..706577bc38c 100644 --- a/service/secretsmanager/api_client.go +++ b/service/secretsmanager/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/secretsmanager/api_op_CancelRotateSecret.go b/service/secretsmanager/api_op_CancelRotateSecret.go index f4425c8cf04..006afdf48e5 100644 --- a/service/secretsmanager/api_op_CancelRotateSecret.go +++ b/service/secretsmanager/api_op_CancelRotateSecret.go @@ -116,6 +116,9 @@ func addOperationCancelRotateSecretMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationCancelRotateSecretMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_CreateSecret.go b/service/secretsmanager/api_op_CreateSecret.go index 18d84c03de9..ffb832c628a 100644 --- a/service/secretsmanager/api_op_CreateSecret.go +++ b/service/secretsmanager/api_op_CreateSecret.go @@ -267,6 +267,9 @@ func addOperationCreateSecretMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -312,6 +315,9 @@ func addOperationCreateSecretMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_DeleteResourcePolicy.go b/service/secretsmanager/api_op_DeleteResourcePolicy.go index e37cb1da360..3d107464528 100644 --- a/service/secretsmanager/api_op_DeleteResourcePolicy.go +++ b/service/secretsmanager/api_op_DeleteResourcePolicy.go @@ -86,6 +86,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDeleteResourcePolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_DeleteSecret.go b/service/secretsmanager/api_op_DeleteSecret.go index 8e21f828701..cec082108c0 100644 --- a/service/secretsmanager/api_op_DeleteSecret.go +++ b/service/secretsmanager/api_op_DeleteSecret.go @@ -130,6 +130,9 @@ func addOperationDeleteSecretMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationDeleteSecretMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_DescribeSecret.go b/service/secretsmanager/api_op_DescribeSecret.go index d3cddb936d0..1939b4a4e64 100644 --- a/service/secretsmanager/api_op_DescribeSecret.go +++ b/service/secretsmanager/api_op_DescribeSecret.go @@ -150,6 +150,9 @@ func addOperationDescribeSecretMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationDescribeSecretMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_GetRandomPassword.go b/service/secretsmanager/api_op_GetRandomPassword.go index 9b774a5bbde..c77af8765c5 100644 --- a/service/secretsmanager/api_op_GetRandomPassword.go +++ b/service/secretsmanager/api_op_GetRandomPassword.go @@ -94,6 +94,9 @@ func addOperationGetRandomPasswordMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetRandomPasswordMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_GetResourcePolicy.go b/service/secretsmanager/api_op_GetResourcePolicy.go index 1fc8ab519df..e7171bc5c1c 100644 --- a/service/secretsmanager/api_op_GetResourcePolicy.go +++ b/service/secretsmanager/api_op_GetResourcePolicy.go @@ -100,6 +100,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationGetResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_GetSecretValue.go b/service/secretsmanager/api_op_GetSecretValue.go index 51be8183b2b..021decbd874 100644 --- a/service/secretsmanager/api_op_GetSecretValue.go +++ b/service/secretsmanager/api_op_GetSecretValue.go @@ -138,6 +138,9 @@ func addOperationGetSecretValueMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -180,6 +183,9 @@ func addOperationGetSecretValueMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_ListSecretVersionIds.go b/service/secretsmanager/api_op_ListSecretVersionIds.go index 6e6182924be..f7e2ce90ae6 100644 --- a/service/secretsmanager/api_op_ListSecretVersionIds.go +++ b/service/secretsmanager/api_op_ListSecretVersionIds.go @@ -127,6 +127,9 @@ func addOperationListSecretVersionIdsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationListSecretVersionIdsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_ListSecrets.go b/service/secretsmanager/api_op_ListSecrets.go index 8dd4252c593..18897469962 100644 --- a/service/secretsmanager/api_op_ListSecrets.go +++ b/service/secretsmanager/api_op_ListSecrets.go @@ -97,6 +97,9 @@ func addOperationListSecretsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationListSecretsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_PutResourcePolicy.go b/service/secretsmanager/api_op_PutResourcePolicy.go index 43ddaabdaeb..972df4b8bbf 100644 --- a/service/secretsmanager/api_op_PutResourcePolicy.go +++ b/service/secretsmanager/api_op_PutResourcePolicy.go @@ -112,6 +112,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationPutResourcePolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_PutSecretValue.go b/service/secretsmanager/api_op_PutSecretValue.go index 4c22a60f7aa..e6d60e81604 100644 --- a/service/secretsmanager/api_op_PutSecretValue.go +++ b/service/secretsmanager/api_op_PutSecretValue.go @@ -219,6 +219,9 @@ func addOperationPutSecretValueMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -264,6 +267,9 @@ func addOperationPutSecretValueMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_RestoreSecret.go b/service/secretsmanager/api_op_RestoreSecret.go index 56bda322c58..024aa35579d 100644 --- a/service/secretsmanager/api_op_RestoreSecret.go +++ b/service/secretsmanager/api_op_RestoreSecret.go @@ -81,6 +81,9 @@ func addOperationRestoreSecretMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationRestoreSecretMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_RotateSecret.go b/service/secretsmanager/api_op_RotateSecret.go index 7cf65bf8ea9..48369c9dc36 100644 --- a/service/secretsmanager/api_op_RotateSecret.go +++ b/service/secretsmanager/api_op_RotateSecret.go @@ -153,6 +153,9 @@ func addOperationRotateSecretMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -198,6 +201,9 @@ func addOperationRotateSecretMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_TagResource.go b/service/secretsmanager/api_op_TagResource.go index 6218be629a4..c02fbb4ab03 100644 --- a/service/secretsmanager/api_op_TagResource.go +++ b/service/secretsmanager/api_op_TagResource.go @@ -119,6 +119,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_UntagResource.go b/service/secretsmanager/api_op_UntagResource.go index f8df99d3849..e83fa540237 100644 --- a/service/secretsmanager/api_op_UntagResource.go +++ b/service/secretsmanager/api_op_UntagResource.go @@ -92,6 +92,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_UpdateSecret.go b/service/secretsmanager/api_op_UpdateSecret.go index 689fb0df248..99c259b1b73 100644 --- a/service/secretsmanager/api_op_UpdateSecret.go +++ b/service/secretsmanager/api_op_UpdateSecret.go @@ -219,6 +219,9 @@ func addOperationUpdateSecretMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -264,6 +267,9 @@ func addOperationUpdateSecretMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_UpdateSecretVersionStage.go b/service/secretsmanager/api_op_UpdateSecretVersionStage.go index 2a5dbae7f17..680d662634c 100644 --- a/service/secretsmanager/api_op_UpdateSecretVersionStage.go +++ b/service/secretsmanager/api_op_UpdateSecretVersionStage.go @@ -114,6 +114,9 @@ func addOperationUpdateSecretVersionStageMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationUpdateSecretVersionStageMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/api_op_ValidateResourcePolicy.go b/service/secretsmanager/api_op_ValidateResourcePolicy.go index 3b7e38fdb1f..da756c9025a 100644 --- a/service/secretsmanager/api_op_ValidateResourcePolicy.go +++ b/service/secretsmanager/api_op_ValidateResourcePolicy.go @@ -78,6 +78,9 @@ func addOperationValidateResourcePolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationValidateResourcePolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/secretsmanager/go.mod b/service/secretsmanager/go.mod index bf462598ce8..56d50f81a9c 100644 --- a/service/secretsmanager/go.mod +++ b/service/secretsmanager/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/secretsmanager go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/secretsmanager/go.sum b/service/secretsmanager/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/secretsmanager/go.sum +++ b/service/secretsmanager/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/securityhub/api_client.go b/service/securityhub/api_client.go index 361ab4a81bc..78d105bf373 100644 --- a/service/securityhub/api_client.go +++ b/service/securityhub/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/securityhub/api_op_AcceptInvitation.go b/service/securityhub/api_op_AcceptInvitation.go index 380d8f34a59..461f858842a 100644 --- a/service/securityhub/api_op_AcceptInvitation.go +++ b/service/securityhub/api_op_AcceptInvitation.go @@ -56,6 +56,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAcceptInvitationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_BatchDisableStandards.go b/service/securityhub/api_op_BatchDisableStandards.go index 8ed3289736c..1cebfca7e79 100644 --- a/service/securityhub/api_op_BatchDisableStandards.go +++ b/service/securityhub/api_op_BatchDisableStandards.go @@ -56,6 +56,9 @@ func addOperationBatchDisableStandardsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationBatchDisableStandardsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_BatchEnableStandards.go b/service/securityhub/api_op_BatchEnableStandards.go index b709d3be2d5..51d5ad22780 100644 --- a/service/securityhub/api_op_BatchEnableStandards.go +++ b/service/securityhub/api_op_BatchEnableStandards.go @@ -57,6 +57,9 @@ func addOperationBatchEnableStandardsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationBatchEnableStandardsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_BatchImportFindings.go b/service/securityhub/api_op_BatchImportFindings.go index eba2809f9c1..b7b96af7cfe 100644 --- a/service/securityhub/api_op_BatchImportFindings.go +++ b/service/securityhub/api_op_BatchImportFindings.go @@ -92,6 +92,9 @@ func addOperationBatchImportFindingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationBatchImportFindingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_BatchUpdateFindings.go b/service/securityhub/api_op_BatchUpdateFindings.go index 42ca2698d57..d699e07efa2 100644 --- a/service/securityhub/api_op_BatchUpdateFindings.go +++ b/service/securityhub/api_op_BatchUpdateFindings.go @@ -156,6 +156,9 @@ func addOperationBatchUpdateFindingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -198,6 +201,9 @@ func addOperationBatchUpdateFindingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_CreateActionTarget.go b/service/securityhub/api_op_CreateActionTarget.go index 52173944728..da859e950a3 100644 --- a/service/securityhub/api_op_CreateActionTarget.go +++ b/service/securityhub/api_op_CreateActionTarget.go @@ -66,6 +66,9 @@ func addOperationCreateActionTargetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationCreateActionTargetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_CreateInsight.go b/service/securityhub/api_op_CreateInsight.go index 048a138c881..3ac1a585c23 100644 --- a/service/securityhub/api_op_CreateInsight.go +++ b/service/securityhub/api_op_CreateInsight.go @@ -71,6 +71,9 @@ func addOperationCreateInsightMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateInsightMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_CreateMembers.go b/service/securityhub/api_op_CreateMembers.go index 61184b7df4c..56f3543d3b7 100644 --- a/service/securityhub/api_op_CreateMembers.go +++ b/service/securityhub/api_op_CreateMembers.go @@ -66,6 +66,9 @@ func addOperationCreateMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCreateMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DeclineInvitations.go b/service/securityhub/api_op_DeclineInvitations.go index f3bc824dc40..0dab4b0e94e 100644 --- a/service/securityhub/api_op_DeclineInvitations.go +++ b/service/securityhub/api_op_DeclineInvitations.go @@ -55,6 +55,9 @@ func addOperationDeclineInvitationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeclineInvitationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DeleteActionTarget.go b/service/securityhub/api_op_DeleteActionTarget.go index e0ee6e37949..48133bd4efe 100644 --- a/service/securityhub/api_op_DeleteActionTarget.go +++ b/service/securityhub/api_op_DeleteActionTarget.go @@ -56,6 +56,9 @@ func addOperationDeleteActionTargetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteActionTargetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DeleteInsight.go b/service/securityhub/api_op_DeleteInsight.go index bf89cc85429..5eee57e8a06 100644 --- a/service/securityhub/api_op_DeleteInsight.go +++ b/service/securityhub/api_op_DeleteInsight.go @@ -54,6 +54,9 @@ func addOperationDeleteInsightMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteInsightMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DeleteInvitations.go b/service/securityhub/api_op_DeleteInvitations.go index 81e3b2db095..a92402c99c5 100644 --- a/service/securityhub/api_op_DeleteInvitations.go +++ b/service/securityhub/api_op_DeleteInvitations.go @@ -54,6 +54,9 @@ func addOperationDeleteInvitationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteInvitationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DeleteMembers.go b/service/securityhub/api_op_DeleteMembers.go index 59a1ed9fc8e..f4ce59254f0 100644 --- a/service/securityhub/api_op_DeleteMembers.go +++ b/service/securityhub/api_op_DeleteMembers.go @@ -52,6 +52,9 @@ func addOperationDeleteMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DescribeActionTargets.go b/service/securityhub/api_op_DescribeActionTargets.go index b40eba6dad1..45ba417dc7f 100644 --- a/service/securityhub/api_op_DescribeActionTargets.go +++ b/service/securityhub/api_op_DescribeActionTargets.go @@ -66,6 +66,9 @@ func addOperationDescribeActionTargetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeActionTargetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DescribeHub.go b/service/securityhub/api_op_DescribeHub.go index 0cedbbd547f..2545b1ee7d2 100644 --- a/service/securityhub/api_op_DescribeHub.go +++ b/service/securityhub/api_op_DescribeHub.go @@ -59,6 +59,9 @@ func addOperationDescribeHubMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeHubMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DescribeProducts.go b/service/securityhub/api_op_DescribeProducts.go index ef979a5d6e1..60a529ecdcb 100644 --- a/service/securityhub/api_op_DescribeProducts.go +++ b/service/securityhub/api_op_DescribeProducts.go @@ -63,6 +63,9 @@ func addOperationDescribeProductsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeProductsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DescribeStandards.go b/service/securityhub/api_op_DescribeStandards.go index c3de1441b6e..2d957dd6d98 100644 --- a/service/securityhub/api_op_DescribeStandards.go +++ b/service/securityhub/api_op_DescribeStandards.go @@ -61,6 +61,9 @@ func addOperationDescribeStandardsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeStandardsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DescribeStandardsControls.go b/service/securityhub/api_op_DescribeStandardsControls.go index 69914765a6c..5d3b8fc088b 100644 --- a/service/securityhub/api_op_DescribeStandardsControls.go +++ b/service/securityhub/api_op_DescribeStandardsControls.go @@ -67,6 +67,9 @@ func addOperationDescribeStandardsControlsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationDescribeStandardsControlsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DisableImportFindingsForProduct.go b/service/securityhub/api_op_DisableImportFindingsForProduct.go index 89a2453b6ac..dfb3f8843b8 100644 --- a/service/securityhub/api_op_DisableImportFindingsForProduct.go +++ b/service/securityhub/api_op_DisableImportFindingsForProduct.go @@ -50,6 +50,9 @@ func addOperationDisableImportFindingsForProductMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDisableImportFindingsForProductMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DisableSecurityHub.go b/service/securityhub/api_op_DisableSecurityHub.go index b05ff567742..0bdcc1401ac 100644 --- a/service/securityhub/api_op_DisableSecurityHub.go +++ b/service/securityhub/api_op_DisableSecurityHub.go @@ -51,6 +51,9 @@ func addOperationDisableSecurityHubMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDisableSecurityHubMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DisassociateFromMasterAccount.go b/service/securityhub/api_op_DisassociateFromMasterAccount.go index 2c6933ea163..acfab5bc2dc 100644 --- a/service/securityhub/api_op_DisassociateFromMasterAccount.go +++ b/service/securityhub/api_op_DisassociateFromMasterAccount.go @@ -44,6 +44,9 @@ func addOperationDisassociateFromMasterAccountMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationDisassociateFromMasterAccountMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_DisassociateMembers.go b/service/securityhub/api_op_DisassociateMembers.go index ff8d5d373d3..2471c58e237 100644 --- a/service/securityhub/api_op_DisassociateMembers.go +++ b/service/securityhub/api_op_DisassociateMembers.go @@ -46,6 +46,9 @@ func addOperationDisassociateMembersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDisassociateMembersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_EnableImportFindingsForProduct.go b/service/securityhub/api_op_EnableImportFindingsForProduct.go index 6e5838d1d45..a46a06387b3 100644 --- a/service/securityhub/api_op_EnableImportFindingsForProduct.go +++ b/service/securityhub/api_op_EnableImportFindingsForProduct.go @@ -55,6 +55,9 @@ func addOperationEnableImportFindingsForProductMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationEnableImportFindingsForProductMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_EnableSecurityHub.go b/service/securityhub/api_op_EnableSecurityHub.go index cd9c0185778..42de6f7f979 100644 --- a/service/securityhub/api_op_EnableSecurityHub.go +++ b/service/securityhub/api_op_EnableSecurityHub.go @@ -70,6 +70,9 @@ func addOperationEnableSecurityHubMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationEnableSecurityHubMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetEnabledStandards.go b/service/securityhub/api_op_GetEnabledStandards.go index 7cb3e4b84ea..2d6aa89add5 100644 --- a/service/securityhub/api_op_GetEnabledStandards.go +++ b/service/securityhub/api_op_GetEnabledStandards.go @@ -64,6 +64,9 @@ func addOperationGetEnabledStandardsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetEnabledStandardsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetFindings.go b/service/securityhub/api_op_GetFindings.go index bfbb94e7eb1..1c9318bd28b 100644 --- a/service/securityhub/api_op_GetFindings.go +++ b/service/securityhub/api_op_GetFindings.go @@ -72,6 +72,9 @@ func addOperationGetFindingsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetFindingsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetInsightResults.go b/service/securityhub/api_op_GetInsightResults.go index ab8b45232f0..4cdc27b9683 100644 --- a/service/securityhub/api_op_GetInsightResults.go +++ b/service/securityhub/api_op_GetInsightResults.go @@ -55,6 +55,9 @@ func addOperationGetInsightResultsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetInsightResultsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetInsights.go b/service/securityhub/api_op_GetInsights.go index 014f42c2d60..31a413ee634 100644 --- a/service/securityhub/api_op_GetInsights.go +++ b/service/securityhub/api_op_GetInsights.go @@ -67,6 +67,9 @@ func addOperationGetInsightsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetInsightsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetInvitationsCount.go b/service/securityhub/api_op_GetInvitationsCount.go index 9ed8fc52a06..9a086c1506d 100644 --- a/service/securityhub/api_op_GetInvitationsCount.go +++ b/service/securityhub/api_op_GetInvitationsCount.go @@ -49,6 +49,9 @@ func addOperationGetInvitationsCountMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationGetInvitationsCountMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetMasterAccount.go b/service/securityhub/api_op_GetMasterAccount.go index d7ca282fb12..68292c1f31a 100644 --- a/service/securityhub/api_op_GetMasterAccount.go +++ b/service/securityhub/api_op_GetMasterAccount.go @@ -50,6 +50,9 @@ func addOperationGetMasterAccountMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationGetMasterAccountMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_GetMembers.go b/service/securityhub/api_op_GetMembers.go index 0ce3ceb8c6a..183dba24b07 100644 --- a/service/securityhub/api_op_GetMembers.go +++ b/service/securityhub/api_op_GetMembers.go @@ -59,6 +59,9 @@ func addOperationGetMembersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetMembersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_InviteMembers.go b/service/securityhub/api_op_InviteMembers.go index fa01073c66f..ddb0811b2a6 100644 --- a/service/securityhub/api_op_InviteMembers.go +++ b/service/securityhub/api_op_InviteMembers.go @@ -58,6 +58,9 @@ func addOperationInviteMembersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationInviteMembersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_ListEnabledProductsForImport.go b/service/securityhub/api_op_ListEnabledProductsForImport.go index 81a046dff5d..fc2fef47989 100644 --- a/service/securityhub/api_op_ListEnabledProductsForImport.go +++ b/service/securityhub/api_op_ListEnabledProductsForImport.go @@ -61,6 +61,9 @@ func addOperationListEnabledProductsForImportMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListEnabledProductsForImportMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_ListInvitations.go b/service/securityhub/api_op_ListInvitations.go index 2e89bb58195..7cda97a1b72 100644 --- a/service/securityhub/api_op_ListInvitations.go +++ b/service/securityhub/api_op_ListInvitations.go @@ -61,6 +61,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListInvitationsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_ListMembers.go b/service/securityhub/api_op_ListMembers.go index dd81e07ae3f..6a809d49c76 100644 --- a/service/securityhub/api_op_ListMembers.go +++ b/service/securityhub/api_op_ListMembers.go @@ -69,6 +69,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListMembersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_ListTagsForResource.go b/service/securityhub/api_op_ListTagsForResource.go index 5fad11c6c8a..c39a47d7fd6 100644 --- a/service/securityhub/api_op_ListTagsForResource.go +++ b/service/securityhub/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_TagResource.go b/service/securityhub/api_op_TagResource.go index 147ddf55b26..76c22bd581b 100644 --- a/service/securityhub/api_op_TagResource.go +++ b/service/securityhub/api_op_TagResource.go @@ -53,6 +53,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_UntagResource.go b/service/securityhub/api_op_UntagResource.go index 55ed8c31753..cce6775af23 100644 --- a/service/securityhub/api_op_UntagResource.go +++ b/service/securityhub/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_UpdateActionTarget.go b/service/securityhub/api_op_UpdateActionTarget.go index 7386647b8c3..238f164f648 100644 --- a/service/securityhub/api_op_UpdateActionTarget.go +++ b/service/securityhub/api_op_UpdateActionTarget.go @@ -54,6 +54,9 @@ func addOperationUpdateActionTargetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateActionTargetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_UpdateFindings.go b/service/securityhub/api_op_UpdateFindings.go index 48631dc7c47..38ec0d1c578 100644 --- a/service/securityhub/api_op_UpdateFindings.go +++ b/service/securityhub/api_op_UpdateFindings.go @@ -58,6 +58,9 @@ func addOperationUpdateFindingsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateFindingsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_UpdateInsight.go b/service/securityhub/api_op_UpdateInsight.go index 845a534fb97..7de4776847e 100644 --- a/service/securityhub/api_op_UpdateInsight.go +++ b/service/securityhub/api_op_UpdateInsight.go @@ -58,6 +58,9 @@ func addOperationUpdateInsightMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateInsightMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_UpdateSecurityHubConfiguration.go b/service/securityhub/api_op_UpdateSecurityHubConfiguration.go index b6a26106756..07ca658252f 100644 --- a/service/securityhub/api_op_UpdateSecurityHubConfiguration.go +++ b/service/securityhub/api_op_UpdateSecurityHubConfiguration.go @@ -48,6 +48,9 @@ func addOperationUpdateSecurityHubConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationUpdateSecurityHubConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/api_op_UpdateStandardsControl.go b/service/securityhub/api_op_UpdateStandardsControl.go index 772ca9083c8..03b971d7e23 100644 --- a/service/securityhub/api_op_UpdateStandardsControl.go +++ b/service/securityhub/api_op_UpdateStandardsControl.go @@ -57,6 +57,9 @@ func addOperationUpdateStandardsControlMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateStandardsControlMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/securityhub/go.mod b/service/securityhub/go.mod index 08c12936468..f22aa558a25 100644 --- a/service/securityhub/go.mod +++ b/service/securityhub/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/securityhub go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/securityhub/go.sum b/service/securityhub/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/securityhub/go.sum +++ b/service/securityhub/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/serverlessapplicationrepository/api_client.go b/service/serverlessapplicationrepository/api_client.go index cf642402d1b..10bcea46882 100644 --- a/service/serverlessapplicationrepository/api_client.go +++ b/service/serverlessapplicationrepository/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/serverlessapplicationrepository/api_op_CreateApplication.go b/service/serverlessapplicationrepository/api_op_CreateApplication.go index 6f20471cfcc..edadd1adf7e 100644 --- a/service/serverlessapplicationrepository/api_op_CreateApplication.go +++ b/service/serverlessapplicationrepository/api_op_CreateApplication.go @@ -167,6 +167,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -209,6 +212,9 @@ func addOperationCreateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go b/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go index 5ee78153153..95348a0b03b 100644 --- a/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go +++ b/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go @@ -134,6 +134,9 @@ func addOperationCreateApplicationVersionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationCreateApplicationVersionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go b/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go index cb1f4110ff9..a09efb7a1b3 100644 --- a/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go +++ b/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go @@ -162,6 +162,9 @@ func addOperationCreateCloudFormationChangeSetMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationCreateCloudFormationChangeSetMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go b/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go index 1eec5c0a174..343a7e80bb1 100644 --- a/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go +++ b/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go @@ -79,6 +79,9 @@ func addOperationCreateCloudFormationTemplateMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreateCloudFormationTemplateMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_DeleteApplication.go b/service/serverlessapplicationrepository/api_op_DeleteApplication.go index 4c045adee19..80e43aba2f6 100644 --- a/service/serverlessapplicationrepository/api_op_DeleteApplication.go +++ b/service/serverlessapplicationrepository/api_op_DeleteApplication.go @@ -48,6 +48,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_GetApplication.go b/service/serverlessapplicationrepository/api_op_GetApplication.go index eaaf3fec9fd..bd8380fda58 100644 --- a/service/serverlessapplicationrepository/api_op_GetApplication.go +++ b/service/serverlessapplicationrepository/api_op_GetApplication.go @@ -102,6 +102,9 @@ func addOperationGetApplicationMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationGetApplicationMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go b/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go index d34d4c02e21..d9c98f7a0f7 100644 --- a/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go +++ b/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go @@ -53,6 +53,9 @@ func addOperationGetApplicationPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetApplicationPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go b/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go index 256c07dce2c..2e70829f0fe 100644 --- a/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go +++ b/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go @@ -81,6 +81,9 @@ func addOperationGetCloudFormationTemplateMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetCloudFormationTemplateMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go b/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go index 797ea07a807..f7fba057178 100644 --- a/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go +++ b/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go @@ -65,6 +65,9 @@ func addOperationListApplicationDependenciesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListApplicationDependenciesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go b/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go index 75ecd5475e4..980da7154ad 100644 --- a/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go +++ b/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go @@ -62,6 +62,9 @@ func addOperationListApplicationVersionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListApplicationVersionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_ListApplications.go b/service/serverlessapplicationrepository/api_op_ListApplications.go index 8b90c40c8c7..dc1514ce187 100644 --- a/service/serverlessapplicationrepository/api_op_ListApplications.go +++ b/service/serverlessapplicationrepository/api_op_ListApplications.go @@ -57,6 +57,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListApplicationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go b/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go index 9df6190afb2..a1f8e79689c 100644 --- a/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go +++ b/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go @@ -61,6 +61,9 @@ func addOperationPutApplicationPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationPutApplicationPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_UnshareApplication.go b/service/serverlessapplicationrepository/api_op_UnshareApplication.go index 9272e1f1247..fd8970ef1ba 100644 --- a/service/serverlessapplicationrepository/api_op_UnshareApplication.go +++ b/service/serverlessapplicationrepository/api_op_UnshareApplication.go @@ -54,6 +54,9 @@ func addOperationUnshareApplicationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUnshareApplicationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/api_op_UpdateApplication.go b/service/serverlessapplicationrepository/api_op_UpdateApplication.go index 2cccb1ab41b..961fc9b138c 100644 --- a/service/serverlessapplicationrepository/api_op_UpdateApplication.go +++ b/service/serverlessapplicationrepository/api_op_UpdateApplication.go @@ -122,6 +122,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationUpdateApplicationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/serverlessapplicationrepository/go.mod b/service/serverlessapplicationrepository/go.mod index f69c185f88c..dcea593ee01 100644 --- a/service/serverlessapplicationrepository/go.mod +++ b/service/serverlessapplicationrepository/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/serverlessapplicationrepository/go.sum b/service/serverlessapplicationrepository/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/serverlessapplicationrepository/go.sum +++ b/service/serverlessapplicationrepository/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/servicecatalog/api_client.go b/service/servicecatalog/api_client.go index 39c814a193c..e8a412b9399 100644 --- a/service/servicecatalog/api_client.go +++ b/service/servicecatalog/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/servicecatalog/api_op_AcceptPortfolioShare.go b/service/servicecatalog/api_op_AcceptPortfolioShare.go index b9c906a659e..cfd29f51f54 100644 --- a/service/servicecatalog/api_op_AcceptPortfolioShare.go +++ b/service/servicecatalog/api_op_AcceptPortfolioShare.go @@ -74,6 +74,9 @@ func addOperationAcceptPortfolioShareMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationAcceptPortfolioShareMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_AssociateBudgetWithResource.go b/service/servicecatalog/api_op_AssociateBudgetWithResource.go index 2ee5cfe7976..eeddeedaf19 100644 --- a/service/servicecatalog/api_op_AssociateBudgetWithResource.go +++ b/service/servicecatalog/api_op_AssociateBudgetWithResource.go @@ -53,6 +53,9 @@ func addOperationAssociateBudgetWithResourceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateBudgetWithResourceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go b/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go index f05b689ef49..6f3710d9d3d 100644 --- a/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go +++ b/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go @@ -68,6 +68,9 @@ func addOperationAssociatePrincipalWithPortfolioMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationAssociatePrincipalWithPortfolioMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_AssociateProductWithPortfolio.go b/service/servicecatalog/api_op_AssociateProductWithPortfolio.go index ffeb80ca781..ba55589ee84 100644 --- a/service/servicecatalog/api_op_AssociateProductWithPortfolio.go +++ b/service/servicecatalog/api_op_AssociateProductWithPortfolio.go @@ -66,6 +66,9 @@ func addOperationAssociateProductWithPortfolioMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationAssociateProductWithPortfolioMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go b/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go index b2e271d52de..1ce1dd7d7c5 100644 --- a/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go +++ b/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go @@ -67,6 +67,9 @@ func addOperationAssociateServiceActionWithProvisioningArtifactMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationAssociateServiceActionWithProvisioningArtifactMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_AssociateTagOptionWithResource.go b/service/servicecatalog/api_op_AssociateTagOptionWithResource.go index a8462012826..a990ccc6c51 100644 --- a/service/servicecatalog/api_op_AssociateTagOptionWithResource.go +++ b/service/servicecatalog/api_op_AssociateTagOptionWithResource.go @@ -53,6 +53,9 @@ func addOperationAssociateTagOptionWithResourceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateTagOptionWithResourceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go b/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go index db2d7e014bd..a0a5d299b93 100644 --- a/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go +++ b/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go @@ -64,6 +64,9 @@ func addOperationBatchAssociateServiceActionWithProvisioningArtifactMiddlewares( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchAssociateServiceActionWithProvisioningArtifactMiddlewares( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go b/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go index 8869bdea75c..58a1a44e89b 100644 --- a/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go +++ b/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go @@ -65,6 +65,9 @@ func addOperationBatchDisassociateServiceActionFromProvisioningArtifactMiddlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationBatchDisassociateServiceActionFromProvisioningArtifactMiddlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CopyProduct.go b/service/servicecatalog/api_op_CopyProduct.go index 006690b1356..12ace07af76 100644 --- a/service/servicecatalog/api_op_CopyProduct.go +++ b/service/servicecatalog/api_op_CopyProduct.go @@ -88,6 +88,9 @@ func addOperationCopyProductMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCopyProductMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreateConstraint.go b/service/servicecatalog/api_op_CreateConstraint.go index 99f4975a383..ec08eb49d5f 100644 --- a/service/servicecatalog/api_op_CreateConstraint.go +++ b/service/servicecatalog/api_op_CreateConstraint.go @@ -129,6 +129,9 @@ func addOperationCreateConstraintMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationCreateConstraintMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreatePortfolio.go b/service/servicecatalog/api_op_CreatePortfolio.go index 5e5ad1d6e99..f80d2b8c07a 100644 --- a/service/servicecatalog/api_op_CreatePortfolio.go +++ b/service/servicecatalog/api_op_CreatePortfolio.go @@ -84,6 +84,9 @@ func addOperationCreatePortfolioMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreatePortfolioMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreatePortfolioShare.go b/service/servicecatalog/api_op_CreatePortfolioShare.go index 6cfa860ddfe..16ba1897a86 100644 --- a/service/servicecatalog/api_op_CreatePortfolioShare.go +++ b/service/servicecatalog/api_op_CreatePortfolioShare.go @@ -80,6 +80,9 @@ func addOperationCreatePortfolioShareMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreatePortfolioShareMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreateProduct.go b/service/servicecatalog/api_op_CreateProduct.go index e4877aa8f0b..83e90c2496f 100644 --- a/service/servicecatalog/api_op_CreateProduct.go +++ b/service/servicecatalog/api_op_CreateProduct.go @@ -109,6 +109,9 @@ func addOperationCreateProductMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationCreateProductMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreateProvisionedProductPlan.go b/service/servicecatalog/api_op_CreateProvisionedProductPlan.go index 2d5b1a6501b..a0d18f3a862 100644 --- a/service/servicecatalog/api_op_CreateProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_CreateProvisionedProductPlan.go @@ -127,6 +127,9 @@ func addOperationCreateProvisionedProductPlanMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -172,6 +175,9 @@ func addOperationCreateProvisionedProductPlanMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreateProvisioningArtifact.go b/service/servicecatalog/api_op_CreateProvisioningArtifact.go index 4b2d00cb80d..bb1d8a9acc0 100644 --- a/service/servicecatalog/api_op_CreateProvisioningArtifact.go +++ b/service/servicecatalog/api_op_CreateProvisioningArtifact.go @@ -83,6 +83,9 @@ func addOperationCreateProvisioningArtifactMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationCreateProvisioningArtifactMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreateServiceAction.go b/service/servicecatalog/api_op_CreateServiceAction.go index 29a8e724215..466b80635bf 100644 --- a/service/servicecatalog/api_op_CreateServiceAction.go +++ b/service/servicecatalog/api_op_CreateServiceAction.go @@ -93,6 +93,9 @@ func addOperationCreateServiceActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreateServiceActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_CreateTagOption.go b/service/servicecatalog/api_op_CreateTagOption.go index d9e30f0aadf..474e05b73cd 100644 --- a/service/servicecatalog/api_op_CreateTagOption.go +++ b/service/servicecatalog/api_op_CreateTagOption.go @@ -58,6 +58,9 @@ func addOperationCreateTagOptionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateTagOptionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeleteConstraint.go b/service/servicecatalog/api_op_DeleteConstraint.go index 3d80b4aecd8..33fac6b77ac 100644 --- a/service/servicecatalog/api_op_DeleteConstraint.go +++ b/service/servicecatalog/api_op_DeleteConstraint.go @@ -58,6 +58,9 @@ func addOperationDeleteConstraintMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteConstraintMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeletePortfolio.go b/service/servicecatalog/api_op_DeletePortfolio.go index 367ed774e86..81249e5b0b1 100644 --- a/service/servicecatalog/api_op_DeletePortfolio.go +++ b/service/servicecatalog/api_op_DeletePortfolio.go @@ -59,6 +59,9 @@ func addOperationDeletePortfolioMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeletePortfolioMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeletePortfolioShare.go b/service/servicecatalog/api_op_DeletePortfolioShare.go index 08c943040c5..0dc4c1d4e87 100644 --- a/service/servicecatalog/api_op_DeletePortfolioShare.go +++ b/service/servicecatalog/api_op_DeletePortfolioShare.go @@ -73,6 +73,9 @@ func addOperationDeletePortfolioShareMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeletePortfolioShareMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeleteProduct.go b/service/servicecatalog/api_op_DeleteProduct.go index 4bee32054ec..b690fc33e72 100644 --- a/service/servicecatalog/api_op_DeleteProduct.go +++ b/service/servicecatalog/api_op_DeleteProduct.go @@ -59,6 +59,9 @@ func addOperationDeleteProductMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDeleteProductMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go b/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go index 3f495f4821a..c5bddd032ec 100644 --- a/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go @@ -61,6 +61,9 @@ func addOperationDeleteProvisionedProductPlanMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteProvisionedProductPlanMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeleteProvisioningArtifact.go b/service/servicecatalog/api_op_DeleteProvisioningArtifact.go index 18618bee946..37a0db75a5d 100644 --- a/service/servicecatalog/api_op_DeleteProvisioningArtifact.go +++ b/service/servicecatalog/api_op_DeleteProvisioningArtifact.go @@ -66,6 +66,9 @@ func addOperationDeleteProvisioningArtifactMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDeleteProvisioningArtifactMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeleteServiceAction.go b/service/servicecatalog/api_op_DeleteServiceAction.go index 6a8c217b700..8efb7830b8f 100644 --- a/service/servicecatalog/api_op_DeleteServiceAction.go +++ b/service/servicecatalog/api_op_DeleteServiceAction.go @@ -57,6 +57,9 @@ func addOperationDeleteServiceActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteServiceActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DeleteTagOption.go b/service/servicecatalog/api_op_DeleteTagOption.go index 29d0d150315..0f06e214909 100644 --- a/service/servicecatalog/api_op_DeleteTagOption.go +++ b/service/servicecatalog/api_op_DeleteTagOption.go @@ -49,6 +49,9 @@ func addOperationDeleteTagOptionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteTagOptionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeConstraint.go b/service/servicecatalog/api_op_DescribeConstraint.go index 2dfef1aa6af..c47717c5e4d 100644 --- a/service/servicecatalog/api_op_DescribeConstraint.go +++ b/service/servicecatalog/api_op_DescribeConstraint.go @@ -68,6 +68,9 @@ func addOperationDescribeConstraintMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeConstraintMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeCopyProductStatus.go b/service/servicecatalog/api_op_DescribeCopyProductStatus.go index 1d1dd96ad7d..5fd3f0226c6 100644 --- a/service/servicecatalog/api_op_DescribeCopyProductStatus.go +++ b/service/servicecatalog/api_op_DescribeCopyProductStatus.go @@ -68,6 +68,9 @@ func addOperationDescribeCopyProductStatusMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeCopyProductStatusMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribePortfolio.go b/service/servicecatalog/api_op_DescribePortfolio.go index 0bbd131639b..6d11bdbf412 100644 --- a/service/servicecatalog/api_op_DescribePortfolio.go +++ b/service/servicecatalog/api_op_DescribePortfolio.go @@ -72,6 +72,9 @@ func addOperationDescribePortfolioMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribePortfolioMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribePortfolioShareStatus.go b/service/servicecatalog/api_op_DescribePortfolioShareStatus.go index 9b265634daf..2ee445a8974 100644 --- a/service/servicecatalog/api_op_DescribePortfolioShareStatus.go +++ b/service/servicecatalog/api_op_DescribePortfolioShareStatus.go @@ -68,6 +68,9 @@ func addOperationDescribePortfolioShareStatusMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribePortfolioShareStatusMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProduct.go b/service/servicecatalog/api_op_DescribeProduct.go index ebb0501393a..114f7a4beec 100644 --- a/service/servicecatalog/api_op_DescribeProduct.go +++ b/service/servicecatalog/api_op_DescribeProduct.go @@ -72,6 +72,9 @@ func addOperationDescribeProductMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeProductMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProductAsAdmin.go b/service/servicecatalog/api_op_DescribeProductAsAdmin.go index c9869c870a2..42340a64ee6 100644 --- a/service/servicecatalog/api_op_DescribeProductAsAdmin.go +++ b/service/servicecatalog/api_op_DescribeProductAsAdmin.go @@ -77,6 +77,9 @@ func addOperationDescribeProductAsAdminMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDescribeProductAsAdminMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProductView.go b/service/servicecatalog/api_op_DescribeProductView.go index e4178577998..910b1cf87fc 100644 --- a/service/servicecatalog/api_op_DescribeProductView.go +++ b/service/servicecatalog/api_op_DescribeProductView.go @@ -65,6 +65,9 @@ func addOperationDescribeProductViewMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeProductViewMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProvisionedProduct.go b/service/servicecatalog/api_op_DescribeProvisionedProduct.go index 024d9925908..55633492403 100644 --- a/service/servicecatalog/api_op_DescribeProvisionedProduct.go +++ b/service/servicecatalog/api_op_DescribeProvisionedProduct.go @@ -74,6 +74,9 @@ func addOperationDescribeProvisionedProductMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeProvisionedProductMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go b/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go index ca875bb3230..447e2206356 100644 --- a/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go @@ -77,6 +77,9 @@ func addOperationDescribeProvisionedProductPlanMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeProvisionedProductPlanMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProvisioningArtifact.go b/service/servicecatalog/api_op_DescribeProvisioningArtifact.go index 6a38c3f179a..e469b2cd6c2 100644 --- a/service/servicecatalog/api_op_DescribeProvisioningArtifact.go +++ b/service/servicecatalog/api_op_DescribeProvisioningArtifact.go @@ -79,6 +79,9 @@ func addOperationDescribeProvisioningArtifactMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeProvisioningArtifactMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeProvisioningParameters.go b/service/servicecatalog/api_op_DescribeProvisioningParameters.go index f0b5f316689..b7a405117b5 100644 --- a/service/servicecatalog/api_op_DescribeProvisioningParameters.go +++ b/service/servicecatalog/api_op_DescribeProvisioningParameters.go @@ -104,6 +104,9 @@ func addOperationDescribeProvisioningParametersMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationDescribeProvisioningParametersMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeRecord.go b/service/servicecatalog/api_op_DescribeRecord.go index addba8cdce7..757772fc771 100644 --- a/service/servicecatalog/api_op_DescribeRecord.go +++ b/service/servicecatalog/api_op_DescribeRecord.go @@ -86,6 +86,9 @@ func addOperationDescribeRecordMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribeRecordMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeServiceAction.go b/service/servicecatalog/api_op_DescribeServiceAction.go index c3c0f31f5c6..daafbb8032a 100644 --- a/service/servicecatalog/api_op_DescribeServiceAction.go +++ b/service/servicecatalog/api_op_DescribeServiceAction.go @@ -62,6 +62,9 @@ func addOperationDescribeServiceActionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeServiceActionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go b/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go index 8be904573cb..0fad3d9ef3b 100644 --- a/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go +++ b/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go @@ -68,6 +68,9 @@ func addOperationDescribeServiceActionExecutionParametersMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeServiceActionExecutionParametersMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DescribeTagOption.go b/service/servicecatalog/api_op_DescribeTagOption.go index 029b954ff18..090a89c4407 100644 --- a/service/servicecatalog/api_op_DescribeTagOption.go +++ b/service/servicecatalog/api_op_DescribeTagOption.go @@ -53,6 +53,9 @@ func addOperationDescribeTagOptionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeTagOptionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go b/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go index 02df3eff8ba..a781c5f44df 100644 --- a/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go +++ b/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go @@ -50,6 +50,9 @@ func addOperationDisableAWSOrganizationsAccessMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationDisableAWSOrganizationsAccessMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DisassociateBudgetFromResource.go b/service/servicecatalog/api_op_DisassociateBudgetFromResource.go index 4464e25c48c..864fc8f6ecf 100644 --- a/service/servicecatalog/api_op_DisassociateBudgetFromResource.go +++ b/service/servicecatalog/api_op_DisassociateBudgetFromResource.go @@ -54,6 +54,9 @@ func addOperationDisassociateBudgetFromResourceMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateBudgetFromResourceMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go b/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go index 5938a3e9df4..34d82546107 100644 --- a/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go +++ b/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go @@ -62,6 +62,9 @@ func addOperationDisassociatePrincipalFromPortfolioMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDisassociatePrincipalFromPortfolioMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go b/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go index 25a9cfb3fa8..da760b57bc9 100644 --- a/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go +++ b/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go @@ -63,6 +63,9 @@ func addOperationDisassociateProductFromPortfolioMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDisassociateProductFromPortfolioMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go b/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go index 22f2eeeb9e5..86224f57a39 100644 --- a/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go +++ b/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go @@ -68,6 +68,9 @@ func addOperationDisassociateServiceActionFromProvisioningArtifactMiddlewares(st if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDisassociateServiceActionFromProvisioningArtifactMiddlewares(st if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go b/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go index 6eda69e0bc5..58f030bbe0d 100644 --- a/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go +++ b/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go @@ -53,6 +53,9 @@ func addOperationDisassociateTagOptionFromResourceMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDisassociateTagOptionFromResourceMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go b/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go index a7afa2c326c..d43057b4f9b 100644 --- a/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go +++ b/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go @@ -50,6 +50,9 @@ func addOperationEnableAWSOrganizationsAccessMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationEnableAWSOrganizationsAccessMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go b/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go index 61d940959d1..1b64c0e4913 100644 --- a/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go @@ -71,6 +71,9 @@ func addOperationExecuteProvisionedProductPlanMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationExecuteProvisionedProductPlanMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go b/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go index 569d8746e5b..bbcadd6c86d 100644 --- a/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go +++ b/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go @@ -81,6 +81,9 @@ func addOperationExecuteProvisionedProductServiceActionMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationExecuteProvisionedProductServiceActionMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go b/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go index be8ce612a3f..37962347c8c 100644 --- a/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go +++ b/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go @@ -50,6 +50,9 @@ func addOperationGetAWSOrganizationsAccessStatusMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationGetAWSOrganizationsAccessStatusMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_GetProvisionedProductOutputs.go b/service/servicecatalog/api_op_GetProvisionedProductOutputs.go index b89bda8d9a4..bb278e054cf 100644 --- a/service/servicecatalog/api_op_GetProvisionedProductOutputs.go +++ b/service/servicecatalog/api_op_GetProvisionedProductOutputs.go @@ -82,6 +82,9 @@ func addOperationGetProvisionedProductOutputsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetProvisionedProductOutputsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go b/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go index 965018aee84..889d7d32b3b 100644 --- a/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go +++ b/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go @@ -80,6 +80,9 @@ func addOperationListAcceptedPortfolioSharesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListAcceptedPortfolioSharesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListBudgetsForResource.go b/service/servicecatalog/api_op_ListBudgetsForResource.go index 3cd2bcb10e8..bdee1f0a392 100644 --- a/service/servicecatalog/api_op_ListBudgetsForResource.go +++ b/service/servicecatalog/api_op_ListBudgetsForResource.go @@ -73,6 +73,9 @@ func addOperationListBudgetsForResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListBudgetsForResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListConstraintsForPortfolio.go b/service/servicecatalog/api_op_ListConstraintsForPortfolio.go index ac9862a1ee6..6b5b35f5071 100644 --- a/service/servicecatalog/api_op_ListConstraintsForPortfolio.go +++ b/service/servicecatalog/api_op_ListConstraintsForPortfolio.go @@ -76,6 +76,9 @@ func addOperationListConstraintsForPortfolioMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListConstraintsForPortfolioMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListLaunchPaths.go b/service/servicecatalog/api_op_ListLaunchPaths.go index adc5f2635ca..3aa69068d64 100644 --- a/service/servicecatalog/api_op_ListLaunchPaths.go +++ b/service/servicecatalog/api_op_ListLaunchPaths.go @@ -75,6 +75,9 @@ func addOperationListLaunchPathsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListLaunchPathsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go b/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go index dbc43f95837..c884da0c4c3 100644 --- a/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go +++ b/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go @@ -91,6 +91,9 @@ func addOperationListOrganizationPortfolioAccessMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationListOrganizationPortfolioAccessMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListPortfolioAccess.go b/service/servicecatalog/api_op_ListPortfolioAccess.go index 15dcead88e0..de2b23e703d 100644 --- a/service/servicecatalog/api_op_ListPortfolioAccess.go +++ b/service/servicecatalog/api_op_ListPortfolioAccess.go @@ -79,6 +79,9 @@ func addOperationListPortfolioAccessMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListPortfolioAccessMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListPortfolios.go b/service/servicecatalog/api_op_ListPortfolios.go index bc119eb84e7..8bb14f62a76 100644 --- a/service/servicecatalog/api_op_ListPortfolios.go +++ b/service/servicecatalog/api_op_ListPortfolios.go @@ -68,6 +68,9 @@ func addOperationListPortfoliosMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListPortfoliosMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListPortfoliosForProduct.go b/service/servicecatalog/api_op_ListPortfoliosForProduct.go index a6d0e49e68a..c26378cecdb 100644 --- a/service/servicecatalog/api_op_ListPortfoliosForProduct.go +++ b/service/servicecatalog/api_op_ListPortfoliosForProduct.go @@ -73,6 +73,9 @@ func addOperationListPortfoliosForProductMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListPortfoliosForProductMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go b/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go index 9b4224cb962..208732a5455 100644 --- a/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go +++ b/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go @@ -73,6 +73,9 @@ func addOperationListPrincipalsForPortfolioMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListPrincipalsForPortfolioMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListProvisionedProductPlans.go b/service/servicecatalog/api_op_ListProvisionedProductPlans.go index e520c6128b3..821aa11509e 100644 --- a/service/servicecatalog/api_op_ListProvisionedProductPlans.go +++ b/service/servicecatalog/api_op_ListProvisionedProductPlans.go @@ -75,6 +75,9 @@ func addOperationListProvisionedProductPlansMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListProvisionedProductPlansMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListProvisioningArtifacts.go b/service/servicecatalog/api_op_ListProvisioningArtifacts.go index 6cc69915e86..d05ef675360 100644 --- a/service/servicecatalog/api_op_ListProvisioningArtifacts.go +++ b/service/servicecatalog/api_op_ListProvisioningArtifacts.go @@ -67,6 +67,9 @@ func addOperationListProvisioningArtifactsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListProvisioningArtifactsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go b/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go index d4e3073c38b..3de06c9ddb3 100644 --- a/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go +++ b/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go @@ -75,6 +75,9 @@ func addOperationListProvisioningArtifactsForServiceActionMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListProvisioningArtifactsForServiceActionMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListRecordHistory.go b/service/servicecatalog/api_op_ListRecordHistory.go index 3fb29c214fe..318984f6490 100644 --- a/service/servicecatalog/api_op_ListRecordHistory.go +++ b/service/servicecatalog/api_op_ListRecordHistory.go @@ -74,6 +74,9 @@ func addOperationListRecordHistoryMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListRecordHistoryMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListResourcesForTagOption.go b/service/servicecatalog/api_op_ListResourcesForTagOption.go index 5ea3d2adea5..34407549f42 100644 --- a/service/servicecatalog/api_op_ListResourcesForTagOption.go +++ b/service/servicecatalog/api_op_ListResourcesForTagOption.go @@ -71,6 +71,9 @@ func addOperationListResourcesForTagOptionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListResourcesForTagOptionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListServiceActions.go b/service/servicecatalog/api_op_ListServiceActions.go index 0db6de61420..960af1c174c 100644 --- a/service/servicecatalog/api_op_ListServiceActions.go +++ b/service/servicecatalog/api_op_ListServiceActions.go @@ -69,6 +69,9 @@ func addOperationListServiceActionsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListServiceActionsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go b/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go index 278ecbefaf5..a4f597ee881 100644 --- a/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go +++ b/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go @@ -80,6 +80,9 @@ func addOperationListServiceActionsForProvisioningArtifactMiddlewares(stack *mid if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListServiceActionsForProvisioningArtifactMiddlewares(stack *mid if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go b/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go index 4f0977fd622..cc1fd5cb92d 100644 --- a/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go +++ b/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go @@ -75,6 +75,9 @@ func addOperationListStackInstancesForProvisionedProductMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListStackInstancesForProvisionedProductMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ListTagOptions.go b/service/servicecatalog/api_op_ListTagOptions.go index e1e6c01fb2e..faa794eb204 100644 --- a/service/servicecatalog/api_op_ListTagOptions.go +++ b/service/servicecatalog/api_op_ListTagOptions.go @@ -63,6 +63,9 @@ func addOperationListTagOptionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListTagOptionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ProvisionProduct.go b/service/servicecatalog/api_op_ProvisionProduct.go index 2c8d3c6d8f7..2a6056d84a7 100644 --- a/service/servicecatalog/api_op_ProvisionProduct.go +++ b/service/servicecatalog/api_op_ProvisionProduct.go @@ -113,6 +113,9 @@ func addOperationProvisionProductMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationProvisionProductMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_RejectPortfolioShare.go b/service/servicecatalog/api_op_RejectPortfolioShare.go index b2d5fe16072..08595102177 100644 --- a/service/servicecatalog/api_op_RejectPortfolioShare.go +++ b/service/servicecatalog/api_op_RejectPortfolioShare.go @@ -74,6 +74,9 @@ func addOperationRejectPortfolioShareMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationRejectPortfolioShareMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_ScanProvisionedProducts.go b/service/servicecatalog/api_op_ScanProvisionedProducts.go index d3748a19794..ba99902cf17 100644 --- a/service/servicecatalog/api_op_ScanProvisionedProducts.go +++ b/service/servicecatalog/api_op_ScanProvisionedProducts.go @@ -72,6 +72,9 @@ func addOperationScanProvisionedProductsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationScanProvisionedProductsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_SearchProducts.go b/service/servicecatalog/api_op_SearchProducts.go index 9ff069259b4..697d35c0df5 100644 --- a/service/servicecatalog/api_op_SearchProducts.go +++ b/service/servicecatalog/api_op_SearchProducts.go @@ -81,6 +81,9 @@ func addOperationSearchProductsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationSearchProductsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_SearchProductsAsAdmin.go b/service/servicecatalog/api_op_SearchProductsAsAdmin.go index 37c22162433..333a5c10a25 100644 --- a/service/servicecatalog/api_op_SearchProductsAsAdmin.go +++ b/service/servicecatalog/api_op_SearchProductsAsAdmin.go @@ -84,6 +84,9 @@ func addOperationSearchProductsAsAdminMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationSearchProductsAsAdminMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_SearchProvisionedProducts.go b/service/servicecatalog/api_op_SearchProvisionedProducts.go index 3bb3cf9966f..7fc867707ec 100644 --- a/service/servicecatalog/api_op_SearchProvisionedProducts.go +++ b/service/servicecatalog/api_op_SearchProvisionedProducts.go @@ -89,6 +89,9 @@ func addOperationSearchProvisionedProductsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationSearchProvisionedProductsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_TerminateProvisionedProduct.go b/service/servicecatalog/api_op_TerminateProvisionedProduct.go index 07dd11add74..70e0d573eb6 100644 --- a/service/servicecatalog/api_op_TerminateProvisionedProduct.go +++ b/service/servicecatalog/api_op_TerminateProvisionedProduct.go @@ -80,6 +80,9 @@ func addOperationTerminateProvisionedProductMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationTerminateProvisionedProductMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateConstraint.go b/service/servicecatalog/api_op_UpdateConstraint.go index 4a87415f754..dcd3f37729f 100644 --- a/service/servicecatalog/api_op_UpdateConstraint.go +++ b/service/servicecatalog/api_op_UpdateConstraint.go @@ -98,6 +98,9 @@ func addOperationUpdateConstraintMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationUpdateConstraintMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdatePortfolio.go b/service/servicecatalog/api_op_UpdatePortfolio.go index 79ac6b9562c..9d6b99e6a65 100644 --- a/service/servicecatalog/api_op_UpdatePortfolio.go +++ b/service/servicecatalog/api_op_UpdatePortfolio.go @@ -81,6 +81,9 @@ func addOperationUpdatePortfolioMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdatePortfolioMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateProduct.go b/service/servicecatalog/api_op_UpdateProduct.go index b5b3bee1314..78c558bf68b 100644 --- a/service/servicecatalog/api_op_UpdateProduct.go +++ b/service/servicecatalog/api_op_UpdateProduct.go @@ -92,6 +92,9 @@ func addOperationUpdateProductMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateProductMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateProvisionedProduct.go b/service/servicecatalog/api_op_UpdateProvisionedProduct.go index 3dfe02770c0..1f8380a16fb 100644 --- a/service/servicecatalog/api_op_UpdateProvisionedProduct.go +++ b/service/servicecatalog/api_op_UpdateProvisionedProduct.go @@ -107,6 +107,9 @@ func addOperationUpdateProvisionedProductMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationUpdateProvisionedProductMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go b/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go index b3bf32f32dd..ce0a6a1c5fb 100644 --- a/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go +++ b/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go @@ -103,6 +103,9 @@ func addOperationUpdateProvisionedProductPropertiesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationUpdateProvisionedProductPropertiesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateProvisioningArtifact.go b/service/servicecatalog/api_op_UpdateProvisioningArtifact.go index 0ec1748a419..f31e6b77e91 100644 --- a/service/servicecatalog/api_op_UpdateProvisioningArtifact.go +++ b/service/servicecatalog/api_op_UpdateProvisioningArtifact.go @@ -94,6 +94,9 @@ func addOperationUpdateProvisioningArtifactMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationUpdateProvisioningArtifactMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateServiceAction.go b/service/servicecatalog/api_op_UpdateServiceAction.go index c41097b026d..a71e2beaf56 100644 --- a/service/servicecatalog/api_op_UpdateServiceAction.go +++ b/service/servicecatalog/api_op_UpdateServiceAction.go @@ -71,6 +71,9 @@ func addOperationUpdateServiceActionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateServiceActionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/api_op_UpdateTagOption.go b/service/servicecatalog/api_op_UpdateTagOption.go index 5c2071249f8..e1b92946726 100644 --- a/service/servicecatalog/api_op_UpdateTagOption.go +++ b/service/servicecatalog/api_op_UpdateTagOption.go @@ -59,6 +59,9 @@ func addOperationUpdateTagOptionMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateTagOptionMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicecatalog/go.mod b/service/servicecatalog/go.mod index b73eab4da83..7a67e3aadb1 100644 --- a/service/servicecatalog/go.mod +++ b/service/servicecatalog/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/servicecatalog go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicecatalog/go.sum b/service/servicecatalog/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/servicecatalog/go.sum +++ b/service/servicecatalog/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/servicediscovery/api_client.go b/service/servicediscovery/api_client.go index b452db66058..f4fdb5f9bff 100644 --- a/service/servicediscovery/api_client.go +++ b/service/servicediscovery/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/servicediscovery/api_op_CreateHttpNamespace.go b/service/servicediscovery/api_op_CreateHttpNamespace.go index d07d6bb11d4..253e0325b86 100644 --- a/service/servicediscovery/api_op_CreateHttpNamespace.go +++ b/service/servicediscovery/api_op_CreateHttpNamespace.go @@ -75,6 +75,9 @@ func addOperationCreateHttpNamespaceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCreateHttpNamespaceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go b/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go index 92bcf7bd760..e76e61d87fc 100644 --- a/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go +++ b/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go @@ -84,6 +84,9 @@ func addOperationCreatePrivateDnsNamespaceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreatePrivateDnsNamespaceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_CreatePublicDnsNamespace.go b/service/servicediscovery/api_op_CreatePublicDnsNamespace.go index 3a77caf8b0f..e76fc213fc9 100644 --- a/service/servicediscovery/api_op_CreatePublicDnsNamespace.go +++ b/service/servicediscovery/api_op_CreatePublicDnsNamespace.go @@ -76,6 +76,9 @@ func addOperationCreatePublicDnsNamespaceMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationCreatePublicDnsNamespaceMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_CreateService.go b/service/servicediscovery/api_op_CreateService.go index a71512b9ab0..8905a18574b 100644 --- a/service/servicediscovery/api_op_CreateService.go +++ b/service/servicediscovery/api_op_CreateService.go @@ -130,6 +130,9 @@ func addOperationCreateServiceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationCreateServiceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_DeleteNamespace.go b/service/servicediscovery/api_op_DeleteNamespace.go index 8dde6d40af8..a3dc61757aa 100644 --- a/service/servicediscovery/api_op_DeleteNamespace.go +++ b/service/servicediscovery/api_op_DeleteNamespace.go @@ -55,6 +55,9 @@ func addOperationDeleteNamespaceMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteNamespaceMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_DeleteService.go b/service/servicediscovery/api_op_DeleteService.go index e1329c1bc3b..97617ae3c71 100644 --- a/service/servicediscovery/api_op_DeleteService.go +++ b/service/servicediscovery/api_op_DeleteService.go @@ -49,6 +49,9 @@ func addOperationDeleteServiceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteServiceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_DeregisterInstance.go b/service/servicediscovery/api_op_DeregisterInstance.go index bd74ffd568a..19d064ddc9e 100644 --- a/service/servicediscovery/api_op_DeregisterInstance.go +++ b/service/servicediscovery/api_op_DeregisterInstance.go @@ -62,6 +62,9 @@ func addOperationDeregisterInstanceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeregisterInstanceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_DiscoverInstances.go b/service/servicediscovery/api_op_DiscoverInstances.go index 004e14c75c3..11bfb04b08b 100644 --- a/service/servicediscovery/api_op_DiscoverInstances.go +++ b/service/servicediscovery/api_op_DiscoverInstances.go @@ -83,6 +83,9 @@ func addOperationDiscoverInstancesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDiscoverInstancesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_GetInstance.go b/service/servicediscovery/api_op_GetInstance.go index d6be74aed7c..255709ab18d 100644 --- a/service/servicediscovery/api_op_GetInstance.go +++ b/service/servicediscovery/api_op_GetInstance.go @@ -58,6 +58,9 @@ func addOperationGetInstanceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetInstanceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_GetInstancesHealthStatus.go b/service/servicediscovery/api_op_GetInstancesHealthStatus.go index 67a5d607228..348322e8da4 100644 --- a/service/servicediscovery/api_op_GetInstancesHealthStatus.go +++ b/service/servicediscovery/api_op_GetInstancesHealthStatus.go @@ -82,6 +82,9 @@ func addOperationGetInstancesHealthStatusMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetInstancesHealthStatusMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_GetNamespace.go b/service/servicediscovery/api_op_GetNamespace.go index 5abd2e8d71f..8cbf7c97a7f 100644 --- a/service/servicediscovery/api_op_GetNamespace.go +++ b/service/servicediscovery/api_op_GetNamespace.go @@ -53,6 +53,9 @@ func addOperationGetNamespaceMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetNamespaceMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_GetOperation.go b/service/servicediscovery/api_op_GetOperation.go index 37a953d3f9d..04cf5308780 100644 --- a/service/servicediscovery/api_op_GetOperation.go +++ b/service/servicediscovery/api_op_GetOperation.go @@ -56,6 +56,9 @@ func addOperationGetOperationMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetOperationMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_GetService.go b/service/servicediscovery/api_op_GetService.go index 1e07be31992..089824e15d2 100644 --- a/service/servicediscovery/api_op_GetService.go +++ b/service/servicediscovery/api_op_GetService.go @@ -53,6 +53,9 @@ func addOperationGetServiceMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetServiceMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_ListInstances.go b/service/servicediscovery/api_op_ListInstances.go index 296b2794777..374793b057e 100644 --- a/service/servicediscovery/api_op_ListInstances.go +++ b/service/servicediscovery/api_op_ListInstances.go @@ -71,6 +71,9 @@ func addOperationListInstancesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListInstancesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_ListNamespaces.go b/service/servicediscovery/api_op_ListNamespaces.go index 509a3b775ea..ac5f363b561 100644 --- a/service/servicediscovery/api_op_ListNamespaces.go +++ b/service/servicediscovery/api_op_ListNamespaces.go @@ -78,6 +78,9 @@ func addOperationListNamespacesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationListNamespacesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_ListOperations.go b/service/servicediscovery/api_op_ListOperations.go index 52c40dd29c2..4c5fe95df79 100644 --- a/service/servicediscovery/api_op_ListOperations.go +++ b/service/servicediscovery/api_op_ListOperations.go @@ -77,6 +77,9 @@ func addOperationListOperationsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListOperationsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_ListServices.go b/service/servicediscovery/api_op_ListServices.go index b5c1ff34155..606eb95b8f9 100644 --- a/service/servicediscovery/api_op_ListServices.go +++ b/service/servicediscovery/api_op_ListServices.go @@ -77,6 +77,9 @@ func addOperationListServicesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListServicesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_ListTagsForResource.go b/service/servicediscovery/api_op_ListTagsForResource.go index c9425eaa0dc..35e629f476b 100644 --- a/service/servicediscovery/api_op_ListTagsForResource.go +++ b/service/servicediscovery/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_RegisterInstance.go b/service/servicediscovery/api_op_RegisterInstance.go index 975704226bb..6e4c487e063 100644 --- a/service/servicediscovery/api_op_RegisterInstance.go +++ b/service/servicediscovery/api_op_RegisterInstance.go @@ -194,6 +194,9 @@ func addOperationRegisterInstanceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -239,6 +242,9 @@ func addOperationRegisterInstanceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_TagResource.go b/service/servicediscovery/api_op_TagResource.go index 1465ffcd06c..42b5f3390e8 100644 --- a/service/servicediscovery/api_op_TagResource.go +++ b/service/servicediscovery/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_UntagResource.go b/service/servicediscovery/api_op_UntagResource.go index 524bafbae32..6397ede40ee 100644 --- a/service/servicediscovery/api_op_UntagResource.go +++ b/service/servicediscovery/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go b/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go index c8dae03db05..0c898c8b354 100644 --- a/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go +++ b/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go @@ -66,6 +66,9 @@ func addOperationUpdateInstanceCustomHealthStatusMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateInstanceCustomHealthStatusMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/api_op_UpdateService.go b/service/servicediscovery/api_op_UpdateService.go index 8c233e8cb7c..91ed3a565d2 100644 --- a/service/servicediscovery/api_op_UpdateService.go +++ b/service/servicediscovery/api_op_UpdateService.go @@ -82,6 +82,9 @@ func addOperationUpdateServiceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUpdateServiceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicediscovery/go.mod b/service/servicediscovery/go.mod index 338cb68b400..d2689176787 100644 --- a/service/servicediscovery/go.mod +++ b/service/servicediscovery/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/servicediscovery go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicediscovery/go.sum b/service/servicediscovery/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/servicediscovery/go.sum +++ b/service/servicediscovery/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/servicequotas/api_client.go b/service/servicequotas/api_client.go index cdd3c1bea2a..9ad0b549322 100644 --- a/service/servicequotas/api_client.go +++ b/service/servicequotas/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go b/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go index 45d0d13f872..527b373ada7 100644 --- a/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go +++ b/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go @@ -47,6 +47,9 @@ func addOperationAssociateServiceQuotaTemplateMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationAssociateServiceQuotaTemplateMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go b/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go index 59f16451797..0c243009a68 100644 --- a/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go +++ b/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go @@ -58,6 +58,9 @@ func addOperationDeleteServiceQuotaIncreaseRequestFromTemplateMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteServiceQuotaIncreaseRequestFromTemplateMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go b/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go index 763eea0ee8e..73455e72df4 100644 --- a/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go +++ b/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go @@ -52,6 +52,9 @@ func addOperationDisassociateServiceQuotaTemplateMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisassociateServiceQuotaTemplateMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go b/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go index 3b0e0a8fd00..a6ef3e704a1 100644 --- a/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go +++ b/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go @@ -59,6 +59,9 @@ func addOperationGetAWSDefaultServiceQuotaMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetAWSDefaultServiceQuotaMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go b/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go index 47a7d7e0af5..ca8195cb355 100644 --- a/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go +++ b/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go @@ -52,6 +52,9 @@ func addOperationGetAssociationForServiceQuotaTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationGetAssociationForServiceQuotaTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go b/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go index 155ded2c43c..08df6121029 100644 --- a/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go +++ b/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go @@ -54,6 +54,9 @@ func addOperationGetRequestedServiceQuotaChangeMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetRequestedServiceQuotaChangeMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_GetServiceQuota.go b/service/servicequotas/api_op_GetServiceQuota.go index 21a774c4199..6129d22fa34 100644 --- a/service/servicequotas/api_op_GetServiceQuota.go +++ b/service/servicequotas/api_op_GetServiceQuota.go @@ -61,6 +61,9 @@ func addOperationGetServiceQuotaMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetServiceQuotaMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go b/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go index b42fe6d6553..9eb1f082525 100644 --- a/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go +++ b/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go @@ -63,6 +63,9 @@ func addOperationGetServiceQuotaIncreaseRequestFromTemplateMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetServiceQuotaIncreaseRequestFromTemplateMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go b/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go index 07172aecf54..428aac64842 100644 --- a/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go +++ b/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go @@ -88,6 +88,9 @@ func addOperationListAWSDefaultServiceQuotasMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListAWSDefaultServiceQuotasMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go index cd479afb088..0f937c9f31c 100644 --- a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go +++ b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go @@ -78,6 +78,9 @@ func addOperationListRequestedServiceQuotaChangeHistoryMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListRequestedServiceQuotaChangeHistoryMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go index 8c2350a5277..73a302251ad 100644 --- a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go +++ b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go @@ -88,6 +88,9 @@ func addOperationListRequestedServiceQuotaChangeHistoryByQuotaMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListRequestedServiceQuotaChangeHistoryByQuotaMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go b/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go index f164a31ca77..8b16de5b23d 100644 --- a/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go +++ b/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go @@ -79,6 +79,9 @@ func addOperationListServiceQuotaIncreaseRequestsInTemplateMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListServiceQuotaIncreaseRequestsInTemplateMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_ListServiceQuotas.go b/service/servicequotas/api_op_ListServiceQuotas.go index 86e99372ed2..c57c234eda7 100644 --- a/service/servicequotas/api_op_ListServiceQuotas.go +++ b/service/servicequotas/api_op_ListServiceQuotas.go @@ -86,6 +86,9 @@ func addOperationListServiceQuotasMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListServiceQuotasMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_ListServices.go b/service/servicequotas/api_op_ListServices.go index 414625e84c2..b4dc1de1ac9 100644 --- a/service/servicequotas/api_op_ListServices.go +++ b/service/servicequotas/api_op_ListServices.go @@ -74,6 +74,9 @@ func addOperationListServicesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListServicesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go b/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go index 0b22fa870c9..f0d5b4a5c68 100644 --- a/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go +++ b/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go @@ -72,6 +72,9 @@ func addOperationPutServiceQuotaIncreaseRequestIntoTemplateMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutServiceQuotaIncreaseRequestIntoTemplateMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/api_op_RequestServiceQuotaIncrease.go b/service/servicequotas/api_op_RequestServiceQuotaIncrease.go index cb5df495640..8c3a9193a33 100644 --- a/service/servicequotas/api_op_RequestServiceQuotaIncrease.go +++ b/service/servicequotas/api_op_RequestServiceQuotaIncrease.go @@ -64,6 +64,9 @@ func addOperationRequestServiceQuotaIncreaseMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationRequestServiceQuotaIncreaseMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/servicequotas/go.mod b/service/servicequotas/go.mod index f2cfeb1c684..5f0f988ed0a 100644 --- a/service/servicequotas/go.mod +++ b/service/servicequotas/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/servicequotas go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicequotas/go.sum b/service/servicequotas/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/servicequotas/go.sum +++ b/service/servicequotas/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ses/api_client.go b/service/ses/api_client.go index 371b10e5d3d..b4f68c0f677 100644 --- a/service/ses/api_client.go +++ b/service/ses/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ses/api_op_CloneReceiptRuleSet.go b/service/ses/api_op_CloneReceiptRuleSet.go index 05ebe113ce7..9f8e879b595 100644 --- a/service/ses/api_op_CloneReceiptRuleSet.go +++ b/service/ses/api_op_CloneReceiptRuleSet.go @@ -72,6 +72,9 @@ func addOperationCloneReceiptRuleSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCloneReceiptRuleSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateConfigurationSet.go b/service/ses/api_op_CreateConfigurationSet.go index 373413296fe..d2e4626ae4c 100644 --- a/service/ses/api_op_CreateConfigurationSet.go +++ b/service/ses/api_op_CreateConfigurationSet.go @@ -58,6 +58,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateConfigurationSetEventDestination.go b/service/ses/api_op_CreateConfigurationSetEventDestination.go index 2ab2721f292..749593533e4 100644 --- a/service/ses/api_op_CreateConfigurationSetEventDestination.go +++ b/service/ses/api_op_CreateConfigurationSetEventDestination.go @@ -71,6 +71,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateConfigurationSetTrackingOptions.go b/service/ses/api_op_CreateConfigurationSetTrackingOptions.go index 938d720aa02..d7e59c78712 100644 --- a/service/ses/api_op_CreateConfigurationSetTrackingOptions.go +++ b/service/ses/api_op_CreateConfigurationSetTrackingOptions.go @@ -68,6 +68,9 @@ func addOperationCreateConfigurationSetTrackingOptionsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateConfigurationSetTrackingOptionsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateCustomVerificationEmailTemplate.go b/service/ses/api_op_CreateCustomVerificationEmailTemplate.go index 40df52d583f..4248bb44001 100644 --- a/service/ses/api_op_CreateCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_CreateCustomVerificationEmailTemplate.go @@ -85,6 +85,9 @@ func addOperationCreateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateReceiptFilter.go b/service/ses/api_op_CreateReceiptFilter.go index 7bb91c21bc9..94993d6e702 100644 --- a/service/ses/api_op_CreateReceiptFilter.go +++ b/service/ses/api_op_CreateReceiptFilter.go @@ -58,6 +58,9 @@ func addOperationCreateReceiptFilterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateReceiptFilterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateReceiptRule.go b/service/ses/api_op_CreateReceiptRule.go index 02775afc97f..7d5dbfcea4e 100644 --- a/service/ses/api_op_CreateReceiptRule.go +++ b/service/ses/api_op_CreateReceiptRule.go @@ -67,6 +67,9 @@ func addOperationCreateReceiptRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateReceiptRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateReceiptRuleSet.go b/service/ses/api_op_CreateReceiptRuleSet.go index 04b3bdaed32..60a749d8c46 100644 --- a/service/ses/api_op_CreateReceiptRuleSet.go +++ b/service/ses/api_op_CreateReceiptRuleSet.go @@ -65,6 +65,9 @@ func addOperationCreateReceiptRuleSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateReceiptRuleSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_CreateTemplate.go b/service/ses/api_op_CreateTemplate.go index e0cee37c7b1..7cdcaa9da8b 100644 --- a/service/ses/api_op_CreateTemplate.go +++ b/service/ses/api_op_CreateTemplate.go @@ -57,6 +57,9 @@ func addOperationCreateTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteConfigurationSet.go b/service/ses/api_op_DeleteConfigurationSet.go index 01607db9f1c..7e116d0153c 100644 --- a/service/ses/api_op_DeleteConfigurationSet.go +++ b/service/ses/api_op_DeleteConfigurationSet.go @@ -57,6 +57,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteConfigurationSetEventDestination.go b/service/ses/api_op_DeleteConfigurationSetEventDestination.go index cddac729f92..58b1df696b5 100644 --- a/service/ses/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/ses/api_op_DeleteConfigurationSetEventDestination.go @@ -64,6 +64,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go b/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go index 19c5b994b77..f6a471c9ceb 100644 --- a/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go +++ b/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go @@ -60,6 +60,9 @@ func addOperationDeleteConfigurationSetTrackingOptionsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteConfigurationSetTrackingOptionsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go b/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go index 5a39b444a6e..f62fe40b770 100644 --- a/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go @@ -54,6 +54,9 @@ func addOperationDeleteCustomVerificationEmailTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteCustomVerificationEmailTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteIdentity.go b/service/ses/api_op_DeleteIdentity.go index 2d3aa0b503c..71aefbad89f 100644 --- a/service/ses/api_op_DeleteIdentity.go +++ b/service/ses/api_op_DeleteIdentity.go @@ -53,6 +53,9 @@ func addOperationDeleteIdentityMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteIdentityMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteIdentityPolicy.go b/service/ses/api_op_DeleteIdentityPolicy.go index c2af77c88de..d4e9163a2c1 100644 --- a/service/ses/api_op_DeleteIdentityPolicy.go +++ b/service/ses/api_op_DeleteIdentityPolicy.go @@ -71,6 +71,9 @@ func addOperationDeleteIdentityPolicyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteIdentityPolicyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteReceiptFilter.go b/service/ses/api_op_DeleteReceiptFilter.go index 640cc9c1c0d..3986953112a 100644 --- a/service/ses/api_op_DeleteReceiptFilter.go +++ b/service/ses/api_op_DeleteReceiptFilter.go @@ -56,6 +56,9 @@ func addOperationDeleteReceiptFilterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteReceiptFilterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteReceiptRule.go b/service/ses/api_op_DeleteReceiptRule.go index a63ccbc6574..78909244a7b 100644 --- a/service/ses/api_op_DeleteReceiptRule.go +++ b/service/ses/api_op_DeleteReceiptRule.go @@ -60,6 +60,9 @@ func addOperationDeleteReceiptRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteReceiptRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteReceiptRuleSet.go b/service/ses/api_op_DeleteReceiptRuleSet.go index f5296583454..e23fbd28c2f 100644 --- a/service/ses/api_op_DeleteReceiptRuleSet.go +++ b/service/ses/api_op_DeleteReceiptRuleSet.go @@ -57,6 +57,9 @@ func addOperationDeleteReceiptRuleSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteReceiptRuleSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteTemplate.go b/service/ses/api_op_DeleteTemplate.go index 1abbda500f4..754048da69e 100644 --- a/service/ses/api_op_DeleteTemplate.go +++ b/service/ses/api_op_DeleteTemplate.go @@ -52,6 +52,9 @@ func addOperationDeleteTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DeleteVerifiedEmailAddress.go b/service/ses/api_op_DeleteVerifiedEmailAddress.go index 07805e4983d..76d43c79c0e 100644 --- a/service/ses/api_op_DeleteVerifiedEmailAddress.go +++ b/service/ses/api_op_DeleteVerifiedEmailAddress.go @@ -51,6 +51,9 @@ func addOperationDeleteVerifiedEmailAddressMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteVerifiedEmailAddressMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DescribeActiveReceiptRuleSet.go b/service/ses/api_op_DescribeActiveReceiptRuleSet.go index 430453a1ee8..5caa47ff69d 100644 --- a/service/ses/api_op_DescribeActiveReceiptRuleSet.go +++ b/service/ses/api_op_DescribeActiveReceiptRuleSet.go @@ -62,6 +62,9 @@ func addOperationDescribeActiveReceiptRuleSetMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeActiveReceiptRuleSetMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DescribeConfigurationSet.go b/service/ses/api_op_DescribeConfigurationSet.go index 9c60fd1c466..dbef7f12df3 100644 --- a/service/ses/api_op_DescribeConfigurationSet.go +++ b/service/ses/api_op_DescribeConfigurationSet.go @@ -81,6 +81,9 @@ func addOperationDescribeConfigurationSetMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeConfigurationSetMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DescribeReceiptRule.go b/service/ses/api_op_DescribeReceiptRule.go index 03aeaac6b94..362bee839ba 100644 --- a/service/ses/api_op_DescribeReceiptRule.go +++ b/service/ses/api_op_DescribeReceiptRule.go @@ -68,6 +68,9 @@ func addOperationDescribeReceiptRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeReceiptRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_DescribeReceiptRuleSet.go b/service/ses/api_op_DescribeReceiptRuleSet.go index 3ebad6e2a9a..4f9c0b1e3ab 100644 --- a/service/ses/api_op_DescribeReceiptRuleSet.go +++ b/service/ses/api_op_DescribeReceiptRuleSet.go @@ -65,6 +65,9 @@ func addOperationDescribeReceiptRuleSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeReceiptRuleSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetAccountSendingEnabled.go b/service/ses/api_op_GetAccountSendingEnabled.go index 0a9fae348d4..6dafbafacd7 100644 --- a/service/ses/api_op_GetAccountSendingEnabled.go +++ b/service/ses/api_op_GetAccountSendingEnabled.go @@ -51,6 +51,9 @@ func addOperationGetAccountSendingEnabledMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationGetAccountSendingEnabledMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetCustomVerificationEmailTemplate.go b/service/ses/api_op_GetCustomVerificationEmailTemplate.go index 4ee7abd7dcf..179ad76bf5b 100644 --- a/service/ses/api_op_GetCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_GetCustomVerificationEmailTemplate.go @@ -76,6 +76,9 @@ func addOperationGetCustomVerificationEmailTemplateMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetCustomVerificationEmailTemplateMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetIdentityDkimAttributes.go b/service/ses/api_op_GetIdentityDkimAttributes.go index c50dbe42f1e..9449d468545 100644 --- a/service/ses/api_op_GetIdentityDkimAttributes.go +++ b/service/ses/api_op_GetIdentityDkimAttributes.go @@ -86,6 +86,9 @@ func addOperationGetIdentityDkimAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetIdentityDkimAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetIdentityMailFromDomainAttributes.go b/service/ses/api_op_GetIdentityMailFromDomainAttributes.go index 4cbffc3fe90..83da1ff2cfa 100644 --- a/service/ses/api_op_GetIdentityMailFromDomainAttributes.go +++ b/service/ses/api_op_GetIdentityMailFromDomainAttributes.go @@ -62,6 +62,9 @@ func addOperationGetIdentityMailFromDomainAttributesMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetIdentityMailFromDomainAttributesMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetIdentityNotificationAttributes.go b/service/ses/api_op_GetIdentityNotificationAttributes.go index 6f78db15923..433c80a52f4 100644 --- a/service/ses/api_op_GetIdentityNotificationAttributes.go +++ b/service/ses/api_op_GetIdentityNotificationAttributes.go @@ -67,6 +67,9 @@ func addOperationGetIdentityNotificationAttributesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetIdentityNotificationAttributesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetIdentityPolicies.go b/service/ses/api_op_GetIdentityPolicies.go index 08bdbb184ac..b6fd827d9f2 100644 --- a/service/ses/api_op_GetIdentityPolicies.go +++ b/service/ses/api_op_GetIdentityPolicies.go @@ -79,6 +79,9 @@ func addOperationGetIdentityPoliciesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationGetIdentityPoliciesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetIdentityVerificationAttributes.go b/service/ses/api_op_GetIdentityVerificationAttributes.go index 7f4ff0b6102..5940d5f4eb4 100644 --- a/service/ses/api_op_GetIdentityVerificationAttributes.go +++ b/service/ses/api_op_GetIdentityVerificationAttributes.go @@ -78,6 +78,9 @@ func addOperationGetIdentityVerificationAttributesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetIdentityVerificationAttributesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetSendQuota.go b/service/ses/api_op_GetSendQuota.go index 7965b90e612..a022b364dfe 100644 --- a/service/ses/api_op_GetSendQuota.go +++ b/service/ses/api_op_GetSendQuota.go @@ -59,6 +59,9 @@ func addOperationGetSendQuotaMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetSendQuotaMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetSendStatistics.go b/service/ses/api_op_GetSendStatistics.go index 72522a5e92c..9253df87aed 100644 --- a/service/ses/api_op_GetSendStatistics.go +++ b/service/ses/api_op_GetSendStatistics.go @@ -53,6 +53,9 @@ func addOperationGetSendStatisticsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetSendStatisticsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_GetTemplate.go b/service/ses/api_op_GetTemplate.go index dc7b1e1f0c5..7eeca9e80ed 100644 --- a/service/ses/api_op_GetTemplate.go +++ b/service/ses/api_op_GetTemplate.go @@ -56,6 +56,9 @@ func addOperationGetTemplateMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetTemplateMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListConfigurationSets.go b/service/ses/api_op_ListConfigurationSets.go index c6421879a5c..6e4137180a2 100644 --- a/service/ses/api_op_ListConfigurationSets.go +++ b/service/ses/api_op_ListConfigurationSets.go @@ -76,6 +76,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListCustomVerificationEmailTemplates.go b/service/ses/api_op_ListCustomVerificationEmailTemplates.go index 2e82dab900a..f080afd28ef 100644 --- a/service/ses/api_op_ListCustomVerificationEmailTemplates.go +++ b/service/ses/api_op_ListCustomVerificationEmailTemplates.go @@ -74,6 +74,9 @@ func addOperationListCustomVerificationEmailTemplatesMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListCustomVerificationEmailTemplatesMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListIdentities.go b/service/ses/api_op_ListIdentities.go index 12c98e47af4..39e6377b242 100644 --- a/service/ses/api_op_ListIdentities.go +++ b/service/ses/api_op_ListIdentities.go @@ -70,6 +70,9 @@ func addOperationListIdentitiesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListIdentitiesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListIdentityPolicies.go b/service/ses/api_op_ListIdentityPolicies.go index 09ee0c99c55..449d409411b 100644 --- a/service/ses/api_op_ListIdentityPolicies.go +++ b/service/ses/api_op_ListIdentityPolicies.go @@ -72,6 +72,9 @@ func addOperationListIdentityPoliciesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListIdentityPoliciesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListReceiptFilters.go b/service/ses/api_op_ListReceiptFilters.go index b3b8205bb0a..a5f3f8b84f0 100644 --- a/service/ses/api_op_ListReceiptFilters.go +++ b/service/ses/api_op_ListReceiptFilters.go @@ -58,6 +58,9 @@ func addOperationListReceiptFiltersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListReceiptFiltersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListReceiptRuleSets.go b/service/ses/api_op_ListReceiptRuleSets.go index 522936326c1..14b3b909fd5 100644 --- a/service/ses/api_op_ListReceiptRuleSets.go +++ b/service/ses/api_op_ListReceiptRuleSets.go @@ -69,6 +69,9 @@ func addOperationListReceiptRuleSetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListReceiptRuleSetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListTemplates.go b/service/ses/api_op_ListTemplates.go index 8703814d46f..ca4cd0327c1 100644 --- a/service/ses/api_op_ListTemplates.go +++ b/service/ses/api_op_ListTemplates.go @@ -65,6 +65,9 @@ func addOperationListTemplatesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListTemplatesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ListVerifiedEmailAddresses.go b/service/ses/api_op_ListVerifiedEmailAddresses.go index 2acaecab9f8..4ce8f9ae137 100644 --- a/service/ses/api_op_ListVerifiedEmailAddresses.go +++ b/service/ses/api_op_ListVerifiedEmailAddresses.go @@ -50,6 +50,9 @@ func addOperationListVerifiedEmailAddressesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationListVerifiedEmailAddressesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_PutConfigurationSetDeliveryOptions.go b/service/ses/api_op_PutConfigurationSetDeliveryOptions.go index 6ce90e9bfa2..8ef79964f96 100644 --- a/service/ses/api_op_PutConfigurationSetDeliveryOptions.go +++ b/service/ses/api_op_PutConfigurationSetDeliveryOptions.go @@ -57,6 +57,9 @@ func addOperationPutConfigurationSetDeliveryOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutConfigurationSetDeliveryOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_PutIdentityPolicy.go b/service/ses/api_op_PutIdentityPolicy.go index 1ac824ca565..8e32b685a9e 100644 --- a/service/ses/api_op_PutIdentityPolicy.go +++ b/service/ses/api_op_PutIdentityPolicy.go @@ -78,6 +78,9 @@ func addOperationPutIdentityPolicyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationPutIdentityPolicyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_ReorderReceiptRuleSet.go b/service/ses/api_op_ReorderReceiptRuleSet.go index cac81d6799f..a218cd7e398 100644 --- a/service/ses/api_op_ReorderReceiptRuleSet.go +++ b/service/ses/api_op_ReorderReceiptRuleSet.go @@ -64,6 +64,9 @@ func addOperationReorderReceiptRuleSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationReorderReceiptRuleSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SendBounce.go b/service/ses/api_op_SendBounce.go index e8ec03ef138..afb081e7af8 100644 --- a/service/ses/api_op_SendBounce.go +++ b/service/ses/api_op_SendBounce.go @@ -90,6 +90,9 @@ func addOperationSendBounceMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationSendBounceMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SendBulkTemplatedEmail.go b/service/ses/api_op_SendBulkTemplatedEmail.go index b324f9c051d..d23ef5a3225 100644 --- a/service/ses/api_op_SendBulkTemplatedEmail.go +++ b/service/ses/api_op_SendBulkTemplatedEmail.go @@ -181,6 +181,9 @@ func addOperationSendBulkTemplatedEmailMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -223,6 +226,9 @@ func addOperationSendBulkTemplatedEmailMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SendCustomVerificationEmail.go b/service/ses/api_op_SendCustomVerificationEmail.go index 34a571d508c..d3cc3aa479a 100644 --- a/service/ses/api_op_SendCustomVerificationEmail.go +++ b/service/ses/api_op_SendCustomVerificationEmail.go @@ -73,6 +73,9 @@ func addOperationSendCustomVerificationEmailMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSendCustomVerificationEmailMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SendEmail.go b/service/ses/api_op_SendEmail.go index 0ce9d3eca0a..8e68da26203 100644 --- a/service/ses/api_op_SendEmail.go +++ b/service/ses/api_op_SendEmail.go @@ -172,6 +172,9 @@ func addOperationSendEmailMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -214,6 +217,9 @@ func addOperationSendEmailMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SendRawEmail.go b/service/ses/api_op_SendRawEmail.go index aea3dab5b8b..e0ea7986a4e 100644 --- a/service/ses/api_op_SendRawEmail.go +++ b/service/ses/api_op_SendRawEmail.go @@ -248,6 +248,9 @@ func addOperationSendRawEmailMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -290,6 +293,9 @@ func addOperationSendRawEmailMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SendTemplatedEmail.go b/service/ses/api_op_SendTemplatedEmail.go index 7e76b912d5b..9cdef360c48 100644 --- a/service/ses/api_op_SendTemplatedEmail.go +++ b/service/ses/api_op_SendTemplatedEmail.go @@ -189,6 +189,9 @@ func addOperationSendTemplatedEmailMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -231,6 +234,9 @@ func addOperationSendTemplatedEmailMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetActiveReceiptRuleSet.go b/service/ses/api_op_SetActiveReceiptRuleSet.go index dcac7956138..754d06686c2 100644 --- a/service/ses/api_op_SetActiveReceiptRuleSet.go +++ b/service/ses/api_op_SetActiveReceiptRuleSet.go @@ -57,6 +57,9 @@ func addOperationSetActiveReceiptRuleSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationSetActiveReceiptRuleSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetIdentityDkimEnabled.go b/service/ses/api_op_SetIdentityDkimEnabled.go index 52f79f164f3..a934bf5765c 100644 --- a/service/ses/api_op_SetIdentityDkimEnabled.go +++ b/service/ses/api_op_SetIdentityDkimEnabled.go @@ -70,6 +70,9 @@ func addOperationSetIdentityDkimEnabledMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationSetIdentityDkimEnabledMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go b/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go index 8e1c11188cc..2d83aed38d3 100644 --- a/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go +++ b/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go @@ -72,6 +72,9 @@ func addOperationSetIdentityFeedbackForwardingEnabledMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSetIdentityFeedbackForwardingEnabledMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go b/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go index a3319c4ed6c..b42fbc98823 100644 --- a/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go +++ b/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go @@ -75,6 +75,9 @@ func addOperationSetIdentityHeadersInNotificationsEnabledMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationSetIdentityHeadersInNotificationsEnabledMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetIdentityMailFromDomain.go b/service/ses/api_op_SetIdentityMailFromDomain.go index 68babc48b11..d37402506fa 100644 --- a/service/ses/api_op_SetIdentityMailFromDomain.go +++ b/service/ses/api_op_SetIdentityMailFromDomain.go @@ -80,6 +80,9 @@ func addOperationSetIdentityMailFromDomainMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationSetIdentityMailFromDomainMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetIdentityNotificationTopic.go b/service/ses/api_op_SetIdentityNotificationTopic.go index 704ac11cf6e..f04e4069680 100644 --- a/service/ses/api_op_SetIdentityNotificationTopic.go +++ b/service/ses/api_op_SetIdentityNotificationTopic.go @@ -78,6 +78,9 @@ func addOperationSetIdentityNotificationTopicMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationSetIdentityNotificationTopicMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_SetReceiptRulePosition.go b/service/ses/api_op_SetReceiptRulePosition.go index 78d241b34ef..0f706ff7a7a 100644 --- a/service/ses/api_op_SetReceiptRulePosition.go +++ b/service/ses/api_op_SetReceiptRulePosition.go @@ -64,6 +64,9 @@ func addOperationSetReceiptRulePositionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationSetReceiptRulePositionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_TestRenderTemplate.go b/service/ses/api_op_TestRenderTemplate.go index c18731e4735..3c30c0095e2 100644 --- a/service/ses/api_op_TestRenderTemplate.go +++ b/service/ses/api_op_TestRenderTemplate.go @@ -62,6 +62,9 @@ func addOperationTestRenderTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationTestRenderTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateAccountSendingEnabled.go b/service/ses/api_op_UpdateAccountSendingEnabled.go index 096132cdc29..9000bab5047 100644 --- a/service/ses/api_op_UpdateAccountSendingEnabled.go +++ b/service/ses/api_op_UpdateAccountSendingEnabled.go @@ -54,6 +54,9 @@ func addOperationUpdateAccountSendingEnabledMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateAccountSendingEnabledMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateConfigurationSetEventDestination.go b/service/ses/api_op_UpdateConfigurationSetEventDestination.go index daf2bb4255b..3b983ebe6de 100644 --- a/service/ses/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/ses/api_op_UpdateConfigurationSetEventDestination.go @@ -71,6 +71,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go b/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go index 42dbe79f635..b66417c1fc4 100644 --- a/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go +++ b/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go @@ -60,6 +60,9 @@ func addOperationUpdateConfigurationSetReputationMetricsEnabledMiddlewares(stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateConfigurationSetReputationMetricsEnabledMiddlewares(stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go b/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go index 7503185b3da..87c561c6d83 100644 --- a/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go +++ b/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go @@ -61,6 +61,9 @@ func addOperationUpdateConfigurationSetSendingEnabledMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateConfigurationSetSendingEnabledMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go b/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go index d57270a7357..560e8034aeb 100644 --- a/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go +++ b/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go @@ -67,6 +67,9 @@ func addOperationUpdateConfigurationSetTrackingOptionsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateConfigurationSetTrackingOptionsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go b/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go index c9e1dd3c29e..8ebb87648f1 100644 --- a/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go @@ -75,6 +75,9 @@ func addOperationUpdateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateReceiptRule.go b/service/ses/api_op_UpdateReceiptRule.go index 73d57d1602c..8711e26abb9 100644 --- a/service/ses/api_op_UpdateReceiptRule.go +++ b/service/ses/api_op_UpdateReceiptRule.go @@ -61,6 +61,9 @@ func addOperationUpdateReceiptRuleMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdateReceiptRuleMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_UpdateTemplate.go b/service/ses/api_op_UpdateTemplate.go index 5cce4a8c39f..e24cdd88f1e 100644 --- a/service/ses/api_op_UpdateTemplate.go +++ b/service/ses/api_op_UpdateTemplate.go @@ -54,6 +54,9 @@ func addOperationUpdateTemplateMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUpdateTemplateMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_VerifyDomainDkim.go b/service/ses/api_op_VerifyDomainDkim.go index cab58e003d4..4cb2031b28e 100644 --- a/service/ses/api_op_VerifyDomainDkim.go +++ b/service/ses/api_op_VerifyDomainDkim.go @@ -98,6 +98,9 @@ func addOperationVerifyDomainDkimMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationVerifyDomainDkimMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_VerifyDomainIdentity.go b/service/ses/api_op_VerifyDomainIdentity.go index c26bb317684..965a87174d0 100644 --- a/service/ses/api_op_VerifyDomainIdentity.go +++ b/service/ses/api_op_VerifyDomainIdentity.go @@ -72,6 +72,9 @@ func addOperationVerifyDomainIdentityMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationVerifyDomainIdentityMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_VerifyEmailAddress.go b/service/ses/api_op_VerifyEmailAddress.go index 57ca3be1602..eee551fd15c 100644 --- a/service/ses/api_op_VerifyEmailAddress.go +++ b/service/ses/api_op_VerifyEmailAddress.go @@ -51,6 +51,9 @@ func addOperationVerifyEmailAddressMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationVerifyEmailAddressMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/api_op_VerifyEmailIdentity.go b/service/ses/api_op_VerifyEmailIdentity.go index 15f0afaea5c..131b7a9d42d 100644 --- a/service/ses/api_op_VerifyEmailIdentity.go +++ b/service/ses/api_op_VerifyEmailIdentity.go @@ -55,6 +55,9 @@ func addOperationVerifyEmailIdentityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationVerifyEmailIdentityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ses/go.mod b/service/ses/go.mod index 57bec48ecec..33d7b2f38b2 100644 --- a/service/ses/go.mod +++ b/service/ses/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ses go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ses/go.sum b/service/ses/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ses/go.sum +++ b/service/ses/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sesv2/api_client.go b/service/sesv2/api_client.go index 8ff0e767ca4..9b69b6d94ad 100644 --- a/service/sesv2/api_client.go +++ b/service/sesv2/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sesv2/api_op_CreateConfigurationSet.go b/service/sesv2/api_op_CreateConfigurationSet.go index df3ed58b1f8..6745ae15be9 100644 --- a/service/sesv2/api_op_CreateConfigurationSet.go +++ b/service/sesv2/api_op_CreateConfigurationSet.go @@ -80,6 +80,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCreateConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateConfigurationSetEventDestination.go b/service/sesv2/api_op_CreateConfigurationSetEventDestination.go index 83463c20272..4f3906f15da 100644 --- a/service/sesv2/api_op_CreateConfigurationSetEventDestination.go +++ b/service/sesv2/api_op_CreateConfigurationSetEventDestination.go @@ -68,6 +68,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationCreateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateContact.go b/service/sesv2/api_op_CreateContact.go index 92194fdfb3f..8a0c131d59f 100644 --- a/service/sesv2/api_op_CreateContact.go +++ b/service/sesv2/api_op_CreateContact.go @@ -65,6 +65,9 @@ func addOperationCreateContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationCreateContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateContactList.go b/service/sesv2/api_op_CreateContactList.go index 56f6b4a9a36..8e4774b98cc 100644 --- a/service/sesv2/api_op_CreateContactList.go +++ b/service/sesv2/api_op_CreateContactList.go @@ -59,6 +59,9 @@ func addOperationCreateContactListMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationCreateContactListMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go b/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go index ac807569ce7..99843bbee6f 100644 --- a/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go @@ -87,6 +87,9 @@ func addOperationCreateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateDedicatedIpPool.go b/service/sesv2/api_op_CreateDedicatedIpPool.go index e3b94b74d0a..84b148812cd 100644 --- a/service/sesv2/api_op_CreateDedicatedIpPool.go +++ b/service/sesv2/api_op_CreateDedicatedIpPool.go @@ -60,6 +60,9 @@ func addOperationCreateDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateDeliverabilityTestReport.go b/service/sesv2/api_op_CreateDeliverabilityTestReport.go index 7506e7f68f7..2d148e9aed6 100644 --- a/service/sesv2/api_op_CreateDeliverabilityTestReport.go +++ b/service/sesv2/api_op_CreateDeliverabilityTestReport.go @@ -94,6 +94,9 @@ func addOperationCreateDeliverabilityTestReportMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateDeliverabilityTestReportMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateEmailIdentity.go b/service/sesv2/api_op_CreateEmailIdentity.go index fd2ef7333f5..653eeb645e7 100644 --- a/service/sesv2/api_op_CreateEmailIdentity.go +++ b/service/sesv2/api_op_CreateEmailIdentity.go @@ -97,6 +97,9 @@ func addOperationCreateEmailIdentityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateEmailIdentityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateEmailIdentityPolicy.go b/service/sesv2/api_op_CreateEmailIdentityPolicy.go index e8addd76519..6350478b3ff 100644 --- a/service/sesv2/api_op_CreateEmailIdentityPolicy.go +++ b/service/sesv2/api_op_CreateEmailIdentityPolicy.go @@ -76,6 +76,9 @@ func addOperationCreateEmailIdentityPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationCreateEmailIdentityPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateEmailTemplate.go b/service/sesv2/api_op_CreateEmailTemplate.go index f204f4ebeb6..adce386ea6b 100644 --- a/service/sesv2/api_op_CreateEmailTemplate.go +++ b/service/sesv2/api_op_CreateEmailTemplate.go @@ -64,6 +64,9 @@ func addOperationCreateEmailTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateEmailTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_CreateImportJob.go b/service/sesv2/api_op_CreateImportJob.go index 91f6ac57177..53cf38f3ee8 100644 --- a/service/sesv2/api_op_CreateImportJob.go +++ b/service/sesv2/api_op_CreateImportJob.go @@ -62,6 +62,9 @@ func addOperationCreateImportJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateImportJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteConfigurationSet.go b/service/sesv2/api_op_DeleteConfigurationSet.go index f3114065ede..bc02c7c185a 100644 --- a/service/sesv2/api_op_DeleteConfigurationSet.go +++ b/service/sesv2/api_op_DeleteConfigurationSet.go @@ -55,6 +55,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteConfigurationSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go b/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go index 81b3987fd9d..b05da13de0b 100644 --- a/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go @@ -62,6 +62,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteContact.go b/service/sesv2/api_op_DeleteContact.go index 884cbdf8481..e7d04aa597f 100644 --- a/service/sesv2/api_op_DeleteContact.go +++ b/service/sesv2/api_op_DeleteContact.go @@ -53,6 +53,9 @@ func addOperationDeleteContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteContactList.go b/service/sesv2/api_op_DeleteContactList.go index 91e5f1c4242..5811597902a 100644 --- a/service/sesv2/api_op_DeleteContactList.go +++ b/service/sesv2/api_op_DeleteContactList.go @@ -48,6 +48,9 @@ func addOperationDeleteContactListMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteContactListMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go b/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go index cf98847c4d1..006712cd825 100644 --- a/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go @@ -56,6 +56,9 @@ func addOperationDeleteCustomVerificationEmailTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteCustomVerificationEmailTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteDedicatedIpPool.go b/service/sesv2/api_op_DeleteDedicatedIpPool.go index 98b95ea6954..a5e09fb53f2 100644 --- a/service/sesv2/api_op_DeleteDedicatedIpPool.go +++ b/service/sesv2/api_op_DeleteDedicatedIpPool.go @@ -51,6 +51,9 @@ func addOperationDeleteDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDedicatedIpPoolMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteEmailIdentity.go b/service/sesv2/api_op_DeleteEmailIdentity.go index 14676bad01d..4cdd3e27335 100644 --- a/service/sesv2/api_op_DeleteEmailIdentity.go +++ b/service/sesv2/api_op_DeleteEmailIdentity.go @@ -54,6 +54,9 @@ func addOperationDeleteEmailIdentityMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteEmailIdentityMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteEmailIdentityPolicy.go b/service/sesv2/api_op_DeleteEmailIdentityPolicy.go index fb991cb9dce..117f9e4d185 100644 --- a/service/sesv2/api_op_DeleteEmailIdentityPolicy.go +++ b/service/sesv2/api_op_DeleteEmailIdentityPolicy.go @@ -69,6 +69,9 @@ func addOperationDeleteEmailIdentityPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteEmailIdentityPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteEmailTemplate.go b/service/sesv2/api_op_DeleteEmailTemplate.go index 5dc627f7935..c45dd4c4c07 100644 --- a/service/sesv2/api_op_DeleteEmailTemplate.go +++ b/service/sesv2/api_op_DeleteEmailTemplate.go @@ -54,6 +54,9 @@ func addOperationDeleteEmailTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteEmailTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_DeleteSuppressedDestination.go b/service/sesv2/api_op_DeleteSuppressedDestination.go index 364825fbdc8..4d1b5b60e38 100644 --- a/service/sesv2/api_op_DeleteSuppressedDestination.go +++ b/service/sesv2/api_op_DeleteSuppressedDestination.go @@ -51,6 +51,9 @@ func addOperationDeleteSuppressedDestinationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteSuppressedDestinationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetAccount.go b/service/sesv2/api_op_GetAccount.go index 118e590d77e..190b65f4fdc 100644 --- a/service/sesv2/api_op_GetAccount.go +++ b/service/sesv2/api_op_GetAccount.go @@ -96,6 +96,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationGetAccountMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetBlacklistReports.go b/service/sesv2/api_op_GetBlacklistReports.go index 9af711b4b64..3bca4a4232f 100644 --- a/service/sesv2/api_op_GetBlacklistReports.go +++ b/service/sesv2/api_op_GetBlacklistReports.go @@ -61,6 +61,9 @@ func addOperationGetBlacklistReportsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetBlacklistReportsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetConfigurationSet.go b/service/sesv2/api_op_GetConfigurationSet.go index baed02b9429..3c450df6205 100644 --- a/service/sesv2/api_op_GetConfigurationSet.go +++ b/service/sesv2/api_op_GetConfigurationSet.go @@ -86,6 +86,9 @@ func addOperationGetConfigurationSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationGetConfigurationSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetConfigurationSetEventDestinations.go b/service/sesv2/api_op_GetConfigurationSetEventDestinations.go index e84de1be7d7..7eebc705042 100644 --- a/service/sesv2/api_op_GetConfigurationSetEventDestinations.go +++ b/service/sesv2/api_op_GetConfigurationSetEventDestinations.go @@ -62,6 +62,9 @@ func addOperationGetConfigurationSetEventDestinationsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetConfigurationSetEventDestinationsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetContact.go b/service/sesv2/api_op_GetContact.go index 8d581b85d15..8cf37d543f1 100644 --- a/service/sesv2/api_op_GetContact.go +++ b/service/sesv2/api_op_GetContact.go @@ -81,6 +81,9 @@ func addOperationGetContactMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationGetContactMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetContactList.go b/service/sesv2/api_op_GetContactList.go index 6c11600fa00..77ad690d33f 100644 --- a/service/sesv2/api_op_GetContactList.go +++ b/service/sesv2/api_op_GetContactList.go @@ -71,6 +71,9 @@ func addOperationGetContactListMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetContactListMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go b/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go index 24f2ef9836e..0fc5621aa5a 100644 --- a/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go @@ -76,6 +76,9 @@ func addOperationGetCustomVerificationEmailTemplateMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetCustomVerificationEmailTemplateMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetDedicatedIp.go b/service/sesv2/api_op_GetDedicatedIp.go index bd8e6de7b44..64b01a90337 100644 --- a/service/sesv2/api_op_GetDedicatedIp.go +++ b/service/sesv2/api_op_GetDedicatedIp.go @@ -59,6 +59,9 @@ func addOperationGetDedicatedIpMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetDedicatedIpMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetDedicatedIps.go b/service/sesv2/api_op_GetDedicatedIps.go index 380453f79d8..b8edf08946e 100644 --- a/service/sesv2/api_op_GetDedicatedIps.go +++ b/service/sesv2/api_op_GetDedicatedIps.go @@ -69,6 +69,9 @@ func addOperationGetDedicatedIpsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetDedicatedIpsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go b/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go index f716f9bbd16..2bff7917dc6 100644 --- a/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go +++ b/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go @@ -92,6 +92,9 @@ func addOperationGetDeliverabilityDashboardOptionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetDeliverabilityDashboardOptionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetDeliverabilityTestReport.go b/service/sesv2/api_op_GetDeliverabilityTestReport.go index 1d5e1ab206d..4045016e9b2 100644 --- a/service/sesv2/api_op_GetDeliverabilityTestReport.go +++ b/service/sesv2/api_op_GetDeliverabilityTestReport.go @@ -78,6 +78,9 @@ func addOperationGetDeliverabilityTestReportMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationGetDeliverabilityTestReportMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go b/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go index ecacef1e9fc..ab75443c964 100644 --- a/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go +++ b/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go @@ -65,6 +65,9 @@ func addOperationGetDomainDeliverabilityCampaignMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetDomainDeliverabilityCampaignMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetDomainStatisticsReport.go b/service/sesv2/api_op_GetDomainStatisticsReport.go index 33733680f54..bb577921b0e 100644 --- a/service/sesv2/api_op_GetDomainStatisticsReport.go +++ b/service/sesv2/api_op_GetDomainStatisticsReport.go @@ -82,6 +82,9 @@ func addOperationGetDomainStatisticsReportMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationGetDomainStatisticsReportMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetEmailIdentity.go b/service/sesv2/api_op_GetEmailIdentity.go index 6fb2897c538..f7c9ec8e422 100644 --- a/service/sesv2/api_op_GetEmailIdentity.go +++ b/service/sesv2/api_op_GetEmailIdentity.go @@ -87,6 +87,9 @@ func addOperationGetEmailIdentityMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationGetEmailIdentityMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetEmailIdentityPolicies.go b/service/sesv2/api_op_GetEmailIdentityPolicies.go index 798b036b8ac..0002781be2f 100644 --- a/service/sesv2/api_op_GetEmailIdentityPolicies.go +++ b/service/sesv2/api_op_GetEmailIdentityPolicies.go @@ -62,6 +62,9 @@ func addOperationGetEmailIdentityPoliciesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetEmailIdentityPoliciesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetEmailTemplate.go b/service/sesv2/api_op_GetEmailTemplate.go index 4060f684b27..3a147bdbb1a 100644 --- a/service/sesv2/api_op_GetEmailTemplate.go +++ b/service/sesv2/api_op_GetEmailTemplate.go @@ -66,6 +66,9 @@ func addOperationGetEmailTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetEmailTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetImportJob.go b/service/sesv2/api_op_GetImportJob.go index 3e32e4ae503..a4c7064fc5e 100644 --- a/service/sesv2/api_op_GetImportJob.go +++ b/service/sesv2/api_op_GetImportJob.go @@ -83,6 +83,9 @@ func addOperationGetImportJobMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetImportJobMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_GetSuppressedDestination.go b/service/sesv2/api_op_GetSuppressedDestination.go index a50135a9271..5b6105a11c7 100644 --- a/service/sesv2/api_op_GetSuppressedDestination.go +++ b/service/sesv2/api_op_GetSuppressedDestination.go @@ -59,6 +59,9 @@ func addOperationGetSuppressedDestinationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetSuppressedDestinationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListConfigurationSets.go b/service/sesv2/api_op_ListConfigurationSets.go index dee88537c5d..56f9a46ec0c 100644 --- a/service/sesv2/api_op_ListConfigurationSets.go +++ b/service/sesv2/api_op_ListConfigurationSets.go @@ -72,6 +72,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListConfigurationSetsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListContactLists.go b/service/sesv2/api_op_ListContactLists.go index 0744130cead..71793cfb66f 100644 --- a/service/sesv2/api_op_ListContactLists.go +++ b/service/sesv2/api_op_ListContactLists.go @@ -65,6 +65,9 @@ func addOperationListContactListsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListContactListsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListContacts.go b/service/sesv2/api_op_ListContacts.go index 7294dc3a6b8..c8c05745802 100644 --- a/service/sesv2/api_op_ListContacts.go +++ b/service/sesv2/api_op_ListContacts.go @@ -73,6 +73,9 @@ func addOperationListContactsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListContactsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go b/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go index 81e88b15306..d09f6847a35 100644 --- a/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go +++ b/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go @@ -73,6 +73,9 @@ func addOperationListCustomVerificationEmailTemplatesMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListCustomVerificationEmailTemplatesMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListDedicatedIpPools.go b/service/sesv2/api_op_ListDedicatedIpPools.go index 030f52a6981..131e84eec3b 100644 --- a/service/sesv2/api_op_ListDedicatedIpPools.go +++ b/service/sesv2/api_op_ListDedicatedIpPools.go @@ -66,6 +66,9 @@ func addOperationListDedicatedIpPoolsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListDedicatedIpPoolsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListDeliverabilityTestReports.go b/service/sesv2/api_op_ListDeliverabilityTestReports.go index e9cfbdd9931..700b92d7b40 100644 --- a/service/sesv2/api_op_ListDeliverabilityTestReports.go +++ b/service/sesv2/api_op_ListDeliverabilityTestReports.go @@ -75,6 +75,9 @@ func addOperationListDeliverabilityTestReportsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListDeliverabilityTestReportsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go b/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go index 272ee2bad20..2e4cd2280f6 100644 --- a/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go +++ b/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go @@ -95,6 +95,9 @@ func addOperationListDomainDeliverabilityCampaignsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationListDomainDeliverabilityCampaignsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListEmailIdentities.go b/service/sesv2/api_op_ListEmailIdentities.go index 67a722683f8..b69e38f582b 100644 --- a/service/sesv2/api_op_ListEmailIdentities.go +++ b/service/sesv2/api_op_ListEmailIdentities.go @@ -75,6 +75,9 @@ func addOperationListEmailIdentitiesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListEmailIdentitiesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListEmailTemplates.go b/service/sesv2/api_op_ListEmailTemplates.go index 3246ef97485..b14663af187 100644 --- a/service/sesv2/api_op_ListEmailTemplates.go +++ b/service/sesv2/api_op_ListEmailTemplates.go @@ -71,6 +71,9 @@ func addOperationListEmailTemplatesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListEmailTemplatesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListImportJobs.go b/service/sesv2/api_op_ListImportJobs.go index 972812aca16..4dccbf80c15 100644 --- a/service/sesv2/api_op_ListImportJobs.go +++ b/service/sesv2/api_op_ListImportJobs.go @@ -72,6 +72,9 @@ func addOperationListImportJobsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListImportJobsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListSuppressedDestinations.go b/service/sesv2/api_op_ListSuppressedDestinations.go index 26b54ebfdad..9c4173d08c5 100644 --- a/service/sesv2/api_op_ListSuppressedDestinations.go +++ b/service/sesv2/api_op_ListSuppressedDestinations.go @@ -83,6 +83,9 @@ func addOperationListSuppressedDestinationsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListSuppressedDestinationsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_ListTagsForResource.go b/service/sesv2/api_op_ListTagsForResource.go index 2f8f4e65442..acac01bbb38 100644 --- a/service/sesv2/api_op_ListTagsForResource.go +++ b/service/sesv2/api_op_ListTagsForResource.go @@ -61,6 +61,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go b/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go index b00118be892..8eaa1a3b79a 100644 --- a/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go +++ b/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go @@ -51,6 +51,9 @@ func addOperationPutAccountDedicatedIpWarmupAttributesMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationPutAccountDedicatedIpWarmupAttributesMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutAccountDetails.go b/service/sesv2/api_op_PutAccountDetails.go index a947c73a8ff..763ad088ca2 100644 --- a/service/sesv2/api_op_PutAccountDetails.go +++ b/service/sesv2/api_op_PutAccountDetails.go @@ -81,6 +81,9 @@ func addOperationPutAccountDetailsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationPutAccountDetailsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutAccountSendingAttributes.go b/service/sesv2/api_op_PutAccountSendingAttributes.go index 355d2b2e0fe..9509b02faa7 100644 --- a/service/sesv2/api_op_PutAccountSendingAttributes.go +++ b/service/sesv2/api_op_PutAccountSendingAttributes.go @@ -52,6 +52,9 @@ func addOperationPutAccountSendingAttributesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationPutAccountSendingAttributesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutAccountSuppressionAttributes.go b/service/sesv2/api_op_PutAccountSuppressionAttributes.go index 84ccab6652c..0124a128910 100644 --- a/service/sesv2/api_op_PutAccountSuppressionAttributes.go +++ b/service/sesv2/api_op_PutAccountSuppressionAttributes.go @@ -60,6 +60,9 @@ func addOperationPutAccountSuppressionAttributesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutAccountSuppressionAttributesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go b/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go index 526cd5fd854..9c8a02afcab 100644 --- a/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go @@ -66,6 +66,9 @@ func addOperationPutConfigurationSetDeliveryOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationPutConfigurationSetDeliveryOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutConfigurationSetReputationOptions.go b/service/sesv2/api_op_PutConfigurationSetReputationOptions.go index f9ce2287129..61bcee2015d 100644 --- a/service/sesv2/api_op_PutConfigurationSetReputationOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetReputationOptions.go @@ -58,6 +58,9 @@ func addOperationPutConfigurationSetReputationOptionsMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutConfigurationSetReputationOptionsMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutConfigurationSetSendingOptions.go b/service/sesv2/api_op_PutConfigurationSetSendingOptions.go index 385a787e40a..f7ee368eaec 100644 --- a/service/sesv2/api_op_PutConfigurationSetSendingOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetSendingOptions.go @@ -58,6 +58,9 @@ func addOperationPutConfigurationSetSendingOptionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutConfigurationSetSendingOptionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go b/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go index 1c4c34de2c6..338dc8a4e33 100644 --- a/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go @@ -66,6 +66,9 @@ func addOperationPutConfigurationSetSuppressionOptionsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationPutConfigurationSetSuppressionOptionsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go b/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go index ad636461ab4..7fc4548c71e 100644 --- a/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go @@ -57,6 +57,9 @@ func addOperationPutConfigurationSetTrackingOptionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutConfigurationSetTrackingOptionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutDedicatedIpInPool.go b/service/sesv2/api_op_PutDedicatedIpInPool.go index 6b61a764e04..a05a87865ce 100644 --- a/service/sesv2/api_op_PutDedicatedIpInPool.go +++ b/service/sesv2/api_op_PutDedicatedIpInPool.go @@ -62,6 +62,9 @@ func addOperationPutDedicatedIpInPoolMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationPutDedicatedIpInPoolMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go b/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go index a762dc927e9..af8261dc2f9 100644 --- a/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go +++ b/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go @@ -58,6 +58,9 @@ func addOperationPutDedicatedIpWarmupAttributesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutDedicatedIpWarmupAttributesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutDeliverabilityDashboardOption.go b/service/sesv2/api_op_PutDeliverabilityDashboardOption.go index 8a9c2d95664..f3b00c745d3 100644 --- a/service/sesv2/api_op_PutDeliverabilityDashboardOption.go +++ b/service/sesv2/api_op_PutDeliverabilityDashboardOption.go @@ -71,6 +71,9 @@ func addOperationPutDeliverabilityDashboardOptionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationPutDeliverabilityDashboardOptionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go b/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go index 05b5341907c..70af549dd13 100644 --- a/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go @@ -57,6 +57,9 @@ func addOperationPutEmailIdentityDkimAttributesMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationPutEmailIdentityDkimAttributesMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go b/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go index 05bb590bd53..e3f8c224402 100644 --- a/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go @@ -129,6 +129,9 @@ func addOperationPutEmailIdentityDkimSigningAttributesMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationPutEmailIdentityDkimSigningAttributesMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go b/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go index 0aabb454a67..3ad52ebc8f7 100644 --- a/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go @@ -71,6 +71,9 @@ func addOperationPutEmailIdentityFeedbackAttributesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationPutEmailIdentityFeedbackAttributesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go b/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go index 1255e06e39b..ad8bbe0e1b9 100644 --- a/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go @@ -76,6 +76,9 @@ func addOperationPutEmailIdentityMailFromAttributesMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationPutEmailIdentityMailFromAttributesMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_PutSuppressedDestination.go b/service/sesv2/api_op_PutSuppressedDestination.go index e912097baf8..ac324218e26 100644 --- a/service/sesv2/api_op_PutSuppressedDestination.go +++ b/service/sesv2/api_op_PutSuppressedDestination.go @@ -58,6 +58,9 @@ func addOperationPutSuppressedDestinationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutSuppressedDestinationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_SendBulkEmail.go b/service/sesv2/api_op_SendBulkEmail.go index b2118dd2e67..5028458d513 100644 --- a/service/sesv2/api_op_SendBulkEmail.go +++ b/service/sesv2/api_op_SendBulkEmail.go @@ -110,6 +110,9 @@ func addOperationSendBulkEmailMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationSendBulkEmailMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_SendCustomVerificationEmail.go b/service/sesv2/api_op_SendCustomVerificationEmail.go index 58c6d3c0e29..7ff7003bd5a 100644 --- a/service/sesv2/api_op_SendCustomVerificationEmail.go +++ b/service/sesv2/api_op_SendCustomVerificationEmail.go @@ -73,6 +73,9 @@ func addOperationSendCustomVerificationEmailMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationSendCustomVerificationEmailMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_SendEmail.go b/service/sesv2/api_op_SendEmail.go index a51de6e7b0a..3f681083632 100644 --- a/service/sesv2/api_op_SendEmail.go +++ b/service/sesv2/api_op_SendEmail.go @@ -132,6 +132,9 @@ func addOperationSendEmailMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -174,6 +177,9 @@ func addOperationSendEmailMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_TagResource.go b/service/sesv2/api_op_TagResource.go index 25a78cebf53..e96afb4f727 100644 --- a/service/sesv2/api_op_TagResource.go +++ b/service/sesv2/api_op_TagResource.go @@ -64,6 +64,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_TestRenderEmailTemplate.go b/service/sesv2/api_op_TestRenderEmailTemplate.go index f60f21e360d..12b2aed795c 100644 --- a/service/sesv2/api_op_TestRenderEmailTemplate.go +++ b/service/sesv2/api_op_TestRenderEmailTemplate.go @@ -67,6 +67,9 @@ func addOperationTestRenderEmailTemplateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationTestRenderEmailTemplateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UntagResource.go b/service/sesv2/api_op_UntagResource.go index 35d9ba5001a..68651cedcf7 100644 --- a/service/sesv2/api_op_UntagResource.go +++ b/service/sesv2/api_op_UntagResource.go @@ -58,6 +58,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go b/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go index 8a94d82eaec..aa6bc13b036 100644 --- a/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go @@ -69,6 +69,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateConfigurationSetEventDestinationMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UpdateContact.go b/service/sesv2/api_op_UpdateContact.go index 7011b3f908f..f936b5418da 100644 --- a/service/sesv2/api_op_UpdateContact.go +++ b/service/sesv2/api_op_UpdateContact.go @@ -66,6 +66,9 @@ func addOperationUpdateContactMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdateContactMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UpdateContactList.go b/service/sesv2/api_op_UpdateContactList.go index c1959777799..67d5660a32e 100644 --- a/service/sesv2/api_op_UpdateContactList.go +++ b/service/sesv2/api_op_UpdateContactList.go @@ -56,6 +56,9 @@ func addOperationUpdateContactListMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateContactListMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go b/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go index d4351279d2a..20599d313c3 100644 --- a/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go @@ -87,6 +87,9 @@ func addOperationUpdateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationUpdateCustomVerificationEmailTemplateMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UpdateEmailIdentityPolicy.go b/service/sesv2/api_op_UpdateEmailIdentityPolicy.go index ef50d4eb0d4..b321c793bb4 100644 --- a/service/sesv2/api_op_UpdateEmailIdentityPolicy.go +++ b/service/sesv2/api_op_UpdateEmailIdentityPolicy.go @@ -77,6 +77,9 @@ func addOperationUpdateEmailIdentityPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationUpdateEmailIdentityPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/api_op_UpdateEmailTemplate.go b/service/sesv2/api_op_UpdateEmailTemplate.go index 40379fe4abf..c57af4e05aa 100644 --- a/service/sesv2/api_op_UpdateEmailTemplate.go +++ b/service/sesv2/api_op_UpdateEmailTemplate.go @@ -64,6 +64,9 @@ func addOperationUpdateEmailTemplateMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateEmailTemplateMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sesv2/go.mod b/service/sesv2/go.mod index 754f3ef0ac6..28f0c2d7a24 100644 --- a/service/sesv2/go.mod +++ b/service/sesv2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sesv2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sesv2/go.sum b/service/sesv2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sesv2/go.sum +++ b/service/sesv2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sfn/api_client.go b/service/sfn/api_client.go index 3da1d117328..4aa0379716d 100644 --- a/service/sfn/api_client.go +++ b/service/sfn/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sfn/api_op_CreateActivity.go b/service/sfn/api_op_CreateActivity.go index adf5031718b..82c2e51dc2e 100644 --- a/service/sfn/api_op_CreateActivity.go +++ b/service/sfn/api_op_CreateActivity.go @@ -103,6 +103,9 @@ func addOperationCreateActivityMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationCreateActivityMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_CreateStateMachine.go b/service/sfn/api_op_CreateStateMachine.go index 6bf069026a9..4567fcef20d 100644 --- a/service/sfn/api_op_CreateStateMachine.go +++ b/service/sfn/api_op_CreateStateMachine.go @@ -127,6 +127,9 @@ func addOperationCreateStateMachineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -169,6 +172,9 @@ func addOperationCreateStateMachineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_DeleteActivity.go b/service/sfn/api_op_DeleteActivity.go index 2d2fe9b1998..5767a5388ef 100644 --- a/service/sfn/api_op_DeleteActivity.go +++ b/service/sfn/api_op_DeleteActivity.go @@ -48,6 +48,9 @@ func addOperationDeleteActivityMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteActivityMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_DeleteStateMachine.go b/service/sfn/api_op_DeleteStateMachine.go index c6bfeefc1be..f2d5f9ea59d 100644 --- a/service/sfn/api_op_DeleteStateMachine.go +++ b/service/sfn/api_op_DeleteStateMachine.go @@ -51,6 +51,9 @@ func addOperationDeleteStateMachineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteStateMachineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_DescribeActivity.go b/service/sfn/api_op_DescribeActivity.go index 20c6d731ad9..71dcbc203ed 100644 --- a/service/sfn/api_op_DescribeActivity.go +++ b/service/sfn/api_op_DescribeActivity.go @@ -81,6 +81,9 @@ func addOperationDescribeActivityMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeActivityMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_DescribeExecution.go b/service/sfn/api_op_DescribeExecution.go index e09afddc25b..df45a92fe70 100644 --- a/service/sfn/api_op_DescribeExecution.go +++ b/service/sfn/api_op_DescribeExecution.go @@ -113,6 +113,9 @@ func addOperationDescribeExecutionMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationDescribeExecutionMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_DescribeStateMachine.go b/service/sfn/api_op_DescribeStateMachine.go index d58bf770d5a..c9108540fca 100644 --- a/service/sfn/api_op_DescribeStateMachine.go +++ b/service/sfn/api_op_DescribeStateMachine.go @@ -111,6 +111,9 @@ func addOperationDescribeStateMachineMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationDescribeStateMachineMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_DescribeStateMachineForExecution.go b/service/sfn/api_op_DescribeStateMachineForExecution.go index e7b7bb4ef9f..050f94eb608 100644 --- a/service/sfn/api_op_DescribeStateMachineForExecution.go +++ b/service/sfn/api_op_DescribeStateMachineForExecution.go @@ -91,6 +91,9 @@ func addOperationDescribeStateMachineForExecutionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationDescribeStateMachineForExecutionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_GetActivityTask.go b/service/sfn/api_op_GetActivityTask.go index 0a20b479cad..7131dc66c60 100644 --- a/service/sfn/api_op_GetActivityTask.go +++ b/service/sfn/api_op_GetActivityTask.go @@ -74,6 +74,9 @@ func addOperationGetActivityTaskMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationGetActivityTaskMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_GetExecutionHistory.go b/service/sfn/api_op_GetExecutionHistory.go index 0e205f1cddb..1d78093d43f 100644 --- a/service/sfn/api_op_GetExecutionHistory.go +++ b/service/sfn/api_op_GetExecutionHistory.go @@ -91,6 +91,9 @@ func addOperationGetExecutionHistoryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationGetExecutionHistoryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_ListActivities.go b/service/sfn/api_op_ListActivities.go index 260266dc848..d1c317ac498 100644 --- a/service/sfn/api_op_ListActivities.go +++ b/service/sfn/api_op_ListActivities.go @@ -77,6 +77,9 @@ func addOperationListActivitiesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListActivitiesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_ListExecutions.go b/service/sfn/api_op_ListExecutions.go index e2789bfa36f..53f647e9ea7 100644 --- a/service/sfn/api_op_ListExecutions.go +++ b/service/sfn/api_op_ListExecutions.go @@ -88,6 +88,9 @@ func addOperationListExecutionsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationListExecutionsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_ListStateMachines.go b/service/sfn/api_op_ListStateMachines.go index 2ab99d53e64..9f60f78c97e 100644 --- a/service/sfn/api_op_ListStateMachines.go +++ b/service/sfn/api_op_ListStateMachines.go @@ -73,6 +73,9 @@ func addOperationListStateMachinesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListStateMachinesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_ListTagsForResource.go b/service/sfn/api_op_ListTagsForResource.go index e9ec41bdd20..7fe01af4232 100644 --- a/service/sfn/api_op_ListTagsForResource.go +++ b/service/sfn/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_SendTaskFailure.go b/service/sfn/api_op_SendTaskFailure.go index 05289175623..b61be65747d 100644 --- a/service/sfn/api_op_SendTaskFailure.go +++ b/service/sfn/api_op_SendTaskFailure.go @@ -59,6 +59,9 @@ func addOperationSendTaskFailureMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationSendTaskFailureMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_SendTaskHeartbeat.go b/service/sfn/api_op_SendTaskHeartbeat.go index 916ef052da0..4bcf43ba57c 100644 --- a/service/sfn/api_op_SendTaskHeartbeat.go +++ b/service/sfn/api_op_SendTaskHeartbeat.go @@ -66,6 +66,9 @@ func addOperationSendTaskHeartbeatMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationSendTaskHeartbeatMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_SendTaskSuccess.go b/service/sfn/api_op_SendTaskSuccess.go index 478e219755a..90c084b976d 100644 --- a/service/sfn/api_op_SendTaskSuccess.go +++ b/service/sfn/api_op_SendTaskSuccess.go @@ -60,6 +60,9 @@ func addOperationSendTaskSuccessMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationSendTaskSuccessMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_StartExecution.go b/service/sfn/api_op_StartExecution.go index 2403f497866..e77065b09d7 100644 --- a/service/sfn/api_op_StartExecution.go +++ b/service/sfn/api_op_StartExecution.go @@ -98,6 +98,9 @@ func addOperationStartExecutionMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationStartExecutionMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_StopExecution.go b/service/sfn/api_op_StopExecution.go index 2eb147565e4..fb42fbf6f6c 100644 --- a/service/sfn/api_op_StopExecution.go +++ b/service/sfn/api_op_StopExecution.go @@ -61,6 +61,9 @@ func addOperationStopExecutionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationStopExecutionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_TagResource.go b/service/sfn/api_op_TagResource.go index 058bdd96070..7512aec5d56 100644 --- a/service/sfn/api_op_TagResource.go +++ b/service/sfn/api_op_TagResource.go @@ -62,6 +62,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_UntagResource.go b/service/sfn/api_op_UntagResource.go index fd6231da668..a2d4b673261 100644 --- a/service/sfn/api_op_UntagResource.go +++ b/service/sfn/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/api_op_UpdateStateMachine.go b/service/sfn/api_op_UpdateStateMachine.go index 4f92bcacd36..cd00c1b1f54 100644 --- a/service/sfn/api_op_UpdateStateMachine.go +++ b/service/sfn/api_op_UpdateStateMachine.go @@ -76,6 +76,9 @@ func addOperationUpdateStateMachineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateStateMachineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sfn/go.mod b/service/sfn/go.mod index cbd85790352..78481091235 100644 --- a/service/sfn/go.mod +++ b/service/sfn/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sfn go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sfn/go.sum b/service/sfn/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sfn/go.sum +++ b/service/sfn/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/shield/api_client.go b/service/shield/api_client.go index 8c0a1feed57..efeae6c4af1 100644 --- a/service/shield/api_client.go +++ b/service/shield/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/shield/api_op_AssociateDRTLogBucket.go b/service/shield/api_op_AssociateDRTLogBucket.go index a56b137cd17..341b7ac016a 100644 --- a/service/shield/api_op_AssociateDRTLogBucket.go +++ b/service/shield/api_op_AssociateDRTLogBucket.go @@ -53,6 +53,9 @@ func addOperationAssociateDRTLogBucketMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateDRTLogBucketMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_AssociateDRTRole.go b/service/shield/api_op_AssociateDRTRole.go index 3b8a18c0182..42785450b97 100644 --- a/service/shield/api_op_AssociateDRTRole.go +++ b/service/shield/api_op_AssociateDRTRole.go @@ -80,6 +80,9 @@ func addOperationAssociateDRTRoleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationAssociateDRTRoleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_AssociateHealthCheck.go b/service/shield/api_op_AssociateHealthCheck.go index 94de5b498d3..1be302de6cd 100644 --- a/service/shield/api_op_AssociateHealthCheck.go +++ b/service/shield/api_op_AssociateHealthCheck.go @@ -63,6 +63,9 @@ func addOperationAssociateHealthCheckMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAssociateHealthCheckMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_AssociateProactiveEngagementDetails.go b/service/shield/api_op_AssociateProactiveEngagementDetails.go index 6c739b33a19..9f20959911b 100644 --- a/service/shield/api_op_AssociateProactiveEngagementDetails.go +++ b/service/shield/api_op_AssociateProactiveEngagementDetails.go @@ -65,6 +65,9 @@ func addOperationAssociateProactiveEngagementDetailsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAssociateProactiveEngagementDetailsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_CreateProtection.go b/service/shield/api_op_CreateProtection.go index 86894766d03..4734b86d9fe 100644 --- a/service/shield/api_op_CreateProtection.go +++ b/service/shield/api_op_CreateProtection.go @@ -88,6 +88,9 @@ func addOperationCreateProtectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateProtectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_CreateSubscription.go b/service/shield/api_op_CreateSubscription.go index 01f74472141..9725fa47231 100644 --- a/service/shield/api_op_CreateSubscription.go +++ b/service/shield/api_op_CreateSubscription.go @@ -46,6 +46,9 @@ func addOperationCreateSubscriptionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationCreateSubscriptionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DeleteProtection.go b/service/shield/api_op_DeleteProtection.go index edfe2eda2e0..8af4b43b9d6 100644 --- a/service/shield/api_op_DeleteProtection.go +++ b/service/shield/api_op_DeleteProtection.go @@ -48,6 +48,9 @@ func addOperationDeleteProtectionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteProtectionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DeleteSubscription.go b/service/shield/api_op_DeleteSubscription.go index 61bead3db73..596b4045f0d 100644 --- a/service/shield/api_op_DeleteSubscription.go +++ b/service/shield/api_op_DeleteSubscription.go @@ -45,6 +45,9 @@ func addOperationDeleteSubscriptionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationDeleteSubscriptionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DescribeAttack.go b/service/shield/api_op_DescribeAttack.go index 723ce6b3b0e..faca72b42b7 100644 --- a/service/shield/api_op_DescribeAttack.go +++ b/service/shield/api_op_DescribeAttack.go @@ -53,6 +53,9 @@ func addOperationDescribeAttackMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeAttackMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DescribeDRTAccess.go b/service/shield/api_op_DescribeDRTAccess.go index 5619a070365..b7b5cf0fdb9 100644 --- a/service/shield/api_op_DescribeDRTAccess.go +++ b/service/shield/api_op_DescribeDRTAccess.go @@ -53,6 +53,9 @@ func addOperationDescribeDRTAccessMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDescribeDRTAccessMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DescribeEmergencyContactSettings.go b/service/shield/api_op_DescribeEmergencyContactSettings.go index ede34990d30..6e630227490 100644 --- a/service/shield/api_op_DescribeEmergencyContactSettings.go +++ b/service/shield/api_op_DescribeEmergencyContactSettings.go @@ -52,6 +52,9 @@ func addOperationDescribeEmergencyContactSettingsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDescribeEmergencyContactSettingsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DescribeProtection.go b/service/shield/api_op_DescribeProtection.go index cf818effced..36bc3403bb4 100644 --- a/service/shield/api_op_DescribeProtection.go +++ b/service/shield/api_op_DescribeProtection.go @@ -58,6 +58,9 @@ func addOperationDescribeProtectionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeProtectionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DescribeSubscription.go b/service/shield/api_op_DescribeSubscription.go index e936cbb91a9..9e93f0560fb 100644 --- a/service/shield/api_op_DescribeSubscription.go +++ b/service/shield/api_op_DescribeSubscription.go @@ -48,6 +48,9 @@ func addOperationDescribeSubscriptionMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationDescribeSubscriptionMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DisableProactiveEngagement.go b/service/shield/api_op_DisableProactiveEngagement.go index c9be41eb114..a6091579e1d 100644 --- a/service/shield/api_op_DisableProactiveEngagement.go +++ b/service/shield/api_op_DisableProactiveEngagement.go @@ -44,6 +44,9 @@ func addOperationDisableProactiveEngagementMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -83,6 +86,9 @@ func addOperationDisableProactiveEngagementMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DisassociateDRTLogBucket.go b/service/shield/api_op_DisassociateDRTLogBucket.go index bf9eb19812f..80138605e76 100644 --- a/service/shield/api_op_DisassociateDRTLogBucket.go +++ b/service/shield/api_op_DisassociateDRTLogBucket.go @@ -55,6 +55,9 @@ func addOperationDisassociateDRTLogBucketMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisassociateDRTLogBucketMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DisassociateDRTRole.go b/service/shield/api_op_DisassociateDRTRole.go index 15113dcabf9..50c057ebdb8 100644 --- a/service/shield/api_op_DisassociateDRTRole.go +++ b/service/shield/api_op_DisassociateDRTRole.go @@ -49,6 +49,9 @@ func addOperationDisassociateDRTRoleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationDisassociateDRTRoleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_DisassociateHealthCheck.go b/service/shield/api_op_DisassociateHealthCheck.go index 95e661f18bc..b2cc97055cc 100644 --- a/service/shield/api_op_DisassociateHealthCheck.go +++ b/service/shield/api_op_DisassociateHealthCheck.go @@ -63,6 +63,9 @@ func addOperationDisassociateHealthCheckMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDisassociateHealthCheckMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_EnableProactiveEngagement.go b/service/shield/api_op_EnableProactiveEngagement.go index 1bf41bc478d..d07deba07a9 100644 --- a/service/shield/api_op_EnableProactiveEngagement.go +++ b/service/shield/api_op_EnableProactiveEngagement.go @@ -45,6 +45,9 @@ func addOperationEnableProactiveEngagementMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationEnableProactiveEngagementMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_GetSubscriptionState.go b/service/shield/api_op_GetSubscriptionState.go index fb40666c65a..83e70f1370d 100644 --- a/service/shield/api_op_GetSubscriptionState.go +++ b/service/shield/api_op_GetSubscriptionState.go @@ -50,6 +50,9 @@ func addOperationGetSubscriptionStateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationGetSubscriptionStateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_ListAttacks.go b/service/shield/api_op_ListAttacks.go index a9dc6cf8cf7..63234e2a852 100644 --- a/service/shield/api_op_ListAttacks.go +++ b/service/shield/api_op_ListAttacks.go @@ -87,6 +87,9 @@ func addOperationListAttacksMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListAttacksMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_ListProtections.go b/service/shield/api_op_ListProtections.go index c6057f207b8..b227a96e2d3 100644 --- a/service/shield/api_op_ListProtections.go +++ b/service/shield/api_op_ListProtections.go @@ -70,6 +70,9 @@ func addOperationListProtectionsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListProtectionsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_UpdateEmergencyContactSettings.go b/service/shield/api_op_UpdateEmergencyContactSettings.go index e579251526b..b5fa441af31 100644 --- a/service/shield/api_op_UpdateEmergencyContactSettings.go +++ b/service/shield/api_op_UpdateEmergencyContactSettings.go @@ -52,6 +52,9 @@ func addOperationUpdateEmergencyContactSettingsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUpdateEmergencyContactSettingsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/api_op_UpdateSubscription.go b/service/shield/api_op_UpdateSubscription.go index 051766425ed..85307a034ad 100644 --- a/service/shield/api_op_UpdateSubscription.go +++ b/service/shield/api_op_UpdateSubscription.go @@ -52,6 +52,9 @@ func addOperationUpdateSubscriptionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationUpdateSubscriptionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/shield/go.mod b/service/shield/go.mod index 80202fde8ea..0843ee69aa9 100644 --- a/service/shield/go.mod +++ b/service/shield/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/shield go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/shield/go.sum b/service/shield/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/shield/go.sum +++ b/service/shield/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/signer/api_client.go b/service/signer/api_client.go index 876cbf6d74b..028f4f3d24b 100644 --- a/service/signer/api_client.go +++ b/service/signer/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/signer/api_op_CancelSigningProfile.go b/service/signer/api_op_CancelSigningProfile.go index f588c2e8bfc..460583fbe80 100644 --- a/service/signer/api_op_CancelSigningProfile.go +++ b/service/signer/api_op_CancelSigningProfile.go @@ -50,6 +50,9 @@ func addOperationCancelSigningProfileMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationCancelSigningProfileMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_DescribeSigningJob.go b/service/signer/api_op_DescribeSigningJob.go index 28e9c16fcba..7a55763afab 100644 --- a/service/signer/api_op_DescribeSigningJob.go +++ b/service/signer/api_op_DescribeSigningJob.go @@ -93,6 +93,9 @@ func addOperationDescribeSigningJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationDescribeSigningJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_GetSigningPlatform.go b/service/signer/api_op_GetSigningPlatform.go index 7ab089c0d05..ba99cb288eb 100644 --- a/service/signer/api_op_GetSigningPlatform.go +++ b/service/signer/api_op_GetSigningPlatform.go @@ -75,6 +75,9 @@ func addOperationGetSigningPlatformMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetSigningPlatformMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_GetSigningProfile.go b/service/signer/api_op_GetSigningProfile.go index bff88a8ce70..727b474a88d 100644 --- a/service/signer/api_op_GetSigningProfile.go +++ b/service/signer/api_op_GetSigningProfile.go @@ -76,6 +76,9 @@ func addOperationGetSigningProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationGetSigningProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_ListSigningJobs.go b/service/signer/api_op_ListSigningJobs.go index 476bc0c9a47..436ab88323a 100644 --- a/service/signer/api_op_ListSigningJobs.go +++ b/service/signer/api_op_ListSigningJobs.go @@ -79,6 +79,9 @@ func addOperationListSigningJobsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListSigningJobsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_ListSigningPlatforms.go b/service/signer/api_op_ListSigningPlatforms.go index 365058b8a8d..3a11593978c 100644 --- a/service/signer/api_op_ListSigningPlatforms.go +++ b/service/signer/api_op_ListSigningPlatforms.go @@ -74,6 +74,9 @@ func addOperationListSigningPlatformsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListSigningPlatformsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_ListSigningProfiles.go b/service/signer/api_op_ListSigningProfiles.go index c2d92c32d35..7e0002a4583 100644 --- a/service/signer/api_op_ListSigningProfiles.go +++ b/service/signer/api_op_ListSigningProfiles.go @@ -70,6 +70,9 @@ func addOperationListSigningProfilesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListSigningProfilesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_ListTagsForResource.go b/service/signer/api_op_ListTagsForResource.go index d79dd40412b..dcaf3e49277 100644 --- a/service/signer/api_op_ListTagsForResource.go +++ b/service/signer/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_PutSigningProfile.go b/service/signer/api_op_PutSigningProfile.go index b2bf6276814..ac4ec65656a 100644 --- a/service/signer/api_op_PutSigningProfile.go +++ b/service/signer/api_op_PutSigningProfile.go @@ -79,6 +79,9 @@ func addOperationPutSigningProfileMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationPutSigningProfileMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_StartSigningJob.go b/service/signer/api_op_StartSigningJob.go index 5c51e962179..ceccd24544d 100644 --- a/service/signer/api_op_StartSigningJob.go +++ b/service/signer/api_op_StartSigningJob.go @@ -95,6 +95,9 @@ func addOperationStartSigningJobMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationStartSigningJobMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_TagResource.go b/service/signer/api_op_TagResource.go index f106857ec2d..46d3b780914 100644 --- a/service/signer/api_op_TagResource.go +++ b/service/signer/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/api_op_UntagResource.go b/service/signer/api_op_UntagResource.go index 688927188ff..25d7f3879bd 100644 --- a/service/signer/api_op_UntagResource.go +++ b/service/signer/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/signer/go.mod b/service/signer/go.mod index daa59f0f175..cf78940a86d 100644 --- a/service/signer/go.mod +++ b/service/signer/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/signer go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/signer/go.sum b/service/signer/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/signer/go.sum +++ b/service/signer/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sms/api_client.go b/service/sms/api_client.go index 5aca66b088d..580e9e1dfe3 100644 --- a/service/sms/api_client.go +++ b/service/sms/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sms/api_op_CreateApp.go b/service/sms/api_op_CreateApp.go index 7ea181fb0fa..aeda2b0d3d1 100644 --- a/service/sms/api_op_CreateApp.go +++ b/service/sms/api_op_CreateApp.go @@ -74,6 +74,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_CreateReplicationJob.go b/service/sms/api_op_CreateReplicationJob.go index 4b91cb1d414..37d17041b30 100644 --- a/service/sms/api_op_CreateReplicationJob.go +++ b/service/sms/api_op_CreateReplicationJob.go @@ -100,6 +100,9 @@ func addOperationCreateReplicationJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationCreateReplicationJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DeleteApp.go b/service/sms/api_op_DeleteApp.go index 1f6e6c366cd..37f6c429d96 100644 --- a/service/sms/api_op_DeleteApp.go +++ b/service/sms/api_op_DeleteApp.go @@ -56,6 +56,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DeleteAppLaunchConfiguration.go b/service/sms/api_op_DeleteAppLaunchConfiguration.go index b5913a1cb28..7e5ae602360 100644 --- a/service/sms/api_op_DeleteAppLaunchConfiguration.go +++ b/service/sms/api_op_DeleteAppLaunchConfiguration.go @@ -46,6 +46,9 @@ func addOperationDeleteAppLaunchConfigurationMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDeleteAppLaunchConfigurationMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DeleteAppReplicationConfiguration.go b/service/sms/api_op_DeleteAppReplicationConfiguration.go index 4970a3263a6..113f51984f7 100644 --- a/service/sms/api_op_DeleteAppReplicationConfiguration.go +++ b/service/sms/api_op_DeleteAppReplicationConfiguration.go @@ -46,6 +46,9 @@ func addOperationDeleteAppReplicationConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationDeleteAppReplicationConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DeleteAppValidationConfiguration.go b/service/sms/api_op_DeleteAppValidationConfiguration.go index da6edee2445..6607756783e 100644 --- a/service/sms/api_op_DeleteAppValidationConfiguration.go +++ b/service/sms/api_op_DeleteAppValidationConfiguration.go @@ -48,6 +48,9 @@ func addOperationDeleteAppValidationConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteAppValidationConfigurationMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DeleteReplicationJob.go b/service/sms/api_op_DeleteReplicationJob.go index 9edbc0e7c0d..853dafb4cc3 100644 --- a/service/sms/api_op_DeleteReplicationJob.go +++ b/service/sms/api_op_DeleteReplicationJob.go @@ -51,6 +51,9 @@ func addOperationDeleteReplicationJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteReplicationJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DeleteServerCatalog.go b/service/sms/api_op_DeleteServerCatalog.go index b9dc642265e..63f0600d3cf 100644 --- a/service/sms/api_op_DeleteServerCatalog.go +++ b/service/sms/api_op_DeleteServerCatalog.go @@ -43,6 +43,9 @@ func addOperationDeleteServerCatalogMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -82,6 +85,9 @@ func addOperationDeleteServerCatalogMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_DisassociateConnector.go b/service/sms/api_op_DisassociateConnector.go index 81ccd8f1888..cd40b7dfde9 100644 --- a/service/sms/api_op_DisassociateConnector.go +++ b/service/sms/api_op_DisassociateConnector.go @@ -49,6 +49,9 @@ func addOperationDisassociateConnectorMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDisassociateConnectorMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GenerateChangeSet.go b/service/sms/api_op_GenerateChangeSet.go index f0c8db3f2ae..900ad710972 100644 --- a/service/sms/api_op_GenerateChangeSet.go +++ b/service/sms/api_op_GenerateChangeSet.go @@ -55,6 +55,9 @@ func addOperationGenerateChangeSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGenerateChangeSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GenerateTemplate.go b/service/sms/api_op_GenerateTemplate.go index 27177b2663e..7228ed28dc1 100644 --- a/service/sms/api_op_GenerateTemplate.go +++ b/service/sms/api_op_GenerateTemplate.go @@ -56,6 +56,9 @@ func addOperationGenerateTemplateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGenerateTemplateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetApp.go b/service/sms/api_op_GetApp.go index 864ae5eb5fd..ec8988f3826 100644 --- a/service/sms/api_op_GetApp.go +++ b/service/sms/api_op_GetApp.go @@ -57,6 +57,9 @@ func addOperationGetAppMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetAppMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetAppLaunchConfiguration.go b/service/sms/api_op_GetAppLaunchConfiguration.go index 0e811005dd4..cd2d7373b31 100644 --- a/service/sms/api_op_GetAppLaunchConfiguration.go +++ b/service/sms/api_op_GetAppLaunchConfiguration.go @@ -63,6 +63,9 @@ func addOperationGetAppLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetAppLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetAppReplicationConfiguration.go b/service/sms/api_op_GetAppReplicationConfiguration.go index 0c6e25e186f..75522858b2c 100644 --- a/service/sms/api_op_GetAppReplicationConfiguration.go +++ b/service/sms/api_op_GetAppReplicationConfiguration.go @@ -53,6 +53,9 @@ func addOperationGetAppReplicationConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationGetAppReplicationConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetAppValidationConfiguration.go b/service/sms/api_op_GetAppValidationConfiguration.go index 1c9bd615112..5c23de13226 100644 --- a/service/sms/api_op_GetAppValidationConfiguration.go +++ b/service/sms/api_op_GetAppValidationConfiguration.go @@ -56,6 +56,9 @@ func addOperationGetAppValidationConfigurationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetAppValidationConfigurationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetAppValidationOutput.go b/service/sms/api_op_GetAppValidationOutput.go index 977e6b9e011..6e499ed74e9 100644 --- a/service/sms/api_op_GetAppValidationOutput.go +++ b/service/sms/api_op_GetAppValidationOutput.go @@ -53,6 +53,9 @@ func addOperationGetAppValidationOutputMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetAppValidationOutputMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetConnectors.go b/service/sms/api_op_GetConnectors.go index 3ea2b4478dc..8a848c13e4b 100644 --- a/service/sms/api_op_GetConnectors.go +++ b/service/sms/api_op_GetConnectors.go @@ -60,6 +60,9 @@ func addOperationGetConnectorsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetConnectorsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetReplicationJobs.go b/service/sms/api_op_GetReplicationJobs.go index a2d447ad0cf..fb6408a4aa4 100644 --- a/service/sms/api_op_GetReplicationJobs.go +++ b/service/sms/api_op_GetReplicationJobs.go @@ -63,6 +63,9 @@ func addOperationGetReplicationJobsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetReplicationJobsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetReplicationRuns.go b/service/sms/api_op_GetReplicationRuns.go index 9525e086953..00703a1cf10 100644 --- a/service/sms/api_op_GetReplicationRuns.go +++ b/service/sms/api_op_GetReplicationRuns.go @@ -68,6 +68,9 @@ func addOperationGetReplicationRunsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetReplicationRunsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_GetServers.go b/service/sms/api_op_GetServers.go index bd31ce6a48f..32339b7ae41 100644 --- a/service/sms/api_op_GetServers.go +++ b/service/sms/api_op_GetServers.go @@ -71,6 +71,9 @@ func addOperationGetServersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetServersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_ImportAppCatalog.go b/service/sms/api_op_ImportAppCatalog.go index b86d06ce8f9..42984c4d9ed 100644 --- a/service/sms/api_op_ImportAppCatalog.go +++ b/service/sms/api_op_ImportAppCatalog.go @@ -50,6 +50,9 @@ func addOperationImportAppCatalogMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -89,6 +92,9 @@ func addOperationImportAppCatalogMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_ImportServerCatalog.go b/service/sms/api_op_ImportServerCatalog.go index f99d21cab55..423a2f2093c 100644 --- a/service/sms/api_op_ImportServerCatalog.go +++ b/service/sms/api_op_ImportServerCatalog.go @@ -45,6 +45,9 @@ func addOperationImportServerCatalogMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -84,6 +87,9 @@ func addOperationImportServerCatalogMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_LaunchApp.go b/service/sms/api_op_LaunchApp.go index edc9b33785a..b2877e8d8f5 100644 --- a/service/sms/api_op_LaunchApp.go +++ b/service/sms/api_op_LaunchApp.go @@ -46,6 +46,9 @@ func addOperationLaunchAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationLaunchAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_ListApps.go b/service/sms/api_op_ListApps.go index f4ffd408f3d..1536916707f 100644 --- a/service/sms/api_op_ListApps.go +++ b/service/sms/api_op_ListApps.go @@ -63,6 +63,9 @@ func addOperationListAppsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListAppsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_NotifyAppValidationOutput.go b/service/sms/api_op_NotifyAppValidationOutput.go index 96974cd6559..0daf31ab868 100644 --- a/service/sms/api_op_NotifyAppValidationOutput.go +++ b/service/sms/api_op_NotifyAppValidationOutput.go @@ -53,6 +53,9 @@ func addOperationNotifyAppValidationOutputMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationNotifyAppValidationOutputMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_PutAppLaunchConfiguration.go b/service/sms/api_op_PutAppLaunchConfiguration.go index b50bfa60daf..8e99aaf1446 100644 --- a/service/sms/api_op_PutAppLaunchConfiguration.go +++ b/service/sms/api_op_PutAppLaunchConfiguration.go @@ -59,6 +59,9 @@ func addOperationPutAppLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPutAppLaunchConfigurationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_PutAppReplicationConfiguration.go b/service/sms/api_op_PutAppReplicationConfiguration.go index ad6b3f652ce..e7f5f57ca07 100644 --- a/service/sms/api_op_PutAppReplicationConfiguration.go +++ b/service/sms/api_op_PutAppReplicationConfiguration.go @@ -51,6 +51,9 @@ func addOperationPutAppReplicationConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationPutAppReplicationConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_PutAppValidationConfiguration.go b/service/sms/api_op_PutAppValidationConfiguration.go index 4be790a5cb9..4016b95c2af 100644 --- a/service/sms/api_op_PutAppValidationConfiguration.go +++ b/service/sms/api_op_PutAppValidationConfiguration.go @@ -55,6 +55,9 @@ func addOperationPutAppValidationConfigurationMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationPutAppValidationConfigurationMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_StartAppReplication.go b/service/sms/api_op_StartAppReplication.go index 17d995d67c7..c833936874c 100644 --- a/service/sms/api_op_StartAppReplication.go +++ b/service/sms/api_op_StartAppReplication.go @@ -47,6 +47,9 @@ func addOperationStartAppReplicationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationStartAppReplicationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_StartOnDemandAppReplication.go b/service/sms/api_op_StartOnDemandAppReplication.go index adeca4b17a2..0a17a308052 100644 --- a/service/sms/api_op_StartOnDemandAppReplication.go +++ b/service/sms/api_op_StartOnDemandAppReplication.go @@ -51,6 +51,9 @@ func addOperationStartOnDemandAppReplicationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationStartOnDemandAppReplicationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_StartOnDemandReplicationRun.go b/service/sms/api_op_StartOnDemandReplicationRun.go index 8800c35c917..e3040133e2f 100644 --- a/service/sms/api_op_StartOnDemandReplicationRun.go +++ b/service/sms/api_op_StartOnDemandReplicationRun.go @@ -58,6 +58,9 @@ func addOperationStartOnDemandReplicationRunMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationStartOnDemandReplicationRunMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_StopAppReplication.go b/service/sms/api_op_StopAppReplication.go index 300fd7a905f..e180a37b2fe 100644 --- a/service/sms/api_op_StopAppReplication.go +++ b/service/sms/api_op_StopAppReplication.go @@ -47,6 +47,9 @@ func addOperationStopAppReplicationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationStopAppReplicationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_TerminateApp.go b/service/sms/api_op_TerminateApp.go index 47470322825..0b12149036d 100644 --- a/service/sms/api_op_TerminateApp.go +++ b/service/sms/api_op_TerminateApp.go @@ -46,6 +46,9 @@ func addOperationTerminateAppMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -85,6 +88,9 @@ func addOperationTerminateAppMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_UpdateApp.go b/service/sms/api_op_UpdateApp.go index c7d28dfc804..fd336254ee5 100644 --- a/service/sms/api_op_UpdateApp.go +++ b/service/sms/api_op_UpdateApp.go @@ -72,6 +72,9 @@ func addOperationUpdateAppMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationUpdateAppMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/api_op_UpdateReplicationJob.go b/service/sms/api_op_UpdateReplicationJob.go index 0d6ec33aad0..d7070eaa61d 100644 --- a/service/sms/api_op_UpdateReplicationJob.go +++ b/service/sms/api_op_UpdateReplicationJob.go @@ -90,6 +90,9 @@ func addOperationUpdateReplicationJobMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationUpdateReplicationJobMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sms/go.mod b/service/sms/go.mod index 0adfd802be0..fd0e841039e 100644 --- a/service/sms/go.mod +++ b/service/sms/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sms go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sms/go.sum b/service/sms/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sms/go.sum +++ b/service/sms/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/snowball/api_client.go b/service/snowball/api_client.go index 47777050ba4..f5575f9901d 100644 --- a/service/snowball/api_client.go +++ b/service/snowball/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/snowball/api_op_CancelCluster.go b/service/snowball/api_op_CancelCluster.go index 58cfd099a72..d0325f335ae 100644 --- a/service/snowball/api_op_CancelCluster.go +++ b/service/snowball/api_op_CancelCluster.go @@ -51,6 +51,9 @@ func addOperationCancelClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationCancelClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_CancelJob.go b/service/snowball/api_op_CancelJob.go index ff313a2bc79..f1eea3bf664 100644 --- a/service/snowball/api_op_CancelJob.go +++ b/service/snowball/api_op_CancelJob.go @@ -51,6 +51,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationCancelJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_CreateAddress.go b/service/snowball/api_op_CreateAddress.go index f7f79c503c5..380a8896943 100644 --- a/service/snowball/api_op_CreateAddress.go +++ b/service/snowball/api_op_CreateAddress.go @@ -58,6 +58,9 @@ func addOperationCreateAddressMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateAddressMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_CreateCluster.go b/service/snowball/api_op_CreateCluster.go index 3a0caff5e1c..7a3f2a81ac6 100644 --- a/service/snowball/api_op_CreateCluster.go +++ b/service/snowball/api_op_CreateCluster.go @@ -137,6 +137,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationCreateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_CreateJob.go b/service/snowball/api_op_CreateJob.go index 1f86aee6e8f..cffe5f55ed0 100644 --- a/service/snowball/api_op_CreateJob.go +++ b/service/snowball/api_op_CreateJob.go @@ -136,6 +136,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationCreateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_CreateReturnShippingLabel.go b/service/snowball/api_op_CreateReturnShippingLabel.go index 33fdea7a73a..1436ab168fd 100644 --- a/service/snowball/api_op_CreateReturnShippingLabel.go +++ b/service/snowball/api_op_CreateReturnShippingLabel.go @@ -60,6 +60,9 @@ func addOperationCreateReturnShippingLabelMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateReturnShippingLabelMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_DescribeAddress.go b/service/snowball/api_op_DescribeAddress.go index 686e30d7341..7327ee1c8b6 100644 --- a/service/snowball/api_op_DescribeAddress.go +++ b/service/snowball/api_op_DescribeAddress.go @@ -55,6 +55,9 @@ func addOperationDescribeAddressMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeAddressMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_DescribeAddresses.go b/service/snowball/api_op_DescribeAddresses.go index c39ff33c3d4..d6d464f3e5b 100644 --- a/service/snowball/api_op_DescribeAddresses.go +++ b/service/snowball/api_op_DescribeAddresses.go @@ -63,6 +63,9 @@ func addOperationDescribeAddressesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeAddressesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_DescribeCluster.go b/service/snowball/api_op_DescribeCluster.go index 8205ac5721e..941a1f1c859 100644 --- a/service/snowball/api_op_DescribeCluster.go +++ b/service/snowball/api_op_DescribeCluster.go @@ -55,6 +55,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeClusterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_DescribeJob.go b/service/snowball/api_op_DescribeJob.go index 5e70ba2cb2d..0c37b73ab6d 100644 --- a/service/snowball/api_op_DescribeJob.go +++ b/service/snowball/api_op_DescribeJob.go @@ -60,6 +60,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeJobMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_DescribeReturnShippingLabel.go b/service/snowball/api_op_DescribeReturnShippingLabel.go index 570a91a65e6..bc70c7e333e 100644 --- a/service/snowball/api_op_DescribeReturnShippingLabel.go +++ b/service/snowball/api_op_DescribeReturnShippingLabel.go @@ -58,6 +58,9 @@ func addOperationDescribeReturnShippingLabelMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeReturnShippingLabelMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_GetJobManifest.go b/service/snowball/api_op_GetJobManifest.go index 1804f798dc0..efe803eeb7e 100644 --- a/service/snowball/api_op_GetJobManifest.go +++ b/service/snowball/api_op_GetJobManifest.go @@ -66,6 +66,9 @@ func addOperationGetJobManifestMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetJobManifestMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_GetJobUnlockCode.go b/service/snowball/api_op_GetJobUnlockCode.go index 45e66213113..da001133866 100644 --- a/service/snowball/api_op_GetJobUnlockCode.go +++ b/service/snowball/api_op_GetJobUnlockCode.go @@ -62,6 +62,9 @@ func addOperationGetJobUnlockCodeMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetJobUnlockCodeMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_GetSnowballUsage.go b/service/snowball/api_op_GetSnowballUsage.go index bab8bcebfe8..90edddd3534 100644 --- a/service/snowball/api_op_GetSnowballUsage.go +++ b/service/snowball/api_op_GetSnowballUsage.go @@ -54,6 +54,9 @@ func addOperationGetSnowballUsageMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetSnowballUsageMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_GetSoftwareUpdates.go b/service/snowball/api_op_GetSoftwareUpdates.go index 5a6b1e7cb56..ec589f0972b 100644 --- a/service/snowball/api_op_GetSoftwareUpdates.go +++ b/service/snowball/api_op_GetSoftwareUpdates.go @@ -57,6 +57,9 @@ func addOperationGetSoftwareUpdatesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetSoftwareUpdatesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_ListClusterJobs.go b/service/snowball/api_op_ListClusterJobs.go index c0cef5702c6..dd8456c6c1b 100644 --- a/service/snowball/api_op_ListClusterJobs.go +++ b/service/snowball/api_op_ListClusterJobs.go @@ -70,6 +70,9 @@ func addOperationListClusterJobsMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListClusterJobsMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_ListClusters.go b/service/snowball/api_op_ListClusters.go index 74aa046371d..340d8b3dee5 100644 --- a/service/snowball/api_op_ListClusters.go +++ b/service/snowball/api_op_ListClusters.go @@ -64,6 +64,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListClustersMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_ListCompatibleImages.go b/service/snowball/api_op_ListCompatibleImages.go index 7ebe4cba4ff..8344315a6f9 100644 --- a/service/snowball/api_op_ListCompatibleImages.go +++ b/service/snowball/api_op_ListCompatibleImages.go @@ -66,6 +66,9 @@ func addOperationListCompatibleImagesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListCompatibleImagesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_ListJobs.go b/service/snowball/api_op_ListJobs.go index 877dfca077e..12ae9eb7ff3 100644 --- a/service/snowball/api_op_ListJobs.go +++ b/service/snowball/api_op_ListJobs.go @@ -66,6 +66,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListJobsMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_UpdateCluster.go b/service/snowball/api_op_UpdateCluster.go index 4ea6f40581d..7cadedb1102 100644 --- a/service/snowball/api_op_UpdateCluster.go +++ b/service/snowball/api_op_UpdateCluster.go @@ -79,6 +79,9 @@ func addOperationUpdateClusterMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateClusterMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_UpdateJob.go b/service/snowball/api_op_UpdateJob.go index 62de3fbcef1..6655e04efca 100644 --- a/service/snowball/api_op_UpdateJob.go +++ b/service/snowball/api_op_UpdateJob.go @@ -81,6 +81,9 @@ func addOperationUpdateJobMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationUpdateJobMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/api_op_UpdateJobShipmentState.go b/service/snowball/api_op_UpdateJobShipmentState.go index bca592e50e8..41e1c24b671 100644 --- a/service/snowball/api_op_UpdateJobShipmentState.go +++ b/service/snowball/api_op_UpdateJobShipmentState.go @@ -57,6 +57,9 @@ func addOperationUpdateJobShipmentStateMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationUpdateJobShipmentStateMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/snowball/go.mod b/service/snowball/go.mod index b5ca4f8d2fe..3068fae291e 100644 --- a/service/snowball/go.mod +++ b/service/snowball/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/snowball go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/snowball/go.sum b/service/snowball/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/snowball/go.sum +++ b/service/snowball/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sns/api_client.go b/service/sns/api_client.go index a1a668c6bb5..d90a649bf5b 100644 --- a/service/sns/api_client.go +++ b/service/sns/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sns/api_op_AddPermission.go b/service/sns/api_op_AddPermission.go index d8020a6a68f..53e8cc1ebbc 100644 --- a/service/sns/api_op_AddPermission.go +++ b/service/sns/api_op_AddPermission.go @@ -67,6 +67,9 @@ func addOperationAddPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationAddPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go b/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go index 677c78ee08c..671a51e2742 100644 --- a/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go +++ b/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go @@ -63,6 +63,9 @@ func addOperationCheckIfPhoneNumberIsOptedOutMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCheckIfPhoneNumberIsOptedOutMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ConfirmSubscription.go b/service/sns/api_op_ConfirmSubscription.go index e4bc6fc1062..81b3ed296d2 100644 --- a/service/sns/api_op_ConfirmSubscription.go +++ b/service/sns/api_op_ConfirmSubscription.go @@ -69,6 +69,9 @@ func addOperationConfirmSubscriptionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationConfirmSubscriptionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_CreatePlatformApplication.go b/service/sns/api_op_CreatePlatformApplication.go index 4be4e33f6bb..81efeb67faa 100644 --- a/service/sns/api_op_CreatePlatformApplication.go +++ b/service/sns/api_op_CreatePlatformApplication.go @@ -96,6 +96,9 @@ func addOperationCreatePlatformApplicationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationCreatePlatformApplicationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_CreatePlatformEndpoint.go b/service/sns/api_op_CreatePlatformEndpoint.go index 88799a4fc62..8c01f93f757 100644 --- a/service/sns/api_op_CreatePlatformEndpoint.go +++ b/service/sns/api_op_CreatePlatformEndpoint.go @@ -85,6 +85,9 @@ func addOperationCreatePlatformEndpointMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreatePlatformEndpointMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_CreateTopic.go b/service/sns/api_op_CreateTopic.go index 3199e6bba12..63769f458c1 100644 --- a/service/sns/api_op_CreateTopic.go +++ b/service/sns/api_op_CreateTopic.go @@ -118,6 +118,9 @@ func addOperationCreateTopicMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationCreateTopicMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_DeleteEndpoint.go b/service/sns/api_op_DeleteEndpoint.go index 8e23e70ade7..327e85e2540 100644 --- a/service/sns/api_op_DeleteEndpoint.go +++ b/service/sns/api_op_DeleteEndpoint.go @@ -53,6 +53,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteEndpointMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_DeletePlatformApplication.go b/service/sns/api_op_DeletePlatformApplication.go index 832820b2eed..81460c9f833 100644 --- a/service/sns/api_op_DeletePlatformApplication.go +++ b/service/sns/api_op_DeletePlatformApplication.go @@ -52,6 +52,9 @@ func addOperationDeletePlatformApplicationMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeletePlatformApplicationMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_DeleteTopic.go b/service/sns/api_op_DeleteTopic.go index a91f257fb11..e3a278c3d84 100644 --- a/service/sns/api_op_DeleteTopic.go +++ b/service/sns/api_op_DeleteTopic.go @@ -51,6 +51,9 @@ func addOperationDeleteTopicMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteTopicMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_GetEndpointAttributes.go b/service/sns/api_op_GetEndpointAttributes.go index 5cb7a739753..a9e07d5d46f 100644 --- a/service/sns/api_op_GetEndpointAttributes.go +++ b/service/sns/api_op_GetEndpointAttributes.go @@ -72,6 +72,9 @@ func addOperationGetEndpointAttributesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetEndpointAttributesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_GetPlatformApplicationAttributes.go b/service/sns/api_op_GetPlatformApplicationAttributes.go index 00f541a2057..7ad73e46682 100644 --- a/service/sns/api_op_GetPlatformApplicationAttributes.go +++ b/service/sns/api_op_GetPlatformApplicationAttributes.go @@ -71,6 +71,9 @@ func addOperationGetPlatformApplicationAttributesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetPlatformApplicationAttributesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_GetSMSAttributes.go b/service/sns/api_op_GetSMSAttributes.go index 5cb9efcb48c..bfce6cdf2b2 100644 --- a/service/sns/api_op_GetSMSAttributes.go +++ b/service/sns/api_op_GetSMSAttributes.go @@ -56,6 +56,9 @@ func addOperationGetSMSAttributesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetSMSAttributesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_GetSubscriptionAttributes.go b/service/sns/api_op_GetSubscriptionAttributes.go index a6968eb3cfa..3b5f8d602c2 100644 --- a/service/sns/api_op_GetSubscriptionAttributes.go +++ b/service/sns/api_op_GetSubscriptionAttributes.go @@ -95,6 +95,9 @@ func addOperationGetSubscriptionAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationGetSubscriptionAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_GetTopicAttributes.go b/service/sns/api_op_GetTopicAttributes.go index eeb1ec82095..be67d46fefe 100644 --- a/service/sns/api_op_GetTopicAttributes.go +++ b/service/sns/api_op_GetTopicAttributes.go @@ -118,6 +118,9 @@ func addOperationGetTopicAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationGetTopicAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListEndpointsByPlatformApplication.go b/service/sns/api_op_ListEndpointsByPlatformApplication.go index 861d1bf44f1..85c65a13873 100644 --- a/service/sns/api_op_ListEndpointsByPlatformApplication.go +++ b/service/sns/api_op_ListEndpointsByPlatformApplication.go @@ -73,6 +73,9 @@ func addOperationListEndpointsByPlatformApplicationMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListEndpointsByPlatformApplicationMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListPhoneNumbersOptedOut.go b/service/sns/api_op_ListPhoneNumbersOptedOut.go index 9187472e75c..8c05969b20b 100644 --- a/service/sns/api_op_ListPhoneNumbersOptedOut.go +++ b/service/sns/api_op_ListPhoneNumbersOptedOut.go @@ -64,6 +64,9 @@ func addOperationListPhoneNumbersOptedOutMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListPhoneNumbersOptedOutMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListPlatformApplications.go b/service/sns/api_op_ListPlatformApplications.go index 4cb5f287b20..71b03b1c98d 100644 --- a/service/sns/api_op_ListPlatformApplications.go +++ b/service/sns/api_op_ListPlatformApplications.go @@ -67,6 +67,9 @@ func addOperationListPlatformApplicationsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListPlatformApplicationsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListSubscriptions.go b/service/sns/api_op_ListSubscriptions.go index c041f04f061..61d93960e83 100644 --- a/service/sns/api_op_ListSubscriptions.go +++ b/service/sns/api_op_ListSubscriptions.go @@ -61,6 +61,9 @@ func addOperationListSubscriptionsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListSubscriptionsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListSubscriptionsByTopic.go b/service/sns/api_op_ListSubscriptionsByTopic.go index 94886978eb2..6e5999f89b4 100644 --- a/service/sns/api_op_ListSubscriptionsByTopic.go +++ b/service/sns/api_op_ListSubscriptionsByTopic.go @@ -66,6 +66,9 @@ func addOperationListSubscriptionsByTopicMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListSubscriptionsByTopicMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListTagsForResource.go b/service/sns/api_op_ListTagsForResource.go index 506a6b00d26..0191234a7c3 100644 --- a/service/sns/api_op_ListTagsForResource.go +++ b/service/sns/api_op_ListTagsForResource.go @@ -55,6 +55,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_ListTopics.go b/service/sns/api_op_ListTopics.go index 99eb1bcfcd2..035d5ab8414 100644 --- a/service/sns/api_op_ListTopics.go +++ b/service/sns/api_op_ListTopics.go @@ -59,6 +59,9 @@ func addOperationListTopicsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListTopicsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_OptInPhoneNumber.go b/service/sns/api_op_OptInPhoneNumber.go index 29516781101..cb53e69861d 100644 --- a/service/sns/api_op_OptInPhoneNumber.go +++ b/service/sns/api_op_OptInPhoneNumber.go @@ -52,6 +52,9 @@ func addOperationOptInPhoneNumberMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationOptInPhoneNumberMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_Publish.go b/service/sns/api_op_Publish.go index c476af289ec..1747f30948a 100644 --- a/service/sns/api_op_Publish.go +++ b/service/sns/api_op_Publish.go @@ -183,6 +183,9 @@ func addOperationPublishMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -225,6 +228,9 @@ func addOperationPublishMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_RemovePermission.go b/service/sns/api_op_RemovePermission.go index a24667a34a2..26f54df4288 100644 --- a/service/sns/api_op_RemovePermission.go +++ b/service/sns/api_op_RemovePermission.go @@ -54,6 +54,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_SetEndpointAttributes.go b/service/sns/api_op_SetEndpointAttributes.go index 14a7940786c..7049e530188 100644 --- a/service/sns/api_op_SetEndpointAttributes.go +++ b/service/sns/api_op_SetEndpointAttributes.go @@ -72,6 +72,9 @@ func addOperationSetEndpointAttributesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationSetEndpointAttributesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_SetPlatformApplicationAttributes.go b/service/sns/api_op_SetPlatformApplicationAttributes.go index 5b9b0915a16..50afa82451f 100644 --- a/service/sns/api_op_SetPlatformApplicationAttributes.go +++ b/service/sns/api_op_SetPlatformApplicationAttributes.go @@ -96,6 +96,9 @@ func addOperationSetPlatformApplicationAttributesMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationSetPlatformApplicationAttributesMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_SetSMSAttributes.go b/service/sns/api_op_SetSMSAttributes.go index e7c71734d6b..1a26d6bded1 100644 --- a/service/sns/api_op_SetSMSAttributes.go +++ b/service/sns/api_op_SetSMSAttributes.go @@ -122,6 +122,9 @@ func addOperationSetSMSAttributesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationSetSMSAttributesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_SetSubscriptionAttributes.go b/service/sns/api_op_SetSubscriptionAttributes.go index fee9f8343a0..ca7bdebd25c 100644 --- a/service/sns/api_op_SetSubscriptionAttributes.go +++ b/service/sns/api_op_SetSubscriptionAttributes.go @@ -80,6 +80,9 @@ func addOperationSetSubscriptionAttributesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationSetSubscriptionAttributesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_SetTopicAttributes.go b/service/sns/api_op_SetTopicAttributes.go index 57e17066b5b..15a54b2df97 100644 --- a/service/sns/api_op_SetTopicAttributes.go +++ b/service/sns/api_op_SetTopicAttributes.go @@ -101,6 +101,9 @@ func addOperationSetTopicAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationSetTopicAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_Subscribe.go b/service/sns/api_op_Subscribe.go index dfd31f37f6a..d6199b0eba3 100644 --- a/service/sns/api_op_Subscribe.go +++ b/service/sns/api_op_Subscribe.go @@ -152,6 +152,9 @@ func addOperationSubscribeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationSubscribeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_TagResource.go b/service/sns/api_op_TagResource.go index 4c18b163382..ea317a24298 100644 --- a/service/sns/api_op_TagResource.go +++ b/service/sns/api_op_TagResource.go @@ -74,6 +74,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_Unsubscribe.go b/service/sns/api_op_Unsubscribe.go index 94c469daed9..4fb53a3508f 100644 --- a/service/sns/api_op_Unsubscribe.go +++ b/service/sns/api_op_Unsubscribe.go @@ -55,6 +55,9 @@ func addOperationUnsubscribeMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUnsubscribeMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/api_op_UntagResource.go b/service/sns/api_op_UntagResource.go index ddf36002f09..61adb998c7f 100644 --- a/service/sns/api_op_UntagResource.go +++ b/service/sns/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sns/go.mod b/service/sns/go.mod index f230767f3c9..2159ec79554 100644 --- a/service/sns/go.mod +++ b/service/sns/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sns go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sns/go.sum b/service/sns/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sns/go.sum +++ b/service/sns/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sqs/api_client.go b/service/sqs/api_client.go index 648ff7d5483..28593e6348f 100644 --- a/service/sqs/api_client.go +++ b/service/sqs/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sqs/api_op_AddPermission.go b/service/sqs/api_op_AddPermission.go index ffe889afdb9..de559460a1e 100644 --- a/service/sqs/api_op_AddPermission.go +++ b/service/sqs/api_op_AddPermission.go @@ -111,6 +111,9 @@ func addOperationAddPermissionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationAddPermissionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_ChangeMessageVisibility.go b/service/sqs/api_op_ChangeMessageVisibility.go index 258cde95ce2..d09562aa85e 100644 --- a/service/sqs/api_op_ChangeMessageVisibility.go +++ b/service/sqs/api_op_ChangeMessageVisibility.go @@ -105,6 +105,9 @@ func addOperationChangeMessageVisibilityMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationChangeMessageVisibilityMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_ChangeMessageVisibilityBatch.go b/service/sqs/api_op_ChangeMessageVisibilityBatch.go index 29980f99f25..f4da62768ac 100644 --- a/service/sqs/api_op_ChangeMessageVisibilityBatch.go +++ b/service/sqs/api_op_ChangeMessageVisibilityBatch.go @@ -81,6 +81,9 @@ func addOperationChangeMessageVisibilityBatchMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationChangeMessageVisibilityBatchMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_CreateQueue.go b/service/sqs/api_op_CreateQueue.go index 3bbb119d72a..605be7a37bf 100644 --- a/service/sqs/api_op_CreateQueue.go +++ b/service/sqs/api_op_CreateQueue.go @@ -263,6 +263,9 @@ func addOperationCreateQueueMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -305,6 +308,9 @@ func addOperationCreateQueueMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_DeleteMessage.go b/service/sqs/api_op_DeleteMessage.go index 7a2be066c4c..9659d6b00ca 100644 --- a/service/sqs/api_op_DeleteMessage.go +++ b/service/sqs/api_op_DeleteMessage.go @@ -71,6 +71,9 @@ func addOperationDeleteMessageMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteMessageMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_DeleteMessageBatch.go b/service/sqs/api_op_DeleteMessageBatch.go index 4491018b627..e03c775f54f 100644 --- a/service/sqs/api_op_DeleteMessageBatch.go +++ b/service/sqs/api_op_DeleteMessageBatch.go @@ -78,6 +78,9 @@ func addOperationDeleteMessageBatchMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteMessageBatchMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_DeleteQueue.go b/service/sqs/api_op_DeleteQueue.go index 58e61e76232..1b6372b4013 100644 --- a/service/sqs/api_op_DeleteQueue.go +++ b/service/sqs/api_op_DeleteQueue.go @@ -60,6 +60,9 @@ func addOperationDeleteQueueMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteQueueMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_GetQueueAttributes.go b/service/sqs/api_op_GetQueueAttributes.go index d06a011f0d9..181a9e5c24e 100644 --- a/service/sqs/api_op_GetQueueAttributes.go +++ b/service/sqs/api_op_GetQueueAttributes.go @@ -170,6 +170,9 @@ func addOperationGetQueueAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -212,6 +215,9 @@ func addOperationGetQueueAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_GetQueueUrl.go b/service/sqs/api_op_GetQueueUrl.go index 1274e71ba93..59070febf93 100644 --- a/service/sqs/api_op_GetQueueUrl.go +++ b/service/sqs/api_op_GetQueueUrl.go @@ -67,6 +67,9 @@ func addOperationGetQueueUrlMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetQueueUrlMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_ListDeadLetterSourceQueues.go b/service/sqs/api_op_ListDeadLetterSourceQueues.go index d7654446b94..b1218dc9c99 100644 --- a/service/sqs/api_op_ListDeadLetterSourceQueues.go +++ b/service/sqs/api_op_ListDeadLetterSourceQueues.go @@ -80,6 +80,9 @@ func addOperationListDeadLetterSourceQueuesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListDeadLetterSourceQueuesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_ListQueueTags.go b/service/sqs/api_op_ListQueueTags.go index ef0b33e5370..cc106bd7e37 100644 --- a/service/sqs/api_op_ListQueueTags.go +++ b/service/sqs/api_op_ListQueueTags.go @@ -59,6 +59,9 @@ func addOperationListQueueTagsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationListQueueTagsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_ListQueues.go b/service/sqs/api_op_ListQueues.go index d236750af5a..f92b6e4dfa1 100644 --- a/service/sqs/api_op_ListQueues.go +++ b/service/sqs/api_op_ListQueues.go @@ -79,6 +79,9 @@ func addOperationListQueuesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListQueuesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_PurgeQueue.go b/service/sqs/api_op_PurgeQueue.go index b67f47ff320..2b6a5d97681 100644 --- a/service/sqs/api_op_PurgeQueue.go +++ b/service/sqs/api_op_PurgeQueue.go @@ -56,6 +56,9 @@ func addOperationPurgeQueueMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationPurgeQueueMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_ReceiveMessage.go b/service/sqs/api_op_ReceiveMessage.go index 5823ec15189..de99438c643 100644 --- a/service/sqs/api_op_ReceiveMessage.go +++ b/service/sqs/api_op_ReceiveMessage.go @@ -243,6 +243,9 @@ func addOperationReceiveMessageMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -285,6 +288,9 @@ func addOperationReceiveMessageMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_RemovePermission.go b/service/sqs/api_op_RemovePermission.go index a06b69dc20a..3b81a6410ad 100644 --- a/service/sqs/api_op_RemovePermission.go +++ b/service/sqs/api_op_RemovePermission.go @@ -69,6 +69,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationRemovePermissionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_SendMessage.go b/service/sqs/api_op_SendMessage.go index 8f37dbba619..6bf3a660eb6 100644 --- a/service/sqs/api_op_SendMessage.go +++ b/service/sqs/api_op_SendMessage.go @@ -199,6 +199,9 @@ func addOperationSendMessageMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -241,6 +244,9 @@ func addOperationSendMessageMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_SendMessageBatch.go b/service/sqs/api_op_SendMessageBatch.go index 60f44ed6c92..f2c8804de7b 100644 --- a/service/sqs/api_op_SendMessageBatch.go +++ b/service/sqs/api_op_SendMessageBatch.go @@ -89,6 +89,9 @@ func addOperationSendMessageBatchMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationSendMessageBatchMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_SetQueueAttributes.go b/service/sqs/api_op_SetQueueAttributes.go index bd2c7ea75d1..259262e1e58 100644 --- a/service/sqs/api_op_SetQueueAttributes.go +++ b/service/sqs/api_op_SetQueueAttributes.go @@ -187,6 +187,9 @@ func addOperationSetQueueAttributesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -229,6 +232,9 @@ func addOperationSetQueueAttributesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_TagQueue.go b/service/sqs/api_op_TagQueue.go index 25a3a24114e..ae5f9f1e6db 100644 --- a/service/sqs/api_op_TagQueue.go +++ b/service/sqs/api_op_TagQueue.go @@ -77,6 +77,9 @@ func addOperationTagQueueMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationTagQueueMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/api_op_UntagQueue.go b/service/sqs/api_op_UntagQueue.go index 7276fe28c7d..6b70f56bca3 100644 --- a/service/sqs/api_op_UntagQueue.go +++ b/service/sqs/api_op_UntagQueue.go @@ -60,6 +60,9 @@ func addOperationUntagQueueMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagQueueMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sqs/go.mod b/service/sqs/go.mod index 560f039ada6..b84741bd681 100644 --- a/service/sqs/go.mod +++ b/service/sqs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sqs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sqs/go.sum b/service/sqs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sqs/go.sum +++ b/service/sqs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ssm/api_client.go b/service/ssm/api_client.go index e45a75779e6..b331c155c13 100644 --- a/service/ssm/api_client.go +++ b/service/ssm/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ssm/api_op_AddTagsToResource.go b/service/ssm/api_op_AddTagsToResource.go index 41a262b7321..49337c49f49 100644 --- a/service/ssm/api_op_AddTagsToResource.go +++ b/service/ssm/api_op_AddTagsToResource.go @@ -85,6 +85,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CancelCommand.go b/service/ssm/api_op_CancelCommand.go index 9498eb9e2e0..08b18ac8317 100644 --- a/service/ssm/api_op_CancelCommand.go +++ b/service/ssm/api_op_CancelCommand.go @@ -58,6 +58,9 @@ func addOperationCancelCommandMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCancelCommandMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CancelMaintenanceWindowExecution.go b/service/ssm/api_op_CancelMaintenanceWindowExecution.go index fd943cdeafd..8b75cc923ee 100644 --- a/service/ssm/api_op_CancelMaintenanceWindowExecution.go +++ b/service/ssm/api_op_CancelMaintenanceWindowExecution.go @@ -54,6 +54,9 @@ func addOperationCancelMaintenanceWindowExecutionMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationCancelMaintenanceWindowExecutionMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateActivation.go b/service/ssm/api_op_CreateActivation.go index b68f9d4f5f0..7b1949314a9 100644 --- a/service/ssm/api_op_CreateActivation.go +++ b/service/ssm/api_op_CreateActivation.go @@ -116,6 +116,9 @@ func addOperationCreateActivationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationCreateActivationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateAssociation.go b/service/ssm/api_op_CreateAssociation.go index bb77a8ec881..76259587d92 100644 --- a/service/ssm/api_op_CreateAssociation.go +++ b/service/ssm/api_op_CreateAssociation.go @@ -152,6 +152,9 @@ func addOperationCreateAssociationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -194,6 +197,9 @@ func addOperationCreateAssociationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateAssociationBatch.go b/service/ssm/api_op_CreateAssociationBatch.go index 941a03bd682..3916663de55 100644 --- a/service/ssm/api_op_CreateAssociationBatch.go +++ b/service/ssm/api_op_CreateAssociationBatch.go @@ -61,6 +61,9 @@ func addOperationCreateAssociationBatchMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationCreateAssociationBatchMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateDocument.go b/service/ssm/api_op_CreateDocument.go index a46d1bb1bb4..5bac20a0ba6 100644 --- a/service/ssm/api_op_CreateDocument.go +++ b/service/ssm/api_op_CreateDocument.go @@ -136,6 +136,9 @@ func addOperationCreateDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -178,6 +181,9 @@ func addOperationCreateDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateMaintenanceWindow.go b/service/ssm/api_op_CreateMaintenanceWindow.go index aa78794dd00..f9beea10997 100644 --- a/service/ssm/api_op_CreateMaintenanceWindow.go +++ b/service/ssm/api_op_CreateMaintenanceWindow.go @@ -134,6 +134,9 @@ func addOperationCreateMaintenanceWindowMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -179,6 +182,9 @@ func addOperationCreateMaintenanceWindowMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateOpsItem.go b/service/ssm/api_op_CreateOpsItem.go index 8e6b293d303..27e66508640 100644 --- a/service/ssm/api_op_CreateOpsItem.go +++ b/service/ssm/api_op_CreateOpsItem.go @@ -120,6 +120,9 @@ func addOperationCreateOpsItemMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationCreateOpsItemMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreatePatchBaseline.go b/service/ssm/api_op_CreatePatchBaseline.go index aad1544fac9..25b2aca93ff 100644 --- a/service/ssm/api_op_CreatePatchBaseline.go +++ b/service/ssm/api_op_CreatePatchBaseline.go @@ -130,6 +130,9 @@ func addOperationCreatePatchBaselineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationCreatePatchBaselineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_CreateResourceDataSync.go b/service/ssm/api_op_CreateResourceDataSync.go index 965cb4a9b1f..a5f1aeeec50 100644 --- a/service/ssm/api_op_CreateResourceDataSync.go +++ b/service/ssm/api_op_CreateResourceDataSync.go @@ -87,6 +87,9 @@ func addOperationCreateResourceDataSyncMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCreateResourceDataSyncMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteActivation.go b/service/ssm/api_op_DeleteActivation.go index 9d794fb2397..f61948d15c4 100644 --- a/service/ssm/api_op_DeleteActivation.go +++ b/service/ssm/api_op_DeleteActivation.go @@ -51,6 +51,9 @@ func addOperationDeleteActivationMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteActivationMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteAssociation.go b/service/ssm/api_op_DeleteAssociation.go index 81ffcda46c0..1196e17318f 100644 --- a/service/ssm/api_op_DeleteAssociation.go +++ b/service/ssm/api_op_DeleteAssociation.go @@ -56,6 +56,9 @@ func addOperationDeleteAssociationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteAssociationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteDocument.go b/service/ssm/api_op_DeleteDocument.go index 610905a7c0d..a99ea5036d9 100644 --- a/service/ssm/api_op_DeleteDocument.go +++ b/service/ssm/api_op_DeleteDocument.go @@ -65,6 +65,9 @@ func addOperationDeleteDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeleteDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteInventory.go b/service/ssm/api_op_DeleteInventory.go index e5484af90f2..af150cee2e7 100644 --- a/service/ssm/api_op_DeleteInventory.go +++ b/service/ssm/api_op_DeleteInventory.go @@ -89,6 +89,9 @@ func addOperationDeleteInventoryMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDeleteInventoryMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteMaintenanceWindow.go b/service/ssm/api_op_DeleteMaintenanceWindow.go index 0e85af946f4..62cb7b74219 100644 --- a/service/ssm/api_op_DeleteMaintenanceWindow.go +++ b/service/ssm/api_op_DeleteMaintenanceWindow.go @@ -52,6 +52,9 @@ func addOperationDeleteMaintenanceWindowMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteMaintenanceWindowMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteParameter.go b/service/ssm/api_op_DeleteParameter.go index c1de0a48905..0f148915fd2 100644 --- a/service/ssm/api_op_DeleteParameter.go +++ b/service/ssm/api_op_DeleteParameter.go @@ -48,6 +48,9 @@ func addOperationDeleteParameterMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteParameterMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteParameters.go b/service/ssm/api_op_DeleteParameters.go index 547161189bc..9cc1727cfd1 100644 --- a/service/ssm/api_op_DeleteParameters.go +++ b/service/ssm/api_op_DeleteParameters.go @@ -56,6 +56,9 @@ func addOperationDeleteParametersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteParametersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeletePatchBaseline.go b/service/ssm/api_op_DeletePatchBaseline.go index 71758aded57..b4a1cee243c 100644 --- a/service/ssm/api_op_DeletePatchBaseline.go +++ b/service/ssm/api_op_DeletePatchBaseline.go @@ -52,6 +52,9 @@ func addOperationDeletePatchBaselineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeletePatchBaselineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeleteResourceDataSync.go b/service/ssm/api_op_DeleteResourceDataSync.go index d25169ad57f..0c2e0500b90 100644 --- a/service/ssm/api_op_DeleteResourceDataSync.go +++ b/service/ssm/api_op_DeleteResourceDataSync.go @@ -53,6 +53,9 @@ func addOperationDeleteResourceDataSyncMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteResourceDataSyncMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeregisterManagedInstance.go b/service/ssm/api_op_DeregisterManagedInstance.go index bfc472f7f14..ea34c4ce834 100644 --- a/service/ssm/api_op_DeregisterManagedInstance.go +++ b/service/ssm/api_op_DeregisterManagedInstance.go @@ -51,6 +51,9 @@ func addOperationDeregisterManagedInstanceMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeregisterManagedInstanceMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go b/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go index 479526db154..61093485d25 100644 --- a/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go +++ b/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go @@ -60,6 +60,9 @@ func addOperationDeregisterPatchBaselineForPatchGroupMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeregisterPatchBaselineForPatchGroupMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go b/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go index 746eca272ba..cb2f3d6ea2d 100644 --- a/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go +++ b/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go @@ -65,6 +65,9 @@ func addOperationDeregisterTargetFromMaintenanceWindowMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDeregisterTargetFromMaintenanceWindowMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go b/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go index 7457a933619..96354677026 100644 --- a/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go +++ b/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go @@ -60,6 +60,9 @@ func addOperationDeregisterTaskFromMaintenanceWindowMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeregisterTaskFromMaintenanceWindowMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeActivations.go b/service/ssm/api_op_DescribeActivations.go index 23946715c3a..a5ec88c8093 100644 --- a/service/ssm/api_op_DescribeActivations.go +++ b/service/ssm/api_op_DescribeActivations.go @@ -64,6 +64,9 @@ func addOperationDescribeActivationsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeActivationsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeAssociation.go b/service/ssm/api_op_DescribeAssociation.go index 38db94dfa48..37ac2009d02 100644 --- a/service/ssm/api_op_DescribeAssociation.go +++ b/service/ssm/api_op_DescribeAssociation.go @@ -67,6 +67,9 @@ func addOperationDescribeAssociationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeAssociationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeAssociationExecutionTargets.go b/service/ssm/api_op_DescribeAssociationExecutionTargets.go index e02c180dac7..08f421519b5 100644 --- a/service/ssm/api_op_DescribeAssociationExecutionTargets.go +++ b/service/ssm/api_op_DescribeAssociationExecutionTargets.go @@ -75,6 +75,9 @@ func addOperationDescribeAssociationExecutionTargetsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeAssociationExecutionTargetsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeAssociationExecutions.go b/service/ssm/api_op_DescribeAssociationExecutions.go index 667c790553e..23aa74af42b 100644 --- a/service/ssm/api_op_DescribeAssociationExecutions.go +++ b/service/ssm/api_op_DescribeAssociationExecutions.go @@ -68,6 +68,9 @@ func addOperationDescribeAssociationExecutionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeAssociationExecutionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeAutomationExecutions.go b/service/ssm/api_op_DescribeAutomationExecutions.go index 50f5f90ba48..d85cde98462 100644 --- a/service/ssm/api_op_DescribeAutomationExecutions.go +++ b/service/ssm/api_op_DescribeAutomationExecutions.go @@ -64,6 +64,9 @@ func addOperationDescribeAutomationExecutionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeAutomationExecutionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeAutomationStepExecutions.go b/service/ssm/api_op_DescribeAutomationStepExecutions.go index 5eba0ab7576..864fcd1d052 100644 --- a/service/ssm/api_op_DescribeAutomationStepExecutions.go +++ b/service/ssm/api_op_DescribeAutomationStepExecutions.go @@ -75,6 +75,9 @@ func addOperationDescribeAutomationStepExecutionsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDescribeAutomationStepExecutionsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeAvailablePatches.go b/service/ssm/api_op_DescribeAvailablePatches.go index 4ad97784f24..5bc881c0de1 100644 --- a/service/ssm/api_op_DescribeAvailablePatches.go +++ b/service/ssm/api_op_DescribeAvailablePatches.go @@ -62,6 +62,9 @@ func addOperationDescribeAvailablePatchesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeAvailablePatchesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeDocument.go b/service/ssm/api_op_DescribeDocument.go index de0cf95dc94..562a8bc94e6 100644 --- a/service/ssm/api_op_DescribeDocument.go +++ b/service/ssm/api_op_DescribeDocument.go @@ -62,6 +62,9 @@ func addOperationDescribeDocumentMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeDocumentMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeDocumentPermission.go b/service/ssm/api_op_DescribeDocumentPermission.go index f1c1108c604..740c4ed1f45 100644 --- a/service/ssm/api_op_DescribeDocumentPermission.go +++ b/service/ssm/api_op_DescribeDocumentPermission.go @@ -65,6 +65,9 @@ func addOperationDescribeDocumentPermissionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeDocumentPermissionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go b/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go index c6bef2d0abb..69cd2fd0609 100644 --- a/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go +++ b/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go @@ -65,6 +65,9 @@ func addOperationDescribeEffectiveInstanceAssociationsMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeEffectiveInstanceAssociationsMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go b/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go index b45affefa2b..2d5c2ad8135 100644 --- a/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go +++ b/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go @@ -66,6 +66,9 @@ func addOperationDescribeEffectivePatchesForPatchBaselineMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeEffectivePatchesForPatchBaselineMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeInstanceAssociationsStatus.go b/service/ssm/api_op_DescribeInstanceAssociationsStatus.go index 120328fda02..80eca6903f1 100644 --- a/service/ssm/api_op_DescribeInstanceAssociationsStatus.go +++ b/service/ssm/api_op_DescribeInstanceAssociationsStatus.go @@ -65,6 +65,9 @@ func addOperationDescribeInstanceAssociationsStatusMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeInstanceAssociationsStatusMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeInstanceInformation.go b/service/ssm/api_op_DescribeInstanceInformation.go index fb1cbd2e2db..c42c84a5e08 100644 --- a/service/ssm/api_op_DescribeInstanceInformation.go +++ b/service/ssm/api_op_DescribeInstanceInformation.go @@ -79,6 +79,9 @@ func addOperationDescribeInstanceInformationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeInstanceInformationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeInstancePatchStates.go b/service/ssm/api_op_DescribeInstancePatchStates.go index a4dac5cc533..8de6f619e42 100644 --- a/service/ssm/api_op_DescribeInstancePatchStates.go +++ b/service/ssm/api_op_DescribeInstancePatchStates.go @@ -64,6 +64,9 @@ func addOperationDescribeInstancePatchStatesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeInstancePatchStatesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go b/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go index 59955db1dfe..a60cec35099 100644 --- a/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go +++ b/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go @@ -71,6 +71,9 @@ func addOperationDescribeInstancePatchStatesForPatchGroupMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeInstancePatchStatesForPatchGroupMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeInstancePatches.go b/service/ssm/api_op_DescribeInstancePatches.go index d912d703007..88d6447a3ff 100644 --- a/service/ssm/api_op_DescribeInstancePatches.go +++ b/service/ssm/api_op_DescribeInstancePatches.go @@ -72,6 +72,9 @@ func addOperationDescribeInstancePatchesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeInstancePatchesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeInventoryDeletions.go b/service/ssm/api_op_DescribeInventoryDeletions.go index 0b180c2cb6b..9819695b775 100644 --- a/service/ssm/api_op_DescribeInventoryDeletions.go +++ b/service/ssm/api_op_DescribeInventoryDeletions.go @@ -63,6 +63,9 @@ func addOperationDescribeInventoryDeletionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeInventoryDeletionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go index bd1790164b1..56ff70369fe 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go @@ -77,6 +77,9 @@ func addOperationDescribeMaintenanceWindowExecutionTaskInvocationsMiddlewares(st if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeMaintenanceWindowExecutionTaskInvocationsMiddlewares(st if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go index 178084a48ba..43c3ac37dcc 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go @@ -71,6 +71,9 @@ func addOperationDescribeMaintenanceWindowExecutionTasksMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeMaintenanceWindowExecutionTasksMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go b/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go index 705a47abea0..bd3adc6b4ca 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go @@ -73,6 +73,9 @@ func addOperationDescribeMaintenanceWindowExecutionsMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeMaintenanceWindowExecutionsMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go b/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go index 3e517874e1a..477b2418ddb 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go @@ -76,6 +76,9 @@ func addOperationDescribeMaintenanceWindowScheduleMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeMaintenanceWindowScheduleMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowTargets.go b/service/ssm/api_op_DescribeMaintenanceWindowTargets.go index 493c4923890..b21dcce6f46 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowTargets.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowTargets.go @@ -70,6 +70,9 @@ func addOperationDescribeMaintenanceWindowTargetsMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeMaintenanceWindowTargetsMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowTasks.go b/service/ssm/api_op_DescribeMaintenanceWindowTasks.go index 4c2e57496d8..b3f3e4102c8 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowTasks.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowTasks.go @@ -69,6 +69,9 @@ func addOperationDescribeMaintenanceWindowTasksMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeMaintenanceWindowTasksMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindows.go b/service/ssm/api_op_DescribeMaintenanceWindows.go index 831ec3d696e..b4be0199b8f 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindows.go +++ b/service/ssm/api_op_DescribeMaintenanceWindows.go @@ -64,6 +64,9 @@ func addOperationDescribeMaintenanceWindowsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeMaintenanceWindowsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go b/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go index 815fa35b757..b8fdb7fcbc6 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go @@ -73,6 +73,9 @@ func addOperationDescribeMaintenanceWindowsForTargetMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeMaintenanceWindowsForTargetMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeOpsItems.go b/service/ssm/api_op_DescribeOpsItems.go index f5fbc06f9f3..6d4dcf971b4 100644 --- a/service/ssm/api_op_DescribeOpsItems.go +++ b/service/ssm/api_op_DescribeOpsItems.go @@ -109,6 +109,9 @@ func addOperationDescribeOpsItemsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationDescribeOpsItemsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeParameters.go b/service/ssm/api_op_DescribeParameters.go index 1ec9e6456bf..4cbad6b516a 100644 --- a/service/ssm/api_op_DescribeParameters.go +++ b/service/ssm/api_op_DescribeParameters.go @@ -71,6 +71,9 @@ func addOperationDescribeParametersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeParametersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribePatchBaselines.go b/service/ssm/api_op_DescribePatchBaselines.go index ac208472474..fd55f23f6fa 100644 --- a/service/ssm/api_op_DescribePatchBaselines.go +++ b/service/ssm/api_op_DescribePatchBaselines.go @@ -64,6 +64,9 @@ func addOperationDescribePatchBaselinesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribePatchBaselinesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribePatchGroupState.go b/service/ssm/api_op_DescribePatchGroupState.go index 4559c462bdb..40e1c24c84c 100644 --- a/service/ssm/api_op_DescribePatchGroupState.go +++ b/service/ssm/api_op_DescribePatchGroupState.go @@ -85,6 +85,9 @@ func addOperationDescribePatchGroupStateMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDescribePatchGroupStateMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribePatchGroups.go b/service/ssm/api_op_DescribePatchGroups.go index be59e336a3c..9d59d015ffc 100644 --- a/service/ssm/api_op_DescribePatchGroups.go +++ b/service/ssm/api_op_DescribePatchGroups.go @@ -79,6 +79,9 @@ func addOperationDescribePatchGroupsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribePatchGroupsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribePatchProperties.go b/service/ssm/api_op_DescribePatchProperties.go index 9419c0e1932..c58a2de15f1 100644 --- a/service/ssm/api_op_DescribePatchProperties.go +++ b/service/ssm/api_op_DescribePatchProperties.go @@ -86,6 +86,9 @@ func addOperationDescribePatchPropertiesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDescribePatchPropertiesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_DescribeSessions.go b/service/ssm/api_op_DescribeSessions.go index f4b5652d809..a032ba2ee23 100644 --- a/service/ssm/api_op_DescribeSessions.go +++ b/service/ssm/api_op_DescribeSessions.go @@ -69,6 +69,9 @@ func addOperationDescribeSessionsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeSessionsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetAutomationExecution.go b/service/ssm/api_op_GetAutomationExecution.go index 355467255ac..ca15344a630 100644 --- a/service/ssm/api_op_GetAutomationExecution.go +++ b/service/ssm/api_op_GetAutomationExecution.go @@ -55,6 +55,9 @@ func addOperationGetAutomationExecutionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationGetAutomationExecutionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetCalendarState.go b/service/ssm/api_op_GetCalendarState.go index eff64249f5b..43a801429b5 100644 --- a/service/ssm/api_op_GetCalendarState.go +++ b/service/ssm/api_op_GetCalendarState.go @@ -83,6 +83,9 @@ func addOperationGetCalendarStateMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationGetCalendarStateMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetCommandInvocation.go b/service/ssm/api_op_GetCommandInvocation.go index 91bf4fe08d4..8df8d283421 100644 --- a/service/ssm/api_op_GetCommandInvocation.go +++ b/service/ssm/api_op_GetCommandInvocation.go @@ -186,6 +186,9 @@ func addOperationGetCommandInvocationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -228,6 +231,9 @@ func addOperationGetCommandInvocationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetConnectionStatus.go b/service/ssm/api_op_GetConnectionStatus.go index c98043742da..13b54b119e0 100644 --- a/service/ssm/api_op_GetConnectionStatus.go +++ b/service/ssm/api_op_GetConnectionStatus.go @@ -58,6 +58,9 @@ func addOperationGetConnectionStatusMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetConnectionStatusMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetDefaultPatchBaseline.go b/service/ssm/api_op_GetDefaultPatchBaseline.go index a9e8ee601c8..5a923dea689 100644 --- a/service/ssm/api_op_GetDefaultPatchBaseline.go +++ b/service/ssm/api_op_GetDefaultPatchBaseline.go @@ -57,6 +57,9 @@ func addOperationGetDefaultPatchBaselineMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetDefaultPatchBaselineMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go b/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go index 8e639a757d7..bb7c0725ffa 100644 --- a/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go +++ b/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go @@ -69,6 +69,9 @@ func addOperationGetDeployablePatchSnapshotForInstanceMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetDeployablePatchSnapshotForInstanceMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetDocument.go b/service/ssm/api_op_GetDocument.go index 5732757437c..62c36189da5 100644 --- a/service/ssm/api_op_GetDocument.go +++ b/service/ssm/api_op_GetDocument.go @@ -101,6 +101,9 @@ func addOperationGetDocumentMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationGetDocumentMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetInventory.go b/service/ssm/api_op_GetInventory.go index 99fa03afb12..9b530db0973 100644 --- a/service/ssm/api_op_GetInventory.go +++ b/service/ssm/api_op_GetInventory.go @@ -72,6 +72,9 @@ func addOperationGetInventoryMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetInventoryMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetInventorySchema.go b/service/ssm/api_op_GetInventorySchema.go index dea6ccb603b..da37343e0e4 100644 --- a/service/ssm/api_op_GetInventorySchema.go +++ b/service/ssm/api_op_GetInventorySchema.go @@ -72,6 +72,9 @@ func addOperationGetInventorySchemaMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetInventorySchemaMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetMaintenanceWindow.go b/service/ssm/api_op_GetMaintenanceWindow.go index 98510936cf6..b03a4413ada 100644 --- a/service/ssm/api_op_GetMaintenanceWindow.go +++ b/service/ssm/api_op_GetMaintenanceWindow.go @@ -106,6 +106,9 @@ func addOperationGetMaintenanceWindowMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationGetMaintenanceWindowMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetMaintenanceWindowExecution.go b/service/ssm/api_op_GetMaintenanceWindowExecution.go index 1630f398827..030cb70e088 100644 --- a/service/ssm/api_op_GetMaintenanceWindowExecution.go +++ b/service/ssm/api_op_GetMaintenanceWindowExecution.go @@ -69,6 +69,9 @@ func addOperationGetMaintenanceWindowExecutionMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetMaintenanceWindowExecutionMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go b/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go index 108f0135de3..48427073542 100644 --- a/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go +++ b/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go @@ -105,6 +105,9 @@ func addOperationGetMaintenanceWindowExecutionTaskMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationGetMaintenanceWindowExecutionTaskMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go b/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go index e3f3d7dbf80..2ab1b908af5 100644 --- a/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go +++ b/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go @@ -101,6 +101,9 @@ func addOperationGetMaintenanceWindowExecutionTaskInvocationMiddlewares(stack *m if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationGetMaintenanceWindowExecutionTaskInvocationMiddlewares(stack *m if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetMaintenanceWindowTask.go b/service/ssm/api_op_GetMaintenanceWindowTask.go index 6f41316aefe..fb275278870 100644 --- a/service/ssm/api_op_GetMaintenanceWindowTask.go +++ b/service/ssm/api_op_GetMaintenanceWindowTask.go @@ -111,6 +111,9 @@ func addOperationGetMaintenanceWindowTaskMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationGetMaintenanceWindowTaskMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetOpsItem.go b/service/ssm/api_op_GetOpsItem.go index 203eb24914d..8bf0d94c6a3 100644 --- a/service/ssm/api_op_GetOpsItem.go +++ b/service/ssm/api_op_GetOpsItem.go @@ -62,6 +62,9 @@ func addOperationGetOpsItemMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetOpsItemMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetOpsSummary.go b/service/ssm/api_op_GetOpsSummary.go index cf02118fcfa..2036ba304d1 100644 --- a/service/ssm/api_op_GetOpsSummary.go +++ b/service/ssm/api_op_GetOpsSummary.go @@ -72,6 +72,9 @@ func addOperationGetOpsSummaryMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetOpsSummaryMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetParameter.go b/service/ssm/api_op_GetParameter.go index 6362a23a101..30ff70051fd 100644 --- a/service/ssm/api_op_GetParameter.go +++ b/service/ssm/api_op_GetParameter.go @@ -58,6 +58,9 @@ func addOperationGetParameterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetParameterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetParameterHistory.go b/service/ssm/api_op_GetParameterHistory.go index 0969ce1913f..34e1fd0eb82 100644 --- a/service/ssm/api_op_GetParameterHistory.go +++ b/service/ssm/api_op_GetParameterHistory.go @@ -69,6 +69,9 @@ func addOperationGetParameterHistoryMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetParameterHistoryMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetParameters.go b/service/ssm/api_op_GetParameters.go index f6fc3092723..b4d7e3fb8d7 100644 --- a/service/ssm/api_op_GetParameters.go +++ b/service/ssm/api_op_GetParameters.go @@ -62,6 +62,9 @@ func addOperationGetParametersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetParametersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetParametersByPath.go b/service/ssm/api_op_GetParametersByPath.go index 4430bceea2b..ba57427a647 100644 --- a/service/ssm/api_op_GetParametersByPath.go +++ b/service/ssm/api_op_GetParametersByPath.go @@ -89,6 +89,9 @@ func addOperationGetParametersByPathMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetParametersByPathMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetPatchBaseline.go b/service/ssm/api_op_GetPatchBaseline.go index bb74ec2c8ce..9fd6f138b2d 100644 --- a/service/ssm/api_op_GetPatchBaseline.go +++ b/service/ssm/api_op_GetPatchBaseline.go @@ -102,6 +102,9 @@ func addOperationGetPatchBaselineMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationGetPatchBaselineMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetPatchBaselineForPatchGroup.go b/service/ssm/api_op_GetPatchBaselineForPatchGroup.go index 67ecd2aa45d..139ef92b97d 100644 --- a/service/ssm/api_op_GetPatchBaselineForPatchGroup.go +++ b/service/ssm/api_op_GetPatchBaselineForPatchGroup.go @@ -63,6 +63,9 @@ func addOperationGetPatchBaselineForPatchGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetPatchBaselineForPatchGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_GetServiceSetting.go b/service/ssm/api_op_GetServiceSetting.go index a00f3deb8fd..16a00634262 100644 --- a/service/ssm/api_op_GetServiceSetting.go +++ b/service/ssm/api_op_GetServiceSetting.go @@ -70,6 +70,9 @@ func addOperationGetServiceSettingMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationGetServiceSettingMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_LabelParameterVersion.go b/service/ssm/api_op_LabelParameterVersion.go index a122618757e..2971e95234e 100644 --- a/service/ssm/api_op_LabelParameterVersion.go +++ b/service/ssm/api_op_LabelParameterVersion.go @@ -101,6 +101,9 @@ func addOperationLabelParameterVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationLabelParameterVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListAssociationVersions.go b/service/ssm/api_op_ListAssociationVersions.go index 164e1d03648..550e451f4f6 100644 --- a/service/ssm/api_op_ListAssociationVersions.go +++ b/service/ssm/api_op_ListAssociationVersions.go @@ -65,6 +65,9 @@ func addOperationListAssociationVersionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAssociationVersionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListAssociations.go b/service/ssm/api_op_ListAssociations.go index 0e4a33f5e4e..76052b43853 100644 --- a/service/ssm/api_op_ListAssociations.go +++ b/service/ssm/api_op_ListAssociations.go @@ -65,6 +65,9 @@ func addOperationListAssociationsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAssociationsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListCommandInvocations.go b/service/ssm/api_op_ListCommandInvocations.go index 8c9e4656632..19ef33d5f57 100644 --- a/service/ssm/api_op_ListCommandInvocations.go +++ b/service/ssm/api_op_ListCommandInvocations.go @@ -79,6 +79,9 @@ func addOperationListCommandInvocationsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListCommandInvocationsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListCommands.go b/service/ssm/api_op_ListCommands.go index dc562d902c0..49ce33c2d88 100644 --- a/service/ssm/api_op_ListCommands.go +++ b/service/ssm/api_op_ListCommands.go @@ -73,6 +73,9 @@ func addOperationListCommandsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListCommandsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListComplianceItems.go b/service/ssm/api_op_ListComplianceItems.go index ac6c328a62a..8e18603e8d1 100644 --- a/service/ssm/api_op_ListComplianceItems.go +++ b/service/ssm/api_op_ListComplianceItems.go @@ -74,6 +74,9 @@ func addOperationListComplianceItemsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListComplianceItemsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListComplianceSummaries.go b/service/ssm/api_op_ListComplianceSummaries.go index 56ad1bbf4a5..61d30d7f482 100644 --- a/service/ssm/api_op_ListComplianceSummaries.go +++ b/service/ssm/api_op_ListComplianceSummaries.go @@ -69,6 +69,9 @@ func addOperationListComplianceSummariesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationListComplianceSummariesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListDocumentVersions.go b/service/ssm/api_op_ListDocumentVersions.go index 5bfbf1398b6..a6303e18c0c 100644 --- a/service/ssm/api_op_ListDocumentVersions.go +++ b/service/ssm/api_op_ListDocumentVersions.go @@ -65,6 +65,9 @@ func addOperationListDocumentVersionsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListDocumentVersionsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListDocuments.go b/service/ssm/api_op_ListDocuments.go index 8d8ec807b75..e9333b078ba 100644 --- a/service/ssm/api_op_ListDocuments.go +++ b/service/ssm/api_op_ListDocuments.go @@ -72,6 +72,9 @@ func addOperationListDocumentsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListDocumentsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListInventoryEntries.go b/service/ssm/api_op_ListInventoryEntries.go index af15e5fd0fd..c75c00e20f8 100644 --- a/service/ssm/api_op_ListInventoryEntries.go +++ b/service/ssm/api_op_ListInventoryEntries.go @@ -85,6 +85,9 @@ func addOperationListInventoryEntriesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListInventoryEntriesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListResourceComplianceSummaries.go b/service/ssm/api_op_ListResourceComplianceSummaries.go index 15a0c6b74b4..ef45249ae3d 100644 --- a/service/ssm/api_op_ListResourceComplianceSummaries.go +++ b/service/ssm/api_op_ListResourceComplianceSummaries.go @@ -67,6 +67,9 @@ func addOperationListResourceComplianceSummariesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListResourceComplianceSummariesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListResourceDataSync.go b/service/ssm/api_op_ListResourceDataSync.go index 493b499169a..1113911aeb2 100644 --- a/service/ssm/api_op_ListResourceDataSync.go +++ b/service/ssm/api_op_ListResourceDataSync.go @@ -73,6 +73,9 @@ func addOperationListResourceDataSyncMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListResourceDataSyncMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ListTagsForResource.go b/service/ssm/api_op_ListTagsForResource.go index 592f0e0f7b3..239ec125348 100644 --- a/service/ssm/api_op_ListTagsForResource.go +++ b/service/ssm/api_op_ListTagsForResource.go @@ -58,6 +58,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ModifyDocumentPermission.go b/service/ssm/api_op_ModifyDocumentPermission.go index 18d872e11f6..8962eba6e28 100644 --- a/service/ssm/api_op_ModifyDocumentPermission.go +++ b/service/ssm/api_op_ModifyDocumentPermission.go @@ -71,6 +71,9 @@ func addOperationModifyDocumentPermissionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationModifyDocumentPermissionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_PutComplianceItems.go b/service/ssm/api_op_PutComplianceItems.go index f7259ce9bc4..e65da3123d2 100644 --- a/service/ssm/api_op_PutComplianceItems.go +++ b/service/ssm/api_op_PutComplianceItems.go @@ -139,6 +139,9 @@ func addOperationPutComplianceItemsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationPutComplianceItemsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_PutInventory.go b/service/ssm/api_op_PutInventory.go index 5f5b9fd8776..ad73d5f5c11 100644 --- a/service/ssm/api_op_PutInventory.go +++ b/service/ssm/api_op_PutInventory.go @@ -60,6 +60,9 @@ func addOperationPutInventoryMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationPutInventoryMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_PutParameter.go b/service/ssm/api_op_PutParameter.go index 19d9113db59..4d8f134b6aa 100644 --- a/service/ssm/api_op_PutParameter.go +++ b/service/ssm/api_op_PutParameter.go @@ -248,6 +248,9 @@ func addOperationPutParameterMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -290,6 +293,9 @@ func addOperationPutParameterMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_RegisterDefaultPatchBaseline.go b/service/ssm/api_op_RegisterDefaultPatchBaseline.go index 69431ff67d6..67d34afe4ba 100644 --- a/service/ssm/api_op_RegisterDefaultPatchBaseline.go +++ b/service/ssm/api_op_RegisterDefaultPatchBaseline.go @@ -56,6 +56,9 @@ func addOperationRegisterDefaultPatchBaselineMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationRegisterDefaultPatchBaselineMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go b/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go index ee2e1182c57..1471aeaadce 100644 --- a/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go +++ b/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go @@ -60,6 +60,9 @@ func addOperationRegisterPatchBaselineForPatchGroupMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationRegisterPatchBaselineForPatchGroupMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go b/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go index 6a280ebdbea..0bf7eea3dec 100644 --- a/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go +++ b/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go @@ -94,6 +94,9 @@ func addOperationRegisterTargetWithMaintenanceWindowMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationRegisterTargetWithMaintenanceWindowMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go b/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go index 5938b77a485..fb6e8b332a9 100644 --- a/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go +++ b/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go @@ -131,6 +131,9 @@ func addOperationRegisterTaskWithMaintenanceWindowMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -176,6 +179,9 @@ func addOperationRegisterTaskWithMaintenanceWindowMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_RemoveTagsFromResource.go b/service/ssm/api_op_RemoveTagsFromResource.go index 65725700b82..2c4f11fa53e 100644 --- a/service/ssm/api_op_RemoveTagsFromResource.go +++ b/service/ssm/api_op_RemoveTagsFromResource.go @@ -67,6 +67,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ResetServiceSetting.go b/service/ssm/api_op_ResetServiceSetting.go index e7815c6625f..d42da750935 100644 --- a/service/ssm/api_op_ResetServiceSetting.go +++ b/service/ssm/api_op_ResetServiceSetting.go @@ -72,6 +72,9 @@ func addOperationResetServiceSettingMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationResetServiceSettingMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_ResumeSession.go b/service/ssm/api_op_ResumeSession.go index 7332cb7e02c..7630c23112d 100644 --- a/service/ssm/api_op_ResumeSession.go +++ b/service/ssm/api_op_ResumeSession.go @@ -70,6 +70,9 @@ func addOperationResumeSessionMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationResumeSessionMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_SendAutomationSignal.go b/service/ssm/api_op_SendAutomationSignal.go index c688350bcd8..d2246cd62e2 100644 --- a/service/ssm/api_op_SendAutomationSignal.go +++ b/service/ssm/api_op_SendAutomationSignal.go @@ -66,6 +66,9 @@ func addOperationSendAutomationSignalMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationSendAutomationSignalMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_SendCommand.go b/service/ssm/api_op_SendCommand.go index e5bd518a3a2..87eddba38ac 100644 --- a/service/ssm/api_op_SendCommand.go +++ b/service/ssm/api_op_SendCommand.go @@ -142,6 +142,9 @@ func addOperationSendCommandMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -184,6 +187,9 @@ func addOperationSendCommandMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_StartAssociationsOnce.go b/service/ssm/api_op_StartAssociationsOnce.go index d6c1da41704..1d513f6da80 100644 --- a/service/ssm/api_op_StartAssociationsOnce.go +++ b/service/ssm/api_op_StartAssociationsOnce.go @@ -49,6 +49,9 @@ func addOperationStartAssociationsOnceMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationStartAssociationsOnceMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_StartAutomationExecution.go b/service/ssm/api_op_StartAutomationExecution.go index 14271133328..4c8c9817487 100644 --- a/service/ssm/api_op_StartAutomationExecution.go +++ b/service/ssm/api_op_StartAutomationExecution.go @@ -122,6 +122,9 @@ func addOperationStartAutomationExecutionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationStartAutomationExecutionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_StartSession.go b/service/ssm/api_op_StartSession.go index cab0a6f1c91..9cc12508ef0 100644 --- a/service/ssm/api_op_StartSession.go +++ b/service/ssm/api_op_StartSession.go @@ -86,6 +86,9 @@ func addOperationStartSessionMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationStartSessionMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_StopAutomationExecution.go b/service/ssm/api_op_StopAutomationExecution.go index 3bf89a879f4..4b66fd40c98 100644 --- a/service/ssm/api_op_StopAutomationExecution.go +++ b/service/ssm/api_op_StopAutomationExecution.go @@ -53,6 +53,9 @@ func addOperationStopAutomationExecutionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStopAutomationExecutionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_TerminateSession.go b/service/ssm/api_op_TerminateSession.go index 21047a3c290..24a75d9148d 100644 --- a/service/ssm/api_op_TerminateSession.go +++ b/service/ssm/api_op_TerminateSession.go @@ -54,6 +54,9 @@ func addOperationTerminateSessionMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationTerminateSessionMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateAssociation.go b/service/ssm/api_op_UpdateAssociation.go index 153b9f585c0..ba70f4c3a8f 100644 --- a/service/ssm/api_op_UpdateAssociation.go +++ b/service/ssm/api_op_UpdateAssociation.go @@ -150,6 +150,9 @@ func addOperationUpdateAssociationMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationUpdateAssociationMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateAssociationStatus.go b/service/ssm/api_op_UpdateAssociationStatus.go index 1ad1fd48bc0..320a3eaa3b4 100644 --- a/service/ssm/api_op_UpdateAssociationStatus.go +++ b/service/ssm/api_op_UpdateAssociationStatus.go @@ -64,6 +64,9 @@ func addOperationUpdateAssociationStatusMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateAssociationStatusMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateDocument.go b/service/ssm/api_op_UpdateDocument.go index 161317fe264..686ca2281a5 100644 --- a/service/ssm/api_op_UpdateDocument.go +++ b/service/ssm/api_op_UpdateDocument.go @@ -79,6 +79,9 @@ func addOperationUpdateDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateDocumentDefaultVersion.go b/service/ssm/api_op_UpdateDocumentDefaultVersion.go index ec353015e67..272ed554a2a 100644 --- a/service/ssm/api_op_UpdateDocumentDefaultVersion.go +++ b/service/ssm/api_op_UpdateDocumentDefaultVersion.go @@ -59,6 +59,9 @@ func addOperationUpdateDocumentDefaultVersionMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateDocumentDefaultVersionMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateMaintenanceWindow.go b/service/ssm/api_op_UpdateMaintenanceWindow.go index 44388e570c2..8ad5decff98 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindow.go +++ b/service/ssm/api_op_UpdateMaintenanceWindow.go @@ -153,6 +153,9 @@ func addOperationUpdateMaintenanceWindowMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -195,6 +198,9 @@ func addOperationUpdateMaintenanceWindowMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateMaintenanceWindowTarget.go b/service/ssm/api_op_UpdateMaintenanceWindowTarget.go index 116e95a6efa..8814d3ade3c 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindowTarget.go +++ b/service/ssm/api_op_UpdateMaintenanceWindowTarget.go @@ -109,6 +109,9 @@ func addOperationUpdateMaintenanceWindowTargetMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationUpdateMaintenanceWindowTargetMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateMaintenanceWindowTask.go b/service/ssm/api_op_UpdateMaintenanceWindowTask.go index 9191308902a..cf1a647029d 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindowTask.go +++ b/service/ssm/api_op_UpdateMaintenanceWindowTask.go @@ -209,6 +209,9 @@ func addOperationUpdateMaintenanceWindowTaskMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -251,6 +254,9 @@ func addOperationUpdateMaintenanceWindowTaskMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateManagedInstanceRole.go b/service/ssm/api_op_UpdateManagedInstanceRole.go index 77d939f6cf1..2efe40ed858 100644 --- a/service/ssm/api_op_UpdateManagedInstanceRole.go +++ b/service/ssm/api_op_UpdateManagedInstanceRole.go @@ -56,6 +56,9 @@ func addOperationUpdateManagedInstanceRoleMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateManagedInstanceRoleMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateOpsItem.go b/service/ssm/api_op_UpdateOpsItem.go index cde37fc9962..5da8ea056bf 100644 --- a/service/ssm/api_op_UpdateOpsItem.go +++ b/service/ssm/api_op_UpdateOpsItem.go @@ -113,6 +113,9 @@ func addOperationUpdateOpsItemMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationUpdateOpsItemMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdatePatchBaseline.go b/service/ssm/api_op_UpdatePatchBaseline.go index aa54d05f52f..88d224b7fed 100644 --- a/service/ssm/api_op_UpdatePatchBaseline.go +++ b/service/ssm/api_op_UpdatePatchBaseline.go @@ -160,6 +160,9 @@ func addOperationUpdatePatchBaselineMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -202,6 +205,9 @@ func addOperationUpdatePatchBaselineMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateResourceDataSync.go b/service/ssm/api_op_UpdateResourceDataSync.go index 40b9af2c3f0..a1336615ff5 100644 --- a/service/ssm/api_op_UpdateResourceDataSync.go +++ b/service/ssm/api_op_UpdateResourceDataSync.go @@ -65,6 +65,9 @@ func addOperationUpdateResourceDataSyncMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationUpdateResourceDataSyncMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/api_op_UpdateServiceSetting.go b/service/ssm/api_op_UpdateServiceSetting.go index f97db113799..8e75a924360 100644 --- a/service/ssm/api_op_UpdateServiceSetting.go +++ b/service/ssm/api_op_UpdateServiceSetting.go @@ -90,6 +90,9 @@ func addOperationUpdateServiceSettingMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationUpdateServiceSettingMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssm/go.mod b/service/ssm/go.mod index 8384eceae66..b1402f2bdd4 100644 --- a/service/ssm/go.mod +++ b/service/ssm/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ssm go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssm/go.sum b/service/ssm/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ssm/go.sum +++ b/service/ssm/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sso/api_client.go b/service/sso/api_client.go index 2c869570788..998d84f311a 100644 --- a/service/sso/api_client.go +++ b/service/sso/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sso/api_op_GetRoleCredentials.go b/service/sso/api_op_GetRoleCredentials.go index 78e2aeeee5e..3f9f43eb19d 100644 --- a/service/sso/api_op_GetRoleCredentials.go +++ b/service/sso/api_op_GetRoleCredentials.go @@ -66,6 +66,9 @@ func addOperationGetRoleCredentialsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetRoleCredentialsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sso/api_op_ListAccountRoles.go b/service/sso/api_op_ListAccountRoles.go index 4bbb694a78c..c676f0d11f6 100644 --- a/service/sso/api_op_ListAccountRoles.go +++ b/service/sso/api_op_ListAccountRoles.go @@ -71,6 +71,9 @@ func addOperationListAccountRolesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListAccountRolesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sso/api_op_ListAccounts.go b/service/sso/api_op_ListAccounts.go index 8274a5b1f8f..a630d9f8e93 100644 --- a/service/sso/api_op_ListAccounts.go +++ b/service/sso/api_op_ListAccounts.go @@ -69,6 +69,9 @@ func addOperationListAccountsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListAccountsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sso/api_op_Logout.go b/service/sso/api_op_Logout.go index 869a813f065..9507f8f66c5 100644 --- a/service/sso/api_op_Logout.go +++ b/service/sso/api_op_Logout.go @@ -50,6 +50,9 @@ func addOperationLogoutMiddlewares(stack *middleware.Stack, options Options) (er if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -86,6 +89,9 @@ func addOperationLogoutMiddlewares(stack *middleware.Stack, options Options) (er if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sso/go.mod b/service/sso/go.mod index 44b724f173f..2af552b6e79 100644 --- a/service/sso/go.mod +++ b/service/sso/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sso go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sso/go.sum b/service/sso/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sso/go.sum +++ b/service/sso/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ssoadmin/api_client.go b/service/ssoadmin/api_client.go index c6c5737168a..47f6d75df74 100644 --- a/service/ssoadmin/api_client.go +++ b/service/ssoadmin/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ssoadmin/api_op_AttachManagedPolicyToPermissionSet.go b/service/ssoadmin/api_op_AttachManagedPolicyToPermissionSet.go index 3a3f3a2d1a7..d4436945f02 100644 --- a/service/ssoadmin/api_op_AttachManagedPolicyToPermissionSet.go +++ b/service/ssoadmin/api_op_AttachManagedPolicyToPermissionSet.go @@ -63,6 +63,9 @@ func addOperationAttachManagedPolicyToPermissionSetMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAttachManagedPolicyToPermissionSetMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_CreateAccountAssignment.go b/service/ssoadmin/api_op_CreateAccountAssignment.go index fa292f1a904..c0b2f560c5a 100644 --- a/service/ssoadmin/api_op_CreateAccountAssignment.go +++ b/service/ssoadmin/api_op_CreateAccountAssignment.go @@ -92,6 +92,9 @@ func addOperationCreateAccountAssignmentMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationCreateAccountAssignmentMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_CreatePermissionSet.go b/service/ssoadmin/api_op_CreatePermissionSet.go index acd2768228f..9f4700c2bea 100644 --- a/service/ssoadmin/api_op_CreatePermissionSet.go +++ b/service/ssoadmin/api_op_CreatePermissionSet.go @@ -75,6 +75,9 @@ func addOperationCreatePermissionSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationCreatePermissionSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DeleteAccountAssignment.go b/service/ssoadmin/api_op_DeleteAccountAssignment.go index f7499770e87..05e06c3c866 100644 --- a/service/ssoadmin/api_op_DeleteAccountAssignment.go +++ b/service/ssoadmin/api_op_DeleteAccountAssignment.go @@ -85,6 +85,9 @@ func addOperationDeleteAccountAssignmentMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDeleteAccountAssignmentMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DeleteInlinePolicyFromPermissionSet.go b/service/ssoadmin/api_op_DeleteInlinePolicyFromPermissionSet.go index 8f8772ca55a..e1157c69416 100644 --- a/service/ssoadmin/api_op_DeleteInlinePolicyFromPermissionSet.go +++ b/service/ssoadmin/api_op_DeleteInlinePolicyFromPermissionSet.go @@ -55,6 +55,9 @@ func addOperationDeleteInlinePolicyFromPermissionSetMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteInlinePolicyFromPermissionSetMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DeletePermissionSet.go b/service/ssoadmin/api_op_DeletePermissionSet.go index ee0f20757dc..d9ae08efa84 100644 --- a/service/ssoadmin/api_op_DeletePermissionSet.go +++ b/service/ssoadmin/api_op_DeletePermissionSet.go @@ -55,6 +55,9 @@ func addOperationDeletePermissionSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeletePermissionSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DescribeAccountAssignmentCreationStatus.go b/service/ssoadmin/api_op_DescribeAccountAssignmentCreationStatus.go index c6643ba3c65..b364a129e1a 100644 --- a/service/ssoadmin/api_op_DescribeAccountAssignmentCreationStatus.go +++ b/service/ssoadmin/api_op_DescribeAccountAssignmentCreationStatus.go @@ -60,6 +60,9 @@ func addOperationDescribeAccountAssignmentCreationStatusMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeAccountAssignmentCreationStatusMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DescribeAccountAssignmentDeletionStatus.go b/service/ssoadmin/api_op_DescribeAccountAssignmentDeletionStatus.go index 21d6db98bbf..db34f8b6e66 100644 --- a/service/ssoadmin/api_op_DescribeAccountAssignmentDeletionStatus.go +++ b/service/ssoadmin/api_op_DescribeAccountAssignmentDeletionStatus.go @@ -60,6 +60,9 @@ func addOperationDescribeAccountAssignmentDeletionStatusMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeAccountAssignmentDeletionStatusMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DescribePermissionSet.go b/service/ssoadmin/api_op_DescribePermissionSet.go index 5135a3f1ae1..c25067b14ee 100644 --- a/service/ssoadmin/api_op_DescribePermissionSet.go +++ b/service/ssoadmin/api_op_DescribePermissionSet.go @@ -60,6 +60,9 @@ func addOperationDescribePermissionSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribePermissionSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DescribePermissionSetProvisioningStatus.go b/service/ssoadmin/api_op_DescribePermissionSetProvisioningStatus.go index a1640f90082..ee3be4101ca 100644 --- a/service/ssoadmin/api_op_DescribePermissionSetProvisioningStatus.go +++ b/service/ssoadmin/api_op_DescribePermissionSetProvisioningStatus.go @@ -61,6 +61,9 @@ func addOperationDescribePermissionSetProvisioningStatusMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribePermissionSetProvisioningStatusMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_DetachManagedPolicyFromPermissionSet.go b/service/ssoadmin/api_op_DetachManagedPolicyFromPermissionSet.go index 1e9f88fea21..ff1c9d92674 100644 --- a/service/ssoadmin/api_op_DetachManagedPolicyFromPermissionSet.go +++ b/service/ssoadmin/api_op_DetachManagedPolicyFromPermissionSet.go @@ -60,6 +60,9 @@ func addOperationDetachManagedPolicyFromPermissionSetMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDetachManagedPolicyFromPermissionSetMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_GetInlinePolicyForPermissionSet.go b/service/ssoadmin/api_op_GetInlinePolicyForPermissionSet.go index 442d4064fec..f98ce6d536c 100644 --- a/service/ssoadmin/api_op_GetInlinePolicyForPermissionSet.go +++ b/service/ssoadmin/api_op_GetInlinePolicyForPermissionSet.go @@ -59,6 +59,9 @@ func addOperationGetInlinePolicyForPermissionSetMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetInlinePolicyForPermissionSetMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListAccountAssignmentCreationStatus.go b/service/ssoadmin/api_op_ListAccountAssignmentCreationStatus.go index 9214b4875cc..0a133c66897 100644 --- a/service/ssoadmin/api_op_ListAccountAssignmentCreationStatus.go +++ b/service/ssoadmin/api_op_ListAccountAssignmentCreationStatus.go @@ -70,6 +70,9 @@ func addOperationListAccountAssignmentCreationStatusMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListAccountAssignmentCreationStatusMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListAccountAssignmentDeletionStatus.go b/service/ssoadmin/api_op_ListAccountAssignmentDeletionStatus.go index 8a9def8abf9..11ea3c19be0 100644 --- a/service/ssoadmin/api_op_ListAccountAssignmentDeletionStatus.go +++ b/service/ssoadmin/api_op_ListAccountAssignmentDeletionStatus.go @@ -70,6 +70,9 @@ func addOperationListAccountAssignmentDeletionStatusMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListAccountAssignmentDeletionStatusMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListAccountAssignments.go b/service/ssoadmin/api_op_ListAccountAssignments.go index 9d8e3b7a92d..8309f229552 100644 --- a/service/ssoadmin/api_op_ListAccountAssignments.go +++ b/service/ssoadmin/api_op_ListAccountAssignments.go @@ -77,6 +77,9 @@ func addOperationListAccountAssignmentsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationListAccountAssignmentsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListAccountsForProvisionedPermissionSet.go b/service/ssoadmin/api_op_ListAccountsForProvisionedPermissionSet.go index 95e1da50a6b..a6fbe2d39e9 100644 --- a/service/ssoadmin/api_op_ListAccountsForProvisionedPermissionSet.go +++ b/service/ssoadmin/api_op_ListAccountsForProvisionedPermissionSet.go @@ -75,6 +75,9 @@ func addOperationListAccountsForProvisionedPermissionSetMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListAccountsForProvisionedPermissionSetMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListInstances.go b/service/ssoadmin/api_op_ListInstances.go index c0d47815663..a58454abbb3 100644 --- a/service/ssoadmin/api_op_ListInstances.go +++ b/service/ssoadmin/api_op_ListInstances.go @@ -59,6 +59,9 @@ func addOperationListInstancesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListInstancesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListManagedPoliciesInPermissionSet.go b/service/ssoadmin/api_op_ListManagedPoliciesInPermissionSet.go index 0d6f6da2df5..a307716f878 100644 --- a/service/ssoadmin/api_op_ListManagedPoliciesInPermissionSet.go +++ b/service/ssoadmin/api_op_ListManagedPoliciesInPermissionSet.go @@ -71,6 +71,9 @@ func addOperationListManagedPoliciesInPermissionSetMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListManagedPoliciesInPermissionSetMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListPermissionSetProvisioningStatus.go b/service/ssoadmin/api_op_ListPermissionSetProvisioningStatus.go index 4dbef1040b8..ffc4fa336fd 100644 --- a/service/ssoadmin/api_op_ListPermissionSetProvisioningStatus.go +++ b/service/ssoadmin/api_op_ListPermissionSetProvisioningStatus.go @@ -70,6 +70,9 @@ func addOperationListPermissionSetProvisioningStatusMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListPermissionSetProvisioningStatusMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListPermissionSets.go b/service/ssoadmin/api_op_ListPermissionSets.go index b5285759f5c..8938355ab85 100644 --- a/service/ssoadmin/api_op_ListPermissionSets.go +++ b/service/ssoadmin/api_op_ListPermissionSets.go @@ -65,6 +65,9 @@ func addOperationListPermissionSetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListPermissionSetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListPermissionSetsProvisionedToAccount.go b/service/ssoadmin/api_op_ListPermissionSetsProvisionedToAccount.go index 42bedb103e9..e23ea6f1621 100644 --- a/service/ssoadmin/api_op_ListPermissionSetsProvisionedToAccount.go +++ b/service/ssoadmin/api_op_ListPermissionSetsProvisionedToAccount.go @@ -74,6 +74,9 @@ func addOperationListPermissionSetsProvisionedToAccountMiddlewares(stack *middle if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListPermissionSetsProvisionedToAccountMiddlewares(stack *middle if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ListTagsForResource.go b/service/ssoadmin/api_op_ListTagsForResource.go index b2f8ded541f..7377b64c1c6 100644 --- a/service/ssoadmin/api_op_ListTagsForResource.go +++ b/service/ssoadmin/api_op_ListTagsForResource.go @@ -68,6 +68,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_ProvisionPermissionSet.go b/service/ssoadmin/api_op_ProvisionPermissionSet.go index 15169b16fec..8a02b53a27e 100644 --- a/service/ssoadmin/api_op_ProvisionPermissionSet.go +++ b/service/ssoadmin/api_op_ProvisionPermissionSet.go @@ -70,6 +70,9 @@ func addOperationProvisionPermissionSetMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationProvisionPermissionSetMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_PutInlinePolicyToPermissionSet.go b/service/ssoadmin/api_op_PutInlinePolicyToPermissionSet.go index efe26e85efd..7665f2512cd 100644 --- a/service/ssoadmin/api_op_PutInlinePolicyToPermissionSet.go +++ b/service/ssoadmin/api_op_PutInlinePolicyToPermissionSet.go @@ -63,6 +63,9 @@ func addOperationPutInlinePolicyToPermissionSetMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationPutInlinePolicyToPermissionSetMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_TagResource.go b/service/ssoadmin/api_op_TagResource.go index b7370699602..af14555e052 100644 --- a/service/ssoadmin/api_op_TagResource.go +++ b/service/ssoadmin/api_op_TagResource.go @@ -61,6 +61,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_UntagResource.go b/service/ssoadmin/api_op_UntagResource.go index 7352122b503..f1005afb15f 100644 --- a/service/ssoadmin/api_op_UntagResource.go +++ b/service/ssoadmin/api_op_UntagResource.go @@ -60,6 +60,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/api_op_UpdatePermissionSet.go b/service/ssoadmin/api_op_UpdatePermissionSet.go index 65acbc121a6..d1a9d2160cf 100644 --- a/service/ssoadmin/api_op_UpdatePermissionSet.go +++ b/service/ssoadmin/api_op_UpdatePermissionSet.go @@ -66,6 +66,9 @@ func addOperationUpdatePermissionSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationUpdatePermissionSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssoadmin/go.mod b/service/ssoadmin/go.mod index dad25e71af8..06deea241f4 100644 --- a/service/ssoadmin/go.mod +++ b/service/ssoadmin/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ssoadmin go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssoadmin/go.sum b/service/ssoadmin/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ssoadmin/go.sum +++ b/service/ssoadmin/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ssooidc/api_client.go b/service/ssooidc/api_client.go index dd3fb0d523b..e04aabec8b0 100644 --- a/service/ssooidc/api_client.go +++ b/service/ssooidc/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/ssooidc/api_op_CreateToken.go b/service/ssooidc/api_op_CreateToken.go index bbc472d8188..e44b948c83e 100644 --- a/service/ssooidc/api_op_CreateToken.go +++ b/service/ssooidc/api_op_CreateToken.go @@ -67,6 +67,9 @@ func addOperationCreateTokenMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationCreateTokenMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssooidc/api_op_RegisterClient.go b/service/ssooidc/api_op_RegisterClient.go index 6958714f129..a5d9da71719 100644 --- a/service/ssooidc/api_op_RegisterClient.go +++ b/service/ssooidc/api_op_RegisterClient.go @@ -59,6 +59,9 @@ func addOperationRegisterClientMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRegisterClientMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssooidc/api_op_StartDeviceAuthorization.go b/service/ssooidc/api_op_StartDeviceAuthorization.go index 5843c83c823..776ebe111c2 100644 --- a/service/ssooidc/api_op_StartDeviceAuthorization.go +++ b/service/ssooidc/api_op_StartDeviceAuthorization.go @@ -59,6 +59,9 @@ func addOperationStartDeviceAuthorizationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationStartDeviceAuthorizationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/ssooidc/go.mod b/service/ssooidc/go.mod index ea57d5b0eb4..d29a2b26026 100644 --- a/service/ssooidc/go.mod +++ b/service/ssooidc/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/ssooidc go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssooidc/go.sum b/service/ssooidc/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/ssooidc/go.sum +++ b/service/ssooidc/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/storagegateway/api_client.go b/service/storagegateway/api_client.go index bb02b8b5efc..5da7e555250 100644 --- a/service/storagegateway/api_client.go +++ b/service/storagegateway/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/storagegateway/api_op_ActivateGateway.go b/service/storagegateway/api_op_ActivateGateway.go index 07484099a84..b021b6e6d43 100644 --- a/service/storagegateway/api_op_ActivateGateway.go +++ b/service/storagegateway/api_op_ActivateGateway.go @@ -141,6 +141,9 @@ func addOperationActivateGatewayMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -183,6 +186,9 @@ func addOperationActivateGatewayMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_AddCache.go b/service/storagegateway/api_op_AddCache.go index 4817ac0434b..c9ab020d5c9 100644 --- a/service/storagegateway/api_op_AddCache.go +++ b/service/storagegateway/api_op_AddCache.go @@ -66,6 +66,9 @@ func addOperationAddCacheMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationAddCacheMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_AddTagsToResource.go b/service/storagegateway/api_op_AddTagsToResource.go index 3de5f35390b..83f4072eb58 100644 --- a/service/storagegateway/api_op_AddTagsToResource.go +++ b/service/storagegateway/api_op_AddTagsToResource.go @@ -81,6 +81,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationAddTagsToResourceMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_AddUploadBuffer.go b/service/storagegateway/api_op_AddUploadBuffer.go index 6cf5b90c5df..d8a8850af3e 100644 --- a/service/storagegateway/api_op_AddUploadBuffer.go +++ b/service/storagegateway/api_op_AddUploadBuffer.go @@ -65,6 +65,9 @@ func addOperationAddUploadBufferMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAddUploadBufferMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_AddWorkingStorage.go b/service/storagegateway/api_op_AddWorkingStorage.go index 39fb90250dd..bfafe07a4ec 100644 --- a/service/storagegateway/api_op_AddWorkingStorage.go +++ b/service/storagegateway/api_op_AddWorkingStorage.go @@ -74,6 +74,9 @@ func addOperationAddWorkingStorageMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationAddWorkingStorageMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_AssignTapePool.go b/service/storagegateway/api_op_AssignTapePool.go index b94780eceb0..393b794b997 100644 --- a/service/storagegateway/api_op_AssignTapePool.go +++ b/service/storagegateway/api_op_AssignTapePool.go @@ -75,6 +75,9 @@ func addOperationAssignTapePoolMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationAssignTapePoolMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_AttachVolume.go b/service/storagegateway/api_op_AttachVolume.go index db59585b25d..0e68b1a5dc1 100644 --- a/service/storagegateway/api_op_AttachVolume.go +++ b/service/storagegateway/api_op_AttachVolume.go @@ -89,6 +89,9 @@ func addOperationAttachVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationAttachVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CancelArchival.go b/service/storagegateway/api_op_CancelArchival.go index 9a5cbaf489c..492b5b261f6 100644 --- a/service/storagegateway/api_op_CancelArchival.go +++ b/service/storagegateway/api_op_CancelArchival.go @@ -64,6 +64,9 @@ func addOperationCancelArchivalMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCancelArchivalMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CancelRetrieval.go b/service/storagegateway/api_op_CancelRetrieval.go index 771ed0a78a2..713ee0c38b7 100644 --- a/service/storagegateway/api_op_CancelRetrieval.go +++ b/service/storagegateway/api_op_CancelRetrieval.go @@ -64,6 +64,9 @@ func addOperationCancelRetrievalMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCancelRetrievalMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateCachediSCSIVolume.go b/service/storagegateway/api_op_CreateCachediSCSIVolume.go index b41fb355be0..addc8a61e5c 100644 --- a/service/storagegateway/api_op_CreateCachediSCSIVolume.go +++ b/service/storagegateway/api_op_CreateCachediSCSIVolume.go @@ -129,6 +129,9 @@ func addOperationCreateCachediSCSIVolumeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -171,6 +174,9 @@ func addOperationCreateCachediSCSIVolumeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateNFSFileShare.go b/service/storagegateway/api_op_CreateNFSFileShare.go index e086854a818..95b99870dbf 100644 --- a/service/storagegateway/api_op_CreateNFSFileShare.go +++ b/service/storagegateway/api_op_CreateNFSFileShare.go @@ -157,6 +157,9 @@ func addOperationCreateNFSFileShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -199,6 +202,9 @@ func addOperationCreateNFSFileShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateSMBFileShare.go b/service/storagegateway/api_op_CreateSMBFileShare.go index 3eb62af630d..664b4e93d06 100644 --- a/service/storagegateway/api_op_CreateSMBFileShare.go +++ b/service/storagegateway/api_op_CreateSMBFileShare.go @@ -182,6 +182,9 @@ func addOperationCreateSMBFileShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -224,6 +227,9 @@ func addOperationCreateSMBFileShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateSnapshot.go b/service/storagegateway/api_op_CreateSnapshot.go index 3827f691a99..0c48548c611 100644 --- a/service/storagegateway/api_op_CreateSnapshot.go +++ b/service/storagegateway/api_op_CreateSnapshot.go @@ -104,6 +104,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationCreateSnapshotMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go b/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go index 565199f7395..a26e650d1fb 100644 --- a/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go +++ b/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go @@ -93,6 +93,9 @@ func addOperationCreateSnapshotFromVolumeRecoveryPointMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateSnapshotFromVolumeRecoveryPointMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateStorediSCSIVolume.go b/service/storagegateway/api_op_CreateStorediSCSIVolume.go index 41a169d2eab..cc1b693e853 100644 --- a/service/storagegateway/api_op_CreateStorediSCSIVolume.go +++ b/service/storagegateway/api_op_CreateStorediSCSIVolume.go @@ -142,6 +142,9 @@ func addOperationCreateStorediSCSIVolumeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -184,6 +187,9 @@ func addOperationCreateStorediSCSIVolumeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateTapePool.go b/service/storagegateway/api_op_CreateTapePool.go index 5cda02ea386..370cf6de7bf 100644 --- a/service/storagegateway/api_op_CreateTapePool.go +++ b/service/storagegateway/api_op_CreateTapePool.go @@ -82,6 +82,9 @@ func addOperationCreateTapePoolMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateTapePoolMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateTapeWithBarcode.go b/service/storagegateway/api_op_CreateTapeWithBarcode.go index 2670742f2f9..3a0c36afbbb 100644 --- a/service/storagegateway/api_op_CreateTapeWithBarcode.go +++ b/service/storagegateway/api_op_CreateTapeWithBarcode.go @@ -102,6 +102,9 @@ func addOperationCreateTapeWithBarcodeMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationCreateTapeWithBarcodeMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_CreateTapes.go b/service/storagegateway/api_op_CreateTapes.go index a6f5020b018..d9357134acb 100644 --- a/service/storagegateway/api_op_CreateTapes.go +++ b/service/storagegateway/api_op_CreateTapes.go @@ -113,6 +113,9 @@ func addOperationCreateTapesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationCreateTapesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go b/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go index 0c5c2f1999b..687720ba96f 100644 --- a/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go +++ b/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go @@ -56,6 +56,9 @@ func addOperationDeleteAutomaticTapeCreationPolicyMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteAutomaticTapeCreationPolicyMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteBandwidthRateLimit.go b/service/storagegateway/api_op_DeleteBandwidthRateLimit.go index 68f4ee46c39..a97ea3fc4bd 100644 --- a/service/storagegateway/api_op_DeleteBandwidthRateLimit.go +++ b/service/storagegateway/api_op_DeleteBandwidthRateLimit.go @@ -71,6 +71,9 @@ func addOperationDeleteBandwidthRateLimitMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteBandwidthRateLimitMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteChapCredentials.go b/service/storagegateway/api_op_DeleteChapCredentials.go index 30f722da284..02706a6d89d 100644 --- a/service/storagegateway/api_op_DeleteChapCredentials.go +++ b/service/storagegateway/api_op_DeleteChapCredentials.go @@ -71,6 +71,9 @@ func addOperationDeleteChapCredentialsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteChapCredentialsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteFileShare.go b/service/storagegateway/api_op_DeleteFileShare.go index 9f616ec2d4b..cd7f9caad45 100644 --- a/service/storagegateway/api_op_DeleteFileShare.go +++ b/service/storagegateway/api_op_DeleteFileShare.go @@ -61,6 +61,9 @@ func addOperationDeleteFileShareMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteFileShareMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteGateway.go b/service/storagegateway/api_op_DeleteGateway.go index 36c0d72531b..d27e6690000 100644 --- a/service/storagegateway/api_op_DeleteGateway.go +++ b/service/storagegateway/api_op_DeleteGateway.go @@ -68,6 +68,9 @@ func addOperationDeleteGatewayMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteGatewayMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteSnapshotSchedule.go b/service/storagegateway/api_op_DeleteSnapshotSchedule.go index 811970be970..2ced1fee7bb 100644 --- a/service/storagegateway/api_op_DeleteSnapshotSchedule.go +++ b/service/storagegateway/api_op_DeleteSnapshotSchedule.go @@ -61,6 +61,9 @@ func addOperationDeleteSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDeleteSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteTape.go b/service/storagegateway/api_op_DeleteTape.go index ea9edd2f3ef..7a09d42e48d 100644 --- a/service/storagegateway/api_op_DeleteTape.go +++ b/service/storagegateway/api_op_DeleteTape.go @@ -68,6 +68,9 @@ func addOperationDeleteTapeMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDeleteTapeMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteTapeArchive.go b/service/storagegateway/api_op_DeleteTapeArchive.go index 7f98df84b67..e38abb92859 100644 --- a/service/storagegateway/api_op_DeleteTapeArchive.go +++ b/service/storagegateway/api_op_DeleteTapeArchive.go @@ -63,6 +63,9 @@ func addOperationDeleteTapeArchiveMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteTapeArchiveMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteTapePool.go b/service/storagegateway/api_op_DeleteTapePool.go index d70111f7c7b..be6fa695297 100644 --- a/service/storagegateway/api_op_DeleteTapePool.go +++ b/service/storagegateway/api_op_DeleteTapePool.go @@ -54,6 +54,9 @@ func addOperationDeleteTapePoolMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteTapePoolMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DeleteVolume.go b/service/storagegateway/api_op_DeleteVolume.go index 251e2cd6c69..320db6cb2bc 100644 --- a/service/storagegateway/api_op_DeleteVolume.go +++ b/service/storagegateway/api_op_DeleteVolume.go @@ -69,6 +69,9 @@ func addOperationDeleteVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go b/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go index 43fbbb828a8..6008d7e7816 100644 --- a/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go +++ b/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go @@ -66,6 +66,9 @@ func addOperationDescribeAvailabilityMonitorTestMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDescribeAvailabilityMonitorTestMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeBandwidthRateLimit.go b/service/storagegateway/api_op_DescribeBandwidthRateLimit.go index adaf9e086b7..45aa9f39e20 100644 --- a/service/storagegateway/api_op_DescribeBandwidthRateLimit.go +++ b/service/storagegateway/api_op_DescribeBandwidthRateLimit.go @@ -70,6 +70,9 @@ func addOperationDescribeBandwidthRateLimitMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeBandwidthRateLimitMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeCache.go b/service/storagegateway/api_op_DescribeCache.go index 0d08e5be5d5..df17b75a44f 100644 --- a/service/storagegateway/api_op_DescribeCache.go +++ b/service/storagegateway/api_op_DescribeCache.go @@ -83,6 +83,9 @@ func addOperationDescribeCacheMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeCacheMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go b/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go index cc73a819044..f59fa28e53c 100644 --- a/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go +++ b/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go @@ -60,6 +60,9 @@ func addOperationDescribeCachediSCSIVolumesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeCachediSCSIVolumesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeChapCredentials.go b/service/storagegateway/api_op_DescribeChapCredentials.go index ed88a06a34a..5dd1d45646c 100644 --- a/service/storagegateway/api_op_DescribeChapCredentials.go +++ b/service/storagegateway/api_op_DescribeChapCredentials.go @@ -78,6 +78,9 @@ func addOperationDescribeChapCredentialsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeChapCredentialsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeGatewayInformation.go b/service/storagegateway/api_op_DescribeGatewayInformation.go index ad671650108..5cf2ff20e04 100644 --- a/service/storagegateway/api_op_DescribeGatewayInformation.go +++ b/service/storagegateway/api_op_DescribeGatewayInformation.go @@ -124,6 +124,9 @@ func addOperationDescribeGatewayInformationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationDescribeGatewayInformationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeMaintenanceStartTime.go b/service/storagegateway/api_op_DescribeMaintenanceStartTime.go index 6f55770002c..3c1fc2be1b7 100644 --- a/service/storagegateway/api_op_DescribeMaintenanceStartTime.go +++ b/service/storagegateway/api_op_DescribeMaintenanceStartTime.go @@ -95,6 +95,9 @@ func addOperationDescribeMaintenanceStartTimeMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationDescribeMaintenanceStartTimeMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeNFSFileShares.go b/service/storagegateway/api_op_DescribeNFSFileShares.go index 53f6cdad2da..7d424452b57 100644 --- a/service/storagegateway/api_op_DescribeNFSFileShares.go +++ b/service/storagegateway/api_op_DescribeNFSFileShares.go @@ -57,6 +57,9 @@ func addOperationDescribeNFSFileSharesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeNFSFileSharesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeSMBFileShares.go b/service/storagegateway/api_op_DescribeSMBFileShares.go index 604a5b68ddd..e9d0d771989 100644 --- a/service/storagegateway/api_op_DescribeSMBFileShares.go +++ b/service/storagegateway/api_op_DescribeSMBFileShares.go @@ -57,6 +57,9 @@ func addOperationDescribeSMBFileSharesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeSMBFileSharesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeSMBSettings.go b/service/storagegateway/api_op_DescribeSMBSettings.go index 46a3e08a556..792b5efd5a5 100644 --- a/service/storagegateway/api_op_DescribeSMBSettings.go +++ b/service/storagegateway/api_op_DescribeSMBSettings.go @@ -111,6 +111,9 @@ func addOperationDescribeSMBSettingsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationDescribeSMBSettingsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeSnapshotSchedule.go b/service/storagegateway/api_op_DescribeSnapshotSchedule.go index c7eb850a9d7..1550a8731f8 100644 --- a/service/storagegateway/api_op_DescribeSnapshotSchedule.go +++ b/service/storagegateway/api_op_DescribeSnapshotSchedule.go @@ -78,6 +78,9 @@ func addOperationDescribeSnapshotScheduleMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeSnapshotScheduleMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go b/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go index d8f5f182bb4..828cc9e6794 100644 --- a/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go +++ b/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go @@ -114,6 +114,9 @@ func addOperationDescribeStorediSCSIVolumesMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -156,6 +159,9 @@ func addOperationDescribeStorediSCSIVolumesMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeTapeArchives.go b/service/storagegateway/api_op_DescribeTapeArchives.go index 906b5a6ba38..06320842ebc 100644 --- a/service/storagegateway/api_op_DescribeTapeArchives.go +++ b/service/storagegateway/api_op_DescribeTapeArchives.go @@ -76,6 +76,9 @@ func addOperationDescribeTapeArchivesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeTapeArchivesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go b/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go index c0455656438..689b120157c 100644 --- a/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go +++ b/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go @@ -79,6 +79,9 @@ func addOperationDescribeTapeRecoveryPointsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeTapeRecoveryPointsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeTapes.go b/service/storagegateway/api_op_DescribeTapes.go index dd1160d88a4..a5686d10b0d 100644 --- a/service/storagegateway/api_op_DescribeTapes.go +++ b/service/storagegateway/api_op_DescribeTapes.go @@ -79,6 +79,9 @@ func addOperationDescribeTapesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDescribeTapesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeUploadBuffer.go b/service/storagegateway/api_op_DescribeUploadBuffer.go index 77d65eb5361..10a4b09f315 100644 --- a/service/storagegateway/api_op_DescribeUploadBuffer.go +++ b/service/storagegateway/api_op_DescribeUploadBuffer.go @@ -69,6 +69,9 @@ func addOperationDescribeUploadBufferMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeUploadBufferMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeVTLDevices.go b/service/storagegateway/api_op_DescribeVTLDevices.go index 583503e16fa..a5f8ac01ada 100644 --- a/service/storagegateway/api_op_DescribeVTLDevices.go +++ b/service/storagegateway/api_op_DescribeVTLDevices.go @@ -83,6 +83,9 @@ func addOperationDescribeVTLDevicesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeVTLDevicesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DescribeWorkingStorage.go b/service/storagegateway/api_op_DescribeWorkingStorage.go index 7fb3bf6f944..f49ac90366f 100644 --- a/service/storagegateway/api_op_DescribeWorkingStorage.go +++ b/service/storagegateway/api_op_DescribeWorkingStorage.go @@ -76,6 +76,9 @@ func addOperationDescribeWorkingStorageMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDescribeWorkingStorageMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DetachVolume.go b/service/storagegateway/api_op_DetachVolume.go index 72550c5461d..a6731b874bb 100644 --- a/service/storagegateway/api_op_DetachVolume.go +++ b/service/storagegateway/api_op_DetachVolume.go @@ -65,6 +65,9 @@ func addOperationDetachVolumeMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDetachVolumeMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_DisableGateway.go b/service/storagegateway/api_op_DisableGateway.go index 85b3d39b1d3..5fe4a8a07fe 100644 --- a/service/storagegateway/api_op_DisableGateway.go +++ b/service/storagegateway/api_op_DisableGateway.go @@ -59,6 +59,9 @@ func addOperationDisableGatewayMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDisableGatewayMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_JoinDomain.go b/service/storagegateway/api_op_JoinDomain.go index f7239b4f6c2..f04eb2dc33a 100644 --- a/service/storagegateway/api_op_JoinDomain.go +++ b/service/storagegateway/api_op_JoinDomain.go @@ -116,6 +116,9 @@ func addOperationJoinDomainMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -158,6 +161,9 @@ func addOperationJoinDomainMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go b/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go index c1d4048269d..1eb47b7a8d4 100644 --- a/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go +++ b/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go @@ -56,6 +56,9 @@ func addOperationListAutomaticTapeCreationPoliciesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListAutomaticTapeCreationPoliciesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListFileShares.go b/service/storagegateway/api_op_ListFileShares.go index ebdc7170030..503fcf0d9f6 100644 --- a/service/storagegateway/api_op_ListFileShares.go +++ b/service/storagegateway/api_op_ListFileShares.go @@ -74,6 +74,9 @@ func addOperationListFileSharesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListFileSharesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListGateways.go b/service/storagegateway/api_op_ListGateways.go index 0400dcbb67a..910b374aa81 100644 --- a/service/storagegateway/api_op_ListGateways.go +++ b/service/storagegateway/api_op_ListGateways.go @@ -74,6 +74,9 @@ func addOperationListGatewaysMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListGatewaysMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListLocalDisks.go b/service/storagegateway/api_op_ListLocalDisks.go index c3bb641d479..4854f7c75d2 100644 --- a/service/storagegateway/api_op_ListLocalDisks.go +++ b/service/storagegateway/api_op_ListLocalDisks.go @@ -68,6 +68,9 @@ func addOperationListLocalDisksMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListLocalDisksMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListTagsForResource.go b/service/storagegateway/api_op_ListTagsForResource.go index f36c4363162..3c0fd5b3797 100644 --- a/service/storagegateway/api_op_ListTagsForResource.go +++ b/service/storagegateway/api_op_ListTagsForResource.go @@ -71,6 +71,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListTapePools.go b/service/storagegateway/api_op_ListTapePools.go index 53c4adfe225..4e5513e83ab 100644 --- a/service/storagegateway/api_op_ListTapePools.go +++ b/service/storagegateway/api_op_ListTapePools.go @@ -74,6 +74,9 @@ func addOperationListTapePoolsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListTapePoolsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListTapes.go b/service/storagegateway/api_op_ListTapes.go index 3a879b8381b..b77b20ca5f5 100644 --- a/service/storagegateway/api_op_ListTapes.go +++ b/service/storagegateway/api_op_ListTapes.go @@ -90,6 +90,9 @@ func addOperationListTapesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationListTapesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListVolumeInitiators.go b/service/storagegateway/api_op_ListVolumeInitiators.go index 24eb63eef0e..b63757749ad 100644 --- a/service/storagegateway/api_op_ListVolumeInitiators.go +++ b/service/storagegateway/api_op_ListVolumeInitiators.go @@ -58,6 +58,9 @@ func addOperationListVolumeInitiatorsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationListVolumeInitiatorsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListVolumeRecoveryPoints.go b/service/storagegateway/api_op_ListVolumeRecoveryPoints.go index 84a2cea2301..6660d1cdba8 100644 --- a/service/storagegateway/api_op_ListVolumeRecoveryPoints.go +++ b/service/storagegateway/api_op_ListVolumeRecoveryPoints.go @@ -63,6 +63,9 @@ func addOperationListVolumeRecoveryPointsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListVolumeRecoveryPointsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ListVolumes.go b/service/storagegateway/api_op_ListVolumes.go index 17853d94e3d..2b3abb1122e 100644 --- a/service/storagegateway/api_op_ListVolumes.go +++ b/service/storagegateway/api_op_ListVolumes.go @@ -92,6 +92,9 @@ func addOperationListVolumesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationListVolumesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_NotifyWhenUploaded.go b/service/storagegateway/api_op_NotifyWhenUploaded.go index cf8225fcda1..fffbde0c048 100644 --- a/service/storagegateway/api_op_NotifyWhenUploaded.go +++ b/service/storagegateway/api_op_NotifyWhenUploaded.go @@ -67,6 +67,9 @@ func addOperationNotifyWhenUploadedMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationNotifyWhenUploadedMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_RefreshCache.go b/service/storagegateway/api_op_RefreshCache.go index 7f08be2a41f..1daca7ad660 100644 --- a/service/storagegateway/api_op_RefreshCache.go +++ b/service/storagegateway/api_op_RefreshCache.go @@ -96,6 +96,9 @@ func addOperationRefreshCacheMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationRefreshCacheMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_RemoveTagsFromResource.go b/service/storagegateway/api_op_RemoveTagsFromResource.go index b03680a4b14..a63545db6b8 100644 --- a/service/storagegateway/api_op_RemoveTagsFromResource.go +++ b/service/storagegateway/api_op_RemoveTagsFromResource.go @@ -61,6 +61,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRemoveTagsFromResourceMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ResetCache.go b/service/storagegateway/api_op_ResetCache.go index 7512194bfa6..39a6acf42e3 100644 --- a/service/storagegateway/api_op_ResetCache.go +++ b/service/storagegateway/api_op_ResetCache.go @@ -64,6 +64,9 @@ func addOperationResetCacheMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationResetCacheMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_RetrieveTapeArchive.go b/service/storagegateway/api_op_RetrieveTapeArchive.go index d308b4594f3..4dbf048cae6 100644 --- a/service/storagegateway/api_op_RetrieveTapeArchive.go +++ b/service/storagegateway/api_op_RetrieveTapeArchive.go @@ -70,6 +70,9 @@ func addOperationRetrieveTapeArchiveMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationRetrieveTapeArchiveMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go b/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go index 7ff19ba641e..ea86d704766 100644 --- a/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go +++ b/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go @@ -68,6 +68,9 @@ func addOperationRetrieveTapeRecoveryPointMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationRetrieveTapeRecoveryPointMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_SetLocalConsolePassword.go b/service/storagegateway/api_op_SetLocalConsolePassword.go index ebdbc639fd6..482c9bdf568 100644 --- a/service/storagegateway/api_op_SetLocalConsolePassword.go +++ b/service/storagegateway/api_op_SetLocalConsolePassword.go @@ -63,6 +63,9 @@ func addOperationSetLocalConsolePasswordMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationSetLocalConsolePasswordMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_SetSMBGuestPassword.go b/service/storagegateway/api_op_SetSMBGuestPassword.go index b70a0c36633..bc1168ea69e 100644 --- a/service/storagegateway/api_op_SetSMBGuestPassword.go +++ b/service/storagegateway/api_op_SetSMBGuestPassword.go @@ -61,6 +61,9 @@ func addOperationSetSMBGuestPasswordMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationSetSMBGuestPasswordMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_ShutdownGateway.go b/service/storagegateway/api_op_ShutdownGateway.go index 60668306d4b..d6eb60521e2 100644 --- a/service/storagegateway/api_op_ShutdownGateway.go +++ b/service/storagegateway/api_op_ShutdownGateway.go @@ -72,6 +72,9 @@ func addOperationShutdownGatewayMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationShutdownGatewayMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_StartAvailabilityMonitorTest.go b/service/storagegateway/api_op_StartAvailabilityMonitorTest.go index be119e254a6..68b84797bc6 100644 --- a/service/storagegateway/api_op_StartAvailabilityMonitorTest.go +++ b/service/storagegateway/api_op_StartAvailabilityMonitorTest.go @@ -59,6 +59,9 @@ func addOperationStartAvailabilityMonitorTestMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationStartAvailabilityMonitorTestMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_StartGateway.go b/service/storagegateway/api_op_StartGateway.go index ad25059e545..81281531b34 100644 --- a/service/storagegateway/api_op_StartGateway.go +++ b/service/storagegateway/api_op_StartGateway.go @@ -65,6 +65,9 @@ func addOperationStartGatewayMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationStartGatewayMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go b/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go index a35b2d3731e..9a25ece32fc 100644 --- a/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go +++ b/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go @@ -64,6 +64,9 @@ func addOperationUpdateAutomaticTapeCreationPolicyMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateAutomaticTapeCreationPolicyMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateBandwidthRateLimit.go b/service/storagegateway/api_op_UpdateBandwidthRateLimit.go index 252b4258e2a..34424054212 100644 --- a/service/storagegateway/api_op_UpdateBandwidthRateLimit.go +++ b/service/storagegateway/api_op_UpdateBandwidthRateLimit.go @@ -76,6 +76,9 @@ func addOperationUpdateBandwidthRateLimitMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationUpdateBandwidthRateLimitMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateChapCredentials.go b/service/storagegateway/api_op_UpdateChapCredentials.go index 8514c7de9dd..ca4a4524471 100644 --- a/service/storagegateway/api_op_UpdateChapCredentials.go +++ b/service/storagegateway/api_op_UpdateChapCredentials.go @@ -96,6 +96,9 @@ func addOperationUpdateChapCredentialsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -138,6 +141,9 @@ func addOperationUpdateChapCredentialsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateGatewayInformation.go b/service/storagegateway/api_op_UpdateGatewayInformation.go index 0544d046dca..8d1930eec9b 100644 --- a/service/storagegateway/api_op_UpdateGatewayInformation.go +++ b/service/storagegateway/api_op_UpdateGatewayInformation.go @@ -75,6 +75,9 @@ func addOperationUpdateGatewayInformationMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationUpdateGatewayInformationMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go b/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go index d012ef87337..aa4f2bd90db 100644 --- a/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go +++ b/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go @@ -70,6 +70,9 @@ func addOperationUpdateGatewaySoftwareNowMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUpdateGatewaySoftwareNowMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateMaintenanceStartTime.go b/service/storagegateway/api_op_UpdateMaintenanceStartTime.go index 105b909ae49..b967bc19e93 100644 --- a/service/storagegateway/api_op_UpdateMaintenanceStartTime.go +++ b/service/storagegateway/api_op_UpdateMaintenanceStartTime.go @@ -92,6 +92,9 @@ func addOperationUpdateMaintenanceStartTimeMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationUpdateMaintenanceStartTimeMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateNFSFileShare.go b/service/storagegateway/api_op_UpdateNFSFileShare.go index de70f62bb45..2a53bbaf0fd 100644 --- a/service/storagegateway/api_op_UpdateNFSFileShare.go +++ b/service/storagegateway/api_op_UpdateNFSFileShare.go @@ -135,6 +135,9 @@ func addOperationUpdateNFSFileShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationUpdateNFSFileShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateSMBFileShare.go b/service/storagegateway/api_op_UpdateSMBFileShare.go index 51a5a96fce7..53d1ea803bf 100644 --- a/service/storagegateway/api_op_UpdateSMBFileShare.go +++ b/service/storagegateway/api_op_UpdateSMBFileShare.go @@ -150,6 +150,9 @@ func addOperationUpdateSMBFileShareMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationUpdateSMBFileShareMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateSMBFileShareVisibility.go b/service/storagegateway/api_op_UpdateSMBFileShareVisibility.go index 76bb27e3dc8..b7a1042a871 100644 --- a/service/storagegateway/api_op_UpdateSMBFileShareVisibility.go +++ b/service/storagegateway/api_op_UpdateSMBFileShareVisibility.go @@ -60,6 +60,9 @@ func addOperationUpdateSMBFileShareVisibilityMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUpdateSMBFileShareVisibilityMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go b/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go index 208a84c4def..939bfa327d7 100644 --- a/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go +++ b/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go @@ -72,6 +72,9 @@ func addOperationUpdateSMBSecurityStrategyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateSMBSecurityStrategyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateSnapshotSchedule.go b/service/storagegateway/api_op_UpdateSnapshotSchedule.go index 3ced332b8ad..3d7e9b4f90f 100644 --- a/service/storagegateway/api_op_UpdateSnapshotSchedule.go +++ b/service/storagegateway/api_op_UpdateSnapshotSchedule.go @@ -98,6 +98,9 @@ func addOperationUpdateSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -140,6 +143,9 @@ func addOperationUpdateSnapshotScheduleMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/api_op_UpdateVTLDeviceType.go b/service/storagegateway/api_op_UpdateVTLDeviceType.go index cf5da0a0224..9ad08fbb3d6 100644 --- a/service/storagegateway/api_op_UpdateVTLDeviceType.go +++ b/service/storagegateway/api_op_UpdateVTLDeviceType.go @@ -62,6 +62,9 @@ func addOperationUpdateVTLDeviceTypeMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationUpdateVTLDeviceTypeMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/storagegateway/go.mod b/service/storagegateway/go.mod index 08dc147eba8..dbcb35dceb2 100644 --- a/service/storagegateway/go.mod +++ b/service/storagegateway/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/storagegateway go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/storagegateway/go.sum b/service/storagegateway/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/storagegateway/go.sum +++ b/service/storagegateway/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sts/api_client.go b/service/sts/api_client.go index 72169894302..8c38fed5a66 100644 --- a/service/sts/api_client.go +++ b/service/sts/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/sts/api_op_AssumeRole.go b/service/sts/api_op_AssumeRole.go index 282e8e76a4b..2895473cc54 100644 --- a/service/sts/api_op_AssumeRole.go +++ b/service/sts/api_op_AssumeRole.go @@ -323,6 +323,9 @@ func addOperationAssumeRoleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -365,6 +368,9 @@ func addOperationAssumeRoleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_AssumeRoleWithSAML.go b/service/sts/api_op_AssumeRoleWithSAML.go index 344800c39de..fdc8657c08c 100644 --- a/service/sts/api_op_AssumeRoleWithSAML.go +++ b/service/sts/api_op_AssumeRoleWithSAML.go @@ -275,6 +275,9 @@ func addOperationAssumeRoleWithSAMLMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -311,6 +314,9 @@ func addOperationAssumeRoleWithSAMLMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_AssumeRoleWithWebIdentity.go b/service/sts/api_op_AssumeRoleWithWebIdentity.go index 934fab3d751..0d2444954e6 100644 --- a/service/sts/api_op_AssumeRoleWithWebIdentity.go +++ b/service/sts/api_op_AssumeRoleWithWebIdentity.go @@ -301,6 +301,9 @@ func addOperationAssumeRoleWithWebIdentityMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -337,6 +340,9 @@ func addOperationAssumeRoleWithWebIdentityMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_DecodeAuthorizationMessage.go b/service/sts/api_op_DecodeAuthorizationMessage.go index 39ef9920cf3..89f4b5350ce 100644 --- a/service/sts/api_op_DecodeAuthorizationMessage.go +++ b/service/sts/api_op_DecodeAuthorizationMessage.go @@ -84,6 +84,9 @@ func addOperationDecodeAuthorizationMessageMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDecodeAuthorizationMessageMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_GetAccessKeyInfo.go b/service/sts/api_op_GetAccessKeyInfo.go index d3fb869e144..8c33724f38e 100644 --- a/service/sts/api_op_GetAccessKeyInfo.go +++ b/service/sts/api_op_GetAccessKeyInfo.go @@ -73,6 +73,9 @@ func addOperationGetAccessKeyInfoMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetAccessKeyInfoMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_GetCallerIdentity.go b/service/sts/api_op_GetCallerIdentity.go index 4e655a97605..793e6740120 100644 --- a/service/sts/api_op_GetCallerIdentity.go +++ b/service/sts/api_op_GetCallerIdentity.go @@ -68,6 +68,9 @@ func addOperationGetCallerIdentityMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationGetCallerIdentityMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_GetFederationToken.go b/service/sts/api_op_GetFederationToken.go index 11c0c1507dc..52fea090db8 100644 --- a/service/sts/api_op_GetFederationToken.go +++ b/service/sts/api_op_GetFederationToken.go @@ -246,6 +246,9 @@ func addOperationGetFederationTokenMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -288,6 +291,9 @@ func addOperationGetFederationTokenMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/api_op_GetSessionToken.go b/service/sts/api_op_GetSessionToken.go index 188841d7573..6c9066f5ddc 100644 --- a/service/sts/api_op_GetSessionToken.go +++ b/service/sts/api_op_GetSessionToken.go @@ -126,6 +126,9 @@ func addOperationGetSessionTokenMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationGetSessionTokenMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/sts/go.mod b/service/sts/go.mod index 739ba2fdd16..74ded87b8df 100644 --- a/service/sts/go.mod +++ b/service/sts/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/sts go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sts/go.sum b/service/sts/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/sts/go.sum +++ b/service/sts/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/support/api_client.go b/service/support/api_client.go index 04165fe1a68..5e6804b220b 100644 --- a/service/support/api_client.go +++ b/service/support/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/support/api_op_AddAttachmentsToSet.go b/service/support/api_op_AddAttachmentsToSet.go index 84f9634cc87..ddc8baa778b 100644 --- a/service/support/api_op_AddAttachmentsToSet.go +++ b/service/support/api_op_AddAttachmentsToSet.go @@ -84,6 +84,9 @@ func addOperationAddAttachmentsToSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationAddAttachmentsToSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_AddCommunicationToCase.go b/service/support/api_op_AddCommunicationToCase.go index cc08797f220..e6acd648d1d 100644 --- a/service/support/api_op_AddCommunicationToCase.go +++ b/service/support/api_op_AddCommunicationToCase.go @@ -78,6 +78,9 @@ func addOperationAddCommunicationToCaseMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationAddCommunicationToCaseMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_CreateCase.go b/service/support/api_op_CreateCase.go index 686b699de73..e4c073349cb 100644 --- a/service/support/api_op_CreateCase.go +++ b/service/support/api_op_CreateCase.go @@ -131,6 +131,9 @@ func addOperationCreateCaseMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationCreateCaseMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeAttachment.go b/service/support/api_op_DescribeAttachment.go index 182e3a5a062..fbc56a748d2 100644 --- a/service/support/api_op_DescribeAttachment.go +++ b/service/support/api_op_DescribeAttachment.go @@ -72,6 +72,9 @@ func addOperationDescribeAttachmentMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeAttachmentMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeCases.go b/service/support/api_op_DescribeCases.go index 4ba8bf3b71e..76478d861e3 100644 --- a/service/support/api_op_DescribeCases.go +++ b/service/support/api_op_DescribeCases.go @@ -112,6 +112,9 @@ func addOperationDescribeCasesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationDescribeCasesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeCommunications.go b/service/support/api_op_DescribeCommunications.go index f1294c6e0c3..7fb4029f8c1 100644 --- a/service/support/api_op_DescribeCommunications.go +++ b/service/support/api_op_DescribeCommunications.go @@ -89,6 +89,9 @@ func addOperationDescribeCommunicationsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeCommunicationsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeServices.go b/service/support/api_op_DescribeServices.go index 2369eafb301..a234f6e6dee 100644 --- a/service/support/api_op_DescribeServices.go +++ b/service/support/api_op_DescribeServices.go @@ -75,6 +75,9 @@ func addOperationDescribeServicesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeServicesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeSeverityLevels.go b/service/support/api_op_DescribeSeverityLevels.go index de7d9f9dd5d..63dc3ffc215 100644 --- a/service/support/api_op_DescribeSeverityLevels.go +++ b/service/support/api_op_DescribeSeverityLevels.go @@ -66,6 +66,9 @@ func addOperationDescribeSeverityLevelsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeSeverityLevelsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go b/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go index 832c9067dcf..b2c88372f32 100644 --- a/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go +++ b/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go @@ -73,6 +73,9 @@ func addOperationDescribeTrustedAdvisorCheckRefreshStatusesMiddlewares(stack *mi if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeTrustedAdvisorCheckRefreshStatusesMiddlewares(stack *mi if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeTrustedAdvisorCheckResult.go b/service/support/api_op_DescribeTrustedAdvisorCheckResult.go index 2dc48806556..364db1168c2 100644 --- a/service/support/api_op_DescribeTrustedAdvisorCheckResult.go +++ b/service/support/api_op_DescribeTrustedAdvisorCheckResult.go @@ -92,6 +92,9 @@ func addOperationDescribeTrustedAdvisorCheckResultMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationDescribeTrustedAdvisorCheckResultMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go b/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go index 1c9b859658c..ef25bf53324 100644 --- a/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go +++ b/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go @@ -69,6 +69,9 @@ func addOperationDescribeTrustedAdvisorCheckSummariesMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDescribeTrustedAdvisorCheckSummariesMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_DescribeTrustedAdvisorChecks.go b/service/support/api_op_DescribeTrustedAdvisorChecks.go index 61ee7e19e2b..c4427e49487 100644 --- a/service/support/api_op_DescribeTrustedAdvisorChecks.go +++ b/service/support/api_op_DescribeTrustedAdvisorChecks.go @@ -72,6 +72,9 @@ func addOperationDescribeTrustedAdvisorChecksMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeTrustedAdvisorChecksMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_RefreshTrustedAdvisorCheck.go b/service/support/api_op_RefreshTrustedAdvisorCheck.go index 64e478c8eae..8f0ba7ce5d1 100644 --- a/service/support/api_op_RefreshTrustedAdvisorCheck.go +++ b/service/support/api_op_RefreshTrustedAdvisorCheck.go @@ -74,6 +74,9 @@ func addOperationRefreshTrustedAdvisorCheckMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationRefreshTrustedAdvisorCheckMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/api_op_ResolveCase.go b/service/support/api_op_ResolveCase.go index 19772aaee6b..a0a405cd41f 100644 --- a/service/support/api_op_ResolveCase.go +++ b/service/support/api_op_ResolveCase.go @@ -66,6 +66,9 @@ func addOperationResolveCaseMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationResolveCaseMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/support/go.mod b/service/support/go.mod index a813be6197f..3edfe0ce906 100644 --- a/service/support/go.mod +++ b/service/support/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/support go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/support/go.sum b/service/support/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/support/go.sum +++ b/service/support/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/swf/api_client.go b/service/swf/api_client.go index e19f16f0d5c..260ab1bd16b 100644 --- a/service/swf/api_client.go +++ b/service/swf/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/swf/api_op_CountClosedWorkflowExecutions.go b/service/swf/api_op_CountClosedWorkflowExecutions.go index 5bfea2c2609..985ca1387f2 100644 --- a/service/swf/api_op_CountClosedWorkflowExecutions.go +++ b/service/swf/api_op_CountClosedWorkflowExecutions.go @@ -123,6 +123,9 @@ func addOperationCountClosedWorkflowExecutionsMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationCountClosedWorkflowExecutionsMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_CountOpenWorkflowExecutions.go b/service/swf/api_op_CountOpenWorkflowExecutions.go index 48fc9147c39..4e148020122 100644 --- a/service/swf/api_op_CountOpenWorkflowExecutions.go +++ b/service/swf/api_op_CountOpenWorkflowExecutions.go @@ -112,6 +112,9 @@ func addOperationCountOpenWorkflowExecutionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationCountOpenWorkflowExecutionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_CountPendingActivityTasks.go b/service/swf/api_op_CountPendingActivityTasks.go index ea4fa1e5868..d8eb63df0d8 100644 --- a/service/swf/api_op_CountPendingActivityTasks.go +++ b/service/swf/api_op_CountPendingActivityTasks.go @@ -87,6 +87,9 @@ func addOperationCountPendingActivityTasksMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCountPendingActivityTasksMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_CountPendingDecisionTasks.go b/service/swf/api_op_CountPendingDecisionTasks.go index 9bcad4cfdbf..40e7e2b20c2 100644 --- a/service/swf/api_op_CountPendingDecisionTasks.go +++ b/service/swf/api_op_CountPendingDecisionTasks.go @@ -87,6 +87,9 @@ func addOperationCountPendingDecisionTasksMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationCountPendingDecisionTasksMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DeprecateActivityType.go b/service/swf/api_op_DeprecateActivityType.go index 8a08dcfbd42..19daa65f747 100644 --- a/service/swf/api_op_DeprecateActivityType.go +++ b/service/swf/api_op_DeprecateActivityType.go @@ -83,6 +83,9 @@ func addOperationDeprecateActivityTypeMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDeprecateActivityTypeMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DeprecateDomain.go b/service/swf/api_op_DeprecateDomain.go index 309eacc47ab..a80819c374a 100644 --- a/service/swf/api_op_DeprecateDomain.go +++ b/service/swf/api_op_DeprecateDomain.go @@ -73,6 +73,9 @@ func addOperationDeprecateDomainMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDeprecateDomainMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DeprecateWorkflowType.go b/service/swf/api_op_DeprecateWorkflowType.go index 95b0c867842..1a2b958300f 100644 --- a/service/swf/api_op_DeprecateWorkflowType.go +++ b/service/swf/api_op_DeprecateWorkflowType.go @@ -84,6 +84,9 @@ func addOperationDeprecateWorkflowTypeMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDeprecateWorkflowTypeMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DescribeActivityType.go b/service/swf/api_op_DescribeActivityType.go index f67f9daac2a..22b19446c10 100644 --- a/service/swf/api_op_DescribeActivityType.go +++ b/service/swf/api_op_DescribeActivityType.go @@ -103,6 +103,9 @@ func addOperationDescribeActivityTypeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeActivityTypeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DescribeDomain.go b/service/swf/api_op_DescribeDomain.go index df8006ea7f2..642c3895f32 100644 --- a/service/swf/api_op_DescribeDomain.go +++ b/service/swf/api_op_DescribeDomain.go @@ -81,6 +81,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DescribeWorkflowExecution.go b/service/swf/api_op_DescribeWorkflowExecution.go index 0c4efc5f2dd..c34d1c8131e 100644 --- a/service/swf/api_op_DescribeWorkflowExecution.go +++ b/service/swf/api_op_DescribeWorkflowExecution.go @@ -105,6 +105,9 @@ func addOperationDescribeWorkflowExecutionMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -147,6 +150,9 @@ func addOperationDescribeWorkflowExecutionMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_DescribeWorkflowType.go b/service/swf/api_op_DescribeWorkflowType.go index 6eed814d586..69b44ca0a40 100644 --- a/service/swf/api_op_DescribeWorkflowType.go +++ b/service/swf/api_op_DescribeWorkflowType.go @@ -103,6 +103,9 @@ func addOperationDescribeWorkflowTypeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -145,6 +148,9 @@ func addOperationDescribeWorkflowTypeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_GetWorkflowExecutionHistory.go b/service/swf/api_op_GetWorkflowExecutionHistory.go index d6cc50b12b9..82c6c57e39f 100644 --- a/service/swf/api_op_GetWorkflowExecutionHistory.go +++ b/service/swf/api_op_GetWorkflowExecutionHistory.go @@ -109,6 +109,9 @@ func addOperationGetWorkflowExecutionHistoryMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationGetWorkflowExecutionHistoryMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_ListActivityTypes.go b/service/swf/api_op_ListActivityTypes.go index 6c2ab4e1407..ff0f1964409 100644 --- a/service/swf/api_op_ListActivityTypes.go +++ b/service/swf/api_op_ListActivityTypes.go @@ -111,6 +111,9 @@ func addOperationListActivityTypesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationListActivityTypesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_ListClosedWorkflowExecutions.go b/service/swf/api_op_ListClosedWorkflowExecutions.go index 6378d4ea59d..66ca5e7a99c 100644 --- a/service/swf/api_op_ListClosedWorkflowExecutions.go +++ b/service/swf/api_op_ListClosedWorkflowExecutions.go @@ -150,6 +150,9 @@ func addOperationListClosedWorkflowExecutionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -192,6 +195,9 @@ func addOperationListClosedWorkflowExecutionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_ListDomains.go b/service/swf/api_op_ListDomains.go index 720cd7139c9..7596f6e614f 100644 --- a/service/swf/api_op_ListDomains.go +++ b/service/swf/api_op_ListDomains.go @@ -104,6 +104,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -146,6 +149,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_ListOpenWorkflowExecutions.go b/service/swf/api_op_ListOpenWorkflowExecutions.go index 1088b4eb595..65517d9f2da 100644 --- a/service/swf/api_op_ListOpenWorkflowExecutions.go +++ b/service/swf/api_op_ListOpenWorkflowExecutions.go @@ -133,6 +133,9 @@ func addOperationListOpenWorkflowExecutionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -175,6 +178,9 @@ func addOperationListOpenWorkflowExecutionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_ListTagsForResource.go b/service/swf/api_op_ListTagsForResource.go index b23257f18b3..9a0ca503fb8 100644 --- a/service/swf/api_op_ListTagsForResource.go +++ b/service/swf/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_ListWorkflowTypes.go b/service/swf/api_op_ListWorkflowTypes.go index 734eda2129b..e89fa96c579 100644 --- a/service/swf/api_op_ListWorkflowTypes.go +++ b/service/swf/api_op_ListWorkflowTypes.go @@ -108,6 +108,9 @@ func addOperationListWorkflowTypesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -150,6 +153,9 @@ func addOperationListWorkflowTypesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_PollForActivityTask.go b/service/swf/api_op_PollForActivityTask.go index 19572330ee8..e2e19ff6b77 100644 --- a/service/swf/api_op_PollForActivityTask.go +++ b/service/swf/api_op_PollForActivityTask.go @@ -123,6 +123,9 @@ func addOperationPollForActivityTaskMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationPollForActivityTaskMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_PollForDecisionTask.go b/service/swf/api_op_PollForDecisionTask.go index 086d77a11b4..14298594130 100644 --- a/service/swf/api_op_PollForDecisionTask.go +++ b/service/swf/api_op_PollForDecisionTask.go @@ -163,6 +163,9 @@ func addOperationPollForDecisionTaskMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -205,6 +208,9 @@ func addOperationPollForDecisionTaskMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RecordActivityTaskHeartbeat.go b/service/swf/api_op_RecordActivityTaskHeartbeat.go index b8dfd79ae16..4cc4b5bdd00 100644 --- a/service/swf/api_op_RecordActivityTaskHeartbeat.go +++ b/service/swf/api_op_RecordActivityTaskHeartbeat.go @@ -99,6 +99,9 @@ func addOperationRecordActivityTaskHeartbeatMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationRecordActivityTaskHeartbeatMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RegisterActivityType.go b/service/swf/api_op_RegisterActivityType.go index e2df0c4b192..c2ad9add653 100644 --- a/service/swf/api_op_RegisterActivityType.go +++ b/service/swf/api_op_RegisterActivityType.go @@ -146,6 +146,9 @@ func addOperationRegisterActivityTypeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationRegisterActivityTypeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RegisterDomain.go b/service/swf/api_op_RegisterDomain.go index 88e794d4d2d..558033786b3 100644 --- a/service/swf/api_op_RegisterDomain.go +++ b/service/swf/api_op_RegisterDomain.go @@ -92,6 +92,9 @@ func addOperationRegisterDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -134,6 +137,9 @@ func addOperationRegisterDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RegisterWorkflowType.go b/service/swf/api_op_RegisterWorkflowType.go index 04d3626fd56..02d554c34d9 100644 --- a/service/swf/api_op_RegisterWorkflowType.go +++ b/service/swf/api_op_RegisterWorkflowType.go @@ -163,6 +163,9 @@ func addOperationRegisterWorkflowTypeMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -205,6 +208,9 @@ func addOperationRegisterWorkflowTypeMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RequestCancelWorkflowExecution.go b/service/swf/api_op_RequestCancelWorkflowExecution.go index 772f025feb5..b6f103b5425 100644 --- a/service/swf/api_op_RequestCancelWorkflowExecution.go +++ b/service/swf/api_op_RequestCancelWorkflowExecution.go @@ -83,6 +83,9 @@ func addOperationRequestCancelWorkflowExecutionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationRequestCancelWorkflowExecutionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RespondActivityTaskCanceled.go b/service/swf/api_op_RespondActivityTaskCanceled.go index 2bc1b378c3d..c0173110805 100644 --- a/service/swf/api_op_RespondActivityTaskCanceled.go +++ b/service/swf/api_op_RespondActivityTaskCanceled.go @@ -84,6 +84,9 @@ func addOperationRespondActivityTaskCanceledMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationRespondActivityTaskCanceledMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RespondActivityTaskCompleted.go b/service/swf/api_op_RespondActivityTaskCompleted.go index 50401054a82..fc8d11d9b6e 100644 --- a/service/swf/api_op_RespondActivityTaskCompleted.go +++ b/service/swf/api_op_RespondActivityTaskCompleted.go @@ -85,6 +85,9 @@ func addOperationRespondActivityTaskCompletedMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationRespondActivityTaskCompletedMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RespondActivityTaskFailed.go b/service/swf/api_op_RespondActivityTaskFailed.go index 9a9ceb3a066..785bd288580 100644 --- a/service/swf/api_op_RespondActivityTaskFailed.go +++ b/service/swf/api_op_RespondActivityTaskFailed.go @@ -84,6 +84,9 @@ func addOperationRespondActivityTaskFailedMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationRespondActivityTaskFailedMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_RespondDecisionTaskCompleted.go b/service/swf/api_op_RespondDecisionTaskCompleted.go index 818ca3ec6f0..f697d575afe 100644 --- a/service/swf/api_op_RespondDecisionTaskCompleted.go +++ b/service/swf/api_op_RespondDecisionTaskCompleted.go @@ -72,6 +72,9 @@ func addOperationRespondDecisionTaskCompletedMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationRespondDecisionTaskCompletedMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_SignalWorkflowExecution.go b/service/swf/api_op_SignalWorkflowExecution.go index a893b6ea943..dc127b37aee 100644 --- a/service/swf/api_op_SignalWorkflowExecution.go +++ b/service/swf/api_op_SignalWorkflowExecution.go @@ -90,6 +90,9 @@ func addOperationSignalWorkflowExecutionMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationSignalWorkflowExecutionMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_StartWorkflowExecution.go b/service/swf/api_op_StartWorkflowExecution.go index 92ff391e831..bd8e41382ea 100644 --- a/service/swf/api_op_StartWorkflowExecution.go +++ b/service/swf/api_op_StartWorkflowExecution.go @@ -203,6 +203,9 @@ func addOperationStartWorkflowExecutionMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -245,6 +248,9 @@ func addOperationStartWorkflowExecutionMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_TagResource.go b/service/swf/api_op_TagResource.go index 44dfeb21ee8..ec3ba6dca2c 100644 --- a/service/swf/api_op_TagResource.go +++ b/service/swf/api_op_TagResource.go @@ -56,6 +56,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_TerminateWorkflowExecution.go b/service/swf/api_op_TerminateWorkflowExecution.go index 0f1c6923167..1ab3f2a124d 100644 --- a/service/swf/api_op_TerminateWorkflowExecution.go +++ b/service/swf/api_op_TerminateWorkflowExecution.go @@ -113,6 +113,9 @@ func addOperationTerminateWorkflowExecutionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationTerminateWorkflowExecutionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_UndeprecateActivityType.go b/service/swf/api_op_UndeprecateActivityType.go index 84b30f8487e..7860312b17b 100644 --- a/service/swf/api_op_UndeprecateActivityType.go +++ b/service/swf/api_op_UndeprecateActivityType.go @@ -82,6 +82,9 @@ func addOperationUndeprecateActivityTypeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUndeprecateActivityTypeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_UndeprecateDomain.go b/service/swf/api_op_UndeprecateDomain.go index 2f229136e00..ed3034c4bc7 100644 --- a/service/swf/api_op_UndeprecateDomain.go +++ b/service/swf/api_op_UndeprecateDomain.go @@ -70,6 +70,9 @@ func addOperationUndeprecateDomainMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationUndeprecateDomainMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_UndeprecateWorkflowType.go b/service/swf/api_op_UndeprecateWorkflowType.go index b3039002e0d..1e5e7991ee3 100644 --- a/service/swf/api_op_UndeprecateWorkflowType.go +++ b/service/swf/api_op_UndeprecateWorkflowType.go @@ -82,6 +82,9 @@ func addOperationUndeprecateWorkflowTypeMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationUndeprecateWorkflowTypeMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/api_op_UntagResource.go b/service/swf/api_op_UntagResource.go index 77960168933..d7bf964831d 100644 --- a/service/swf/api_op_UntagResource.go +++ b/service/swf/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/swf/go.mod b/service/swf/go.mod index c6d3370af0f..3b2f6debeb0 100644 --- a/service/swf/go.mod +++ b/service/swf/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/swf go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/swf/go.sum b/service/swf/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/swf/go.sum +++ b/service/swf/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/synthetics/api_client.go b/service/synthetics/api_client.go index 1662fd22fb9..244339afc3a 100644 --- a/service/synthetics/api_client.go +++ b/service/synthetics/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/synthetics/api_op_CreateCanary.go b/service/synthetics/api_op_CreateCanary.go index d6a107c2cf8..9f591b4f3b1 100644 --- a/service/synthetics/api_op_CreateCanary.go +++ b/service/synthetics/api_op_CreateCanary.go @@ -149,6 +149,9 @@ func addOperationCreateCanaryMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -191,6 +194,9 @@ func addOperationCreateCanaryMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_DeleteCanary.go b/service/synthetics/api_op_DeleteCanary.go index b5a77978a94..601b64592e5 100644 --- a/service/synthetics/api_op_DeleteCanary.go +++ b/service/synthetics/api_op_DeleteCanary.go @@ -75,6 +75,9 @@ func addOperationDeleteCanaryMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationDeleteCanaryMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_DescribeCanaries.go b/service/synthetics/api_op_DescribeCanaries.go index a4b1d461272..ebddb503268 100644 --- a/service/synthetics/api_op_DescribeCanaries.go +++ b/service/synthetics/api_op_DescribeCanaries.go @@ -66,6 +66,9 @@ func addOperationDescribeCanariesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeCanariesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_DescribeCanariesLastRun.go b/service/synthetics/api_op_DescribeCanariesLastRun.go index c0a697c8587..ad3463cbf31 100644 --- a/service/synthetics/api_op_DescribeCanariesLastRun.go +++ b/service/synthetics/api_op_DescribeCanariesLastRun.go @@ -63,6 +63,9 @@ func addOperationDescribeCanariesLastRunMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeCanariesLastRunMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_DescribeRuntimeVersions.go b/service/synthetics/api_op_DescribeRuntimeVersions.go index e76759cb3a3..73530d16ccf 100644 --- a/service/synthetics/api_op_DescribeRuntimeVersions.go +++ b/service/synthetics/api_op_DescribeRuntimeVersions.go @@ -66,6 +66,9 @@ func addOperationDescribeRuntimeVersionsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeRuntimeVersionsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_GetCanary.go b/service/synthetics/api_op_GetCanary.go index f7fca9e2ea8..544b13b0d83 100644 --- a/service/synthetics/api_op_GetCanary.go +++ b/service/synthetics/api_op_GetCanary.go @@ -56,6 +56,9 @@ func addOperationGetCanaryMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetCanaryMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_GetCanaryRuns.go b/service/synthetics/api_op_GetCanaryRuns.go index 91197f6deda..0ae107b8094 100644 --- a/service/synthetics/api_op_GetCanaryRuns.go +++ b/service/synthetics/api_op_GetCanaryRuns.go @@ -66,6 +66,9 @@ func addOperationGetCanaryRunsMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationGetCanaryRunsMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_ListTagsForResource.go b/service/synthetics/api_op_ListTagsForResource.go index c1a352a85d7..7629b511173 100644 --- a/service/synthetics/api_op_ListTagsForResource.go +++ b/service/synthetics/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_StartCanary.go b/service/synthetics/api_op_StartCanary.go index fd889a7e0ed..6a8d6ec50f1 100644 --- a/service/synthetics/api_op_StartCanary.go +++ b/service/synthetics/api_op_StartCanary.go @@ -53,6 +53,9 @@ func addOperationStartCanaryMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStartCanaryMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_StopCanary.go b/service/synthetics/api_op_StopCanary.go index 95abac1c503..3a363847c07 100644 --- a/service/synthetics/api_op_StopCanary.go +++ b/service/synthetics/api_op_StopCanary.go @@ -55,6 +55,9 @@ func addOperationStopCanaryMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStopCanaryMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_TagResource.go b/service/synthetics/api_op_TagResource.go index c206840f97c..8fab5aabb8a 100644 --- a/service/synthetics/api_op_TagResource.go +++ b/service/synthetics/api_op_TagResource.go @@ -63,6 +63,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_UntagResource.go b/service/synthetics/api_op_UntagResource.go index 6ff3f62490f..a1d2d04e24e 100644 --- a/service/synthetics/api_op_UntagResource.go +++ b/service/synthetics/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/api_op_UpdateCanary.go b/service/synthetics/api_op_UpdateCanary.go index 5b3581ee89f..f35fd3773ec 100644 --- a/service/synthetics/api_op_UpdateCanary.go +++ b/service/synthetics/api_op_UpdateCanary.go @@ -107,6 +107,9 @@ func addOperationUpdateCanaryMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationUpdateCanaryMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/synthetics/go.mod b/service/synthetics/go.mod index 4aa53c32a22..591eac6a97c 100644 --- a/service/synthetics/go.mod +++ b/service/synthetics/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/synthetics go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/synthetics/go.sum b/service/synthetics/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/synthetics/go.sum +++ b/service/synthetics/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/textract/api_client.go b/service/textract/api_client.go index 562c34bd054..282f9cb1c27 100644 --- a/service/textract/api_client.go +++ b/service/textract/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/textract/api_op_AnalyzeDocument.go b/service/textract/api_op_AnalyzeDocument.go index b5999c78dfe..de00b9e822d 100644 --- a/service/textract/api_op_AnalyzeDocument.go +++ b/service/textract/api_op_AnalyzeDocument.go @@ -106,6 +106,9 @@ func addOperationAnalyzeDocumentMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -148,6 +151,9 @@ func addOperationAnalyzeDocumentMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/textract/api_op_DetectDocumentText.go b/service/textract/api_op_DetectDocumentText.go index 86fa6ac1124..bff77a2f7ca 100644 --- a/service/textract/api_op_DetectDocumentText.go +++ b/service/textract/api_op_DetectDocumentText.go @@ -74,6 +74,9 @@ func addOperationDetectDocumentTextMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationDetectDocumentTextMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/textract/api_op_GetDocumentAnalysis.go b/service/textract/api_op_GetDocumentAnalysis.go index fa11f236424..98297c83cb7 100644 --- a/service/textract/api_op_GetDocumentAnalysis.go +++ b/service/textract/api_op_GetDocumentAnalysis.go @@ -124,6 +124,9 @@ func addOperationGetDocumentAnalysisMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationGetDocumentAnalysisMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/textract/api_op_GetDocumentTextDetection.go b/service/textract/api_op_GetDocumentTextDetection.go index f24b5028414..4a409a9f4d4 100644 --- a/service/textract/api_op_GetDocumentTextDetection.go +++ b/service/textract/api_op_GetDocumentTextDetection.go @@ -109,6 +109,9 @@ func addOperationGetDocumentTextDetectionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -151,6 +154,9 @@ func addOperationGetDocumentTextDetectionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/textract/api_op_StartDocumentAnalysis.go b/service/textract/api_op_StartDocumentAnalysis.go index 6e19c035146..7f3b0b9a1b3 100644 --- a/service/textract/api_op_StartDocumentAnalysis.go +++ b/service/textract/api_op_StartDocumentAnalysis.go @@ -101,6 +101,9 @@ func addOperationStartDocumentAnalysisMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationStartDocumentAnalysisMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/textract/api_op_StartDocumentTextDetection.go b/service/textract/api_op_StartDocumentTextDetection.go index d192c0e118d..1a5fa9b72e1 100644 --- a/service/textract/api_op_StartDocumentTextDetection.go +++ b/service/textract/api_op_StartDocumentTextDetection.go @@ -91,6 +91,9 @@ func addOperationStartDocumentTextDetectionMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationStartDocumentTextDetectionMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/textract/go.mod b/service/textract/go.mod index a88c09fa2b1..afa6975f9d7 100644 --- a/service/textract/go.mod +++ b/service/textract/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/textract go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/textract/go.sum b/service/textract/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/textract/go.sum +++ b/service/textract/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/timestreamquery/api_client.go b/service/timestreamquery/api_client.go index f3bc0a4909c..cd4ddd801d4 100644 --- a/service/timestreamquery/api_client.go +++ b/service/timestreamquery/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,6 +34,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -60,6 +63,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -76,6 +82,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -130,14 +139,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -176,15 +198,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -197,7 +219,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -214,3 +237,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/timestreamquery/api_op_CancelQuery.go b/service/timestreamquery/api_op_CancelQuery.go index 5d78d13284c..fafe17f27e5 100644 --- a/service/timestreamquery/api_op_CancelQuery.go +++ b/service/timestreamquery/api_op_CancelQuery.go @@ -58,6 +58,9 @@ func addOperationCancelQueryMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCancelQueryMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamquery/api_op_DescribeEndpoints.go b/service/timestreamquery/api_op_DescribeEndpoints.go index ad767648817..18d9192a96b 100644 --- a/service/timestreamquery/api_op_DescribeEndpoints.go +++ b/service/timestreamquery/api_op_DescribeEndpoints.go @@ -64,6 +64,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamquery/api_op_Query.go b/service/timestreamquery/api_op_Query.go index cdec9aa4bb0..c4c51ab8bbb 100644 --- a/service/timestreamquery/api_op_Query.go +++ b/service/timestreamquery/api_op_Query.go @@ -99,6 +99,9 @@ func addOperationQueryMiddlewares(stack *middleware.Stack, options Options) (err if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -144,6 +147,9 @@ func addOperationQueryMiddlewares(stack *middleware.Stack, options Options) (err if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamquery/go.mod b/service/timestreamquery/go.mod index 858ebc1dd5a..b0f86398e03 100644 --- a/service/timestreamquery/go.mod +++ b/service/timestreamquery/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/timestreamquery go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/timestreamquery/go.sum b/service/timestreamquery/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/timestreamquery/go.sum +++ b/service/timestreamquery/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/timestreamwrite/api_client.go b/service/timestreamwrite/api_client.go index 4941ac5537a..44ccc22600f 100644 --- a/service/timestreamwrite/api_client.go +++ b/service/timestreamwrite/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/timestreamwrite/api_op_CreateDatabase.go b/service/timestreamwrite/api_op_CreateDatabase.go index 5fc0e25742a..b5058d2400c 100644 --- a/service/timestreamwrite/api_op_CreateDatabase.go +++ b/service/timestreamwrite/api_op_CreateDatabase.go @@ -69,6 +69,9 @@ func addOperationCreateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_CreateTable.go b/service/timestreamwrite/api_op_CreateTable.go index e6f5ed82239..6df30c1f2ce 100644 --- a/service/timestreamwrite/api_op_CreateTable.go +++ b/service/timestreamwrite/api_op_CreateTable.go @@ -72,6 +72,9 @@ func addOperationCreateTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationCreateTableMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_DeleteDatabase.go b/service/timestreamwrite/api_op_DeleteDatabase.go index 1a0f66eca7b..93dc692bef7 100644 --- a/service/timestreamwrite/api_op_DeleteDatabase.go +++ b/service/timestreamwrite/api_op_DeleteDatabase.go @@ -51,6 +51,9 @@ func addOperationDeleteDatabaseMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationDeleteDatabaseMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_DeleteTable.go b/service/timestreamwrite/api_op_DeleteTable.go index 5675ed8462c..93b2ee01bee 100644 --- a/service/timestreamwrite/api_op_DeleteTable.go +++ b/service/timestreamwrite/api_op_DeleteTable.go @@ -55,6 +55,9 @@ func addOperationDeleteTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteTableMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_DescribeDatabase.go b/service/timestreamwrite/api_op_DescribeDatabase.go index 0d40e1098ea..4428cfced8b 100644 --- a/service/timestreamwrite/api_op_DescribeDatabase.go +++ b/service/timestreamwrite/api_op_DescribeDatabase.go @@ -57,6 +57,9 @@ func addOperationDescribeDatabaseMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeDatabaseMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_DescribeEndpoints.go b/service/timestreamwrite/api_op_DescribeEndpoints.go index 3b9fff93c50..c9f70a58999 100644 --- a/service/timestreamwrite/api_op_DescribeEndpoints.go +++ b/service/timestreamwrite/api_op_DescribeEndpoints.go @@ -64,6 +64,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationDescribeEndpointsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_DescribeTable.go b/service/timestreamwrite/api_op_DescribeTable.go index 9195660a9f6..a956ec4ae60 100644 --- a/service/timestreamwrite/api_op_DescribeTable.go +++ b/service/timestreamwrite/api_op_DescribeTable.go @@ -62,6 +62,9 @@ func addOperationDescribeTableMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDescribeTableMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_ListDatabases.go b/service/timestreamwrite/api_op_ListDatabases.go index a0744894af9..2bca255be2b 100644 --- a/service/timestreamwrite/api_op_ListDatabases.go +++ b/service/timestreamwrite/api_op_ListDatabases.go @@ -64,6 +64,9 @@ func addOperationListDatabasesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationListDatabasesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_ListTables.go b/service/timestreamwrite/api_op_ListTables.go index 089d176100d..96368a11860 100644 --- a/service/timestreamwrite/api_op_ListTables.go +++ b/service/timestreamwrite/api_op_ListTables.go @@ -66,6 +66,9 @@ func addOperationListTablesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListTablesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_ListTagsForResource.go b/service/timestreamwrite/api_op_ListTagsForResource.go index 1b053970274..8ac484ca12a 100644 --- a/service/timestreamwrite/api_op_ListTagsForResource.go +++ b/service/timestreamwrite/api_op_ListTagsForResource.go @@ -54,6 +54,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_TagResource.go b/service/timestreamwrite/api_op_TagResource.go index b7ba356749e..55ef61ac1a8 100644 --- a/service/timestreamwrite/api_op_TagResource.go +++ b/service/timestreamwrite/api_op_TagResource.go @@ -57,6 +57,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_UntagResource.go b/service/timestreamwrite/api_op_UntagResource.go index 0372b52343b..82fcb98471b 100644 --- a/service/timestreamwrite/api_op_UntagResource.go +++ b/service/timestreamwrite/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_UpdateDatabase.go b/service/timestreamwrite/api_op_UpdateDatabase.go index 5ee59d8a237..879f63e4ba5 100644 --- a/service/timestreamwrite/api_op_UpdateDatabase.go +++ b/service/timestreamwrite/api_op_UpdateDatabase.go @@ -78,6 +78,9 @@ func addOperationUpdateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationUpdateDatabaseMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_UpdateTable.go b/service/timestreamwrite/api_op_UpdateTable.go index b8383c4624d..d22368fc081 100644 --- a/service/timestreamwrite/api_op_UpdateTable.go +++ b/service/timestreamwrite/api_op_UpdateTable.go @@ -72,6 +72,9 @@ func addOperationUpdateTableMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationUpdateTableMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/api_op_WriteRecords.go b/service/timestreamwrite/api_op_WriteRecords.go index 2f0c5b407c6..ae116f691c0 100644 --- a/service/timestreamwrite/api_op_WriteRecords.go +++ b/service/timestreamwrite/api_op_WriteRecords.go @@ -79,6 +79,9 @@ func addOperationWriteRecordsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationWriteRecordsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/timestreamwrite/go.mod b/service/timestreamwrite/go.mod index 6b5b888bc50..fb05de20ff5 100644 --- a/service/timestreamwrite/go.mod +++ b/service/timestreamwrite/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/timestreamwrite go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/timestreamwrite/go.sum b/service/timestreamwrite/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/timestreamwrite/go.sum +++ b/service/timestreamwrite/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/transcribe/api_client.go b/service/transcribe/api_client.go index 25de9b06925..7de6d4ed34b 100644 --- a/service/transcribe/api_client.go +++ b/service/transcribe/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/transcribe/api_op_CreateLanguageModel.go b/service/transcribe/api_op_CreateLanguageModel.go index 54b91fe4fb0..9e678c38b89 100644 --- a/service/transcribe/api_op_CreateLanguageModel.go +++ b/service/transcribe/api_op_CreateLanguageModel.go @@ -90,6 +90,9 @@ func addOperationCreateLanguageModelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateLanguageModelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_CreateMedicalVocabulary.go b/service/transcribe/api_op_CreateMedicalVocabulary.go index b1374f22169..bd8552f74e3 100644 --- a/service/transcribe/api_op_CreateMedicalVocabulary.go +++ b/service/transcribe/api_op_CreateMedicalVocabulary.go @@ -97,6 +97,9 @@ func addOperationCreateMedicalVocabularyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateMedicalVocabularyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_CreateVocabulary.go b/service/transcribe/api_op_CreateVocabulary.go index 2299a6ace2e..eafcb88800a 100644 --- a/service/transcribe/api_op_CreateVocabulary.go +++ b/service/transcribe/api_op_CreateVocabulary.go @@ -89,6 +89,9 @@ func addOperationCreateVocabularyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateVocabularyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_CreateVocabularyFilter.go b/service/transcribe/api_op_CreateVocabularyFilter.go index b53aeccee93..07839bed28b 100644 --- a/service/transcribe/api_op_CreateVocabularyFilter.go +++ b/service/transcribe/api_op_CreateVocabularyFilter.go @@ -88,6 +88,9 @@ func addOperationCreateVocabularyFilterMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationCreateVocabularyFilterMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DeleteLanguageModel.go b/service/transcribe/api_op_DeleteLanguageModel.go index b5d942603af..1755b9f69e0 100644 --- a/service/transcribe/api_op_DeleteLanguageModel.go +++ b/service/transcribe/api_op_DeleteLanguageModel.go @@ -48,6 +48,9 @@ func addOperationDeleteLanguageModelMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteLanguageModelMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go b/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go index e9741cd6161..bbd3d781196 100644 --- a/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go +++ b/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go @@ -50,6 +50,9 @@ func addOperationDeleteMedicalTranscriptionJobMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteMedicalTranscriptionJobMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DeleteMedicalVocabulary.go b/service/transcribe/api_op_DeleteMedicalVocabulary.go index ab7fcc77700..eff736800da 100644 --- a/service/transcribe/api_op_DeleteMedicalVocabulary.go +++ b/service/transcribe/api_op_DeleteMedicalVocabulary.go @@ -48,6 +48,9 @@ func addOperationDeleteMedicalVocabularyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteMedicalVocabularyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DeleteTranscriptionJob.go b/service/transcribe/api_op_DeleteTranscriptionJob.go index ccd664c5168..5559620a077 100644 --- a/service/transcribe/api_op_DeleteTranscriptionJob.go +++ b/service/transcribe/api_op_DeleteTranscriptionJob.go @@ -49,6 +49,9 @@ func addOperationDeleteTranscriptionJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteTranscriptionJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DeleteVocabulary.go b/service/transcribe/api_op_DeleteVocabulary.go index 3fb05240741..5655676271b 100644 --- a/service/transcribe/api_op_DeleteVocabulary.go +++ b/service/transcribe/api_op_DeleteVocabulary.go @@ -48,6 +48,9 @@ func addOperationDeleteVocabularyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteVocabularyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DeleteVocabularyFilter.go b/service/transcribe/api_op_DeleteVocabularyFilter.go index c80333198d0..df03377437c 100644 --- a/service/transcribe/api_op_DeleteVocabularyFilter.go +++ b/service/transcribe/api_op_DeleteVocabularyFilter.go @@ -48,6 +48,9 @@ func addOperationDeleteVocabularyFilterMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteVocabularyFilterMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_DescribeLanguageModel.go b/service/transcribe/api_op_DescribeLanguageModel.go index 1d033cde030..fbf529ad948 100644 --- a/service/transcribe/api_op_DescribeLanguageModel.go +++ b/service/transcribe/api_op_DescribeLanguageModel.go @@ -59,6 +59,9 @@ func addOperationDescribeLanguageModelMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeLanguageModelMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_GetMedicalTranscriptionJob.go b/service/transcribe/api_op_GetMedicalTranscriptionJob.go index 14b6ba94d71..55d00eb0e64 100644 --- a/service/transcribe/api_op_GetMedicalTranscriptionJob.go +++ b/service/transcribe/api_op_GetMedicalTranscriptionJob.go @@ -56,6 +56,9 @@ func addOperationGetMedicalTranscriptionJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationGetMedicalTranscriptionJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_GetMedicalVocabulary.go b/service/transcribe/api_op_GetMedicalVocabulary.go index 97f8a0e3365..ef46a991f76 100644 --- a/service/transcribe/api_op_GetMedicalVocabulary.go +++ b/service/transcribe/api_op_GetMedicalVocabulary.go @@ -75,6 +75,9 @@ func addOperationGetMedicalVocabularyMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetMedicalVocabularyMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_GetTranscriptionJob.go b/service/transcribe/api_op_GetTranscriptionJob.go index ec4666108d7..47fd15384e3 100644 --- a/service/transcribe/api_op_GetTranscriptionJob.go +++ b/service/transcribe/api_op_GetTranscriptionJob.go @@ -57,6 +57,9 @@ func addOperationGetTranscriptionJobMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationGetTranscriptionJobMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_GetVocabulary.go b/service/transcribe/api_op_GetVocabulary.go index 95fcb475171..5bb6cebc325 100644 --- a/service/transcribe/api_op_GetVocabulary.go +++ b/service/transcribe/api_op_GetVocabulary.go @@ -72,6 +72,9 @@ func addOperationGetVocabularyMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetVocabularyMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_GetVocabularyFilter.go b/service/transcribe/api_op_GetVocabularyFilter.go index 496f94b82e8..384369bb56d 100644 --- a/service/transcribe/api_op_GetVocabularyFilter.go +++ b/service/transcribe/api_op_GetVocabularyFilter.go @@ -64,6 +64,9 @@ func addOperationGetVocabularyFilterMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationGetVocabularyFilterMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_ListLanguageModels.go b/service/transcribe/api_op_ListLanguageModels.go index c3c5ba432d3..c02b784589d 100644 --- a/service/transcribe/api_op_ListLanguageModels.go +++ b/service/transcribe/api_op_ListLanguageModels.go @@ -75,6 +75,9 @@ func addOperationListLanguageModelsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListLanguageModelsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_ListMedicalTranscriptionJobs.go b/service/transcribe/api_op_ListMedicalTranscriptionJobs.go index fe5247fcac4..f71d47d457c 100644 --- a/service/transcribe/api_op_ListMedicalTranscriptionJobs.go +++ b/service/transcribe/api_op_ListMedicalTranscriptionJobs.go @@ -78,6 +78,9 @@ func addOperationListMedicalTranscriptionJobsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListMedicalTranscriptionJobsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_ListMedicalVocabularies.go b/service/transcribe/api_op_ListMedicalVocabularies.go index 18b9bb4c989..86afed77dd3 100644 --- a/service/transcribe/api_op_ListMedicalVocabularies.go +++ b/service/transcribe/api_op_ListMedicalVocabularies.go @@ -79,6 +79,9 @@ func addOperationListMedicalVocabulariesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationListMedicalVocabulariesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_ListTranscriptionJobs.go b/service/transcribe/api_op_ListTranscriptionJobs.go index ba41a3f2026..0159d72c76a 100644 --- a/service/transcribe/api_op_ListTranscriptionJobs.go +++ b/service/transcribe/api_op_ListTranscriptionJobs.go @@ -76,6 +76,9 @@ func addOperationListTranscriptionJobsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationListTranscriptionJobsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_ListVocabularies.go b/service/transcribe/api_op_ListVocabularies.go index bf355627646..57fd6d5736c 100644 --- a/service/transcribe/api_op_ListVocabularies.go +++ b/service/transcribe/api_op_ListVocabularies.go @@ -78,6 +78,9 @@ func addOperationListVocabulariesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListVocabulariesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_ListVocabularyFilters.go b/service/transcribe/api_op_ListVocabularyFilters.go index ce94dccc467..74bc5abe568 100644 --- a/service/transcribe/api_op_ListVocabularyFilters.go +++ b/service/transcribe/api_op_ListVocabularyFilters.go @@ -70,6 +70,9 @@ func addOperationListVocabularyFiltersMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListVocabularyFiltersMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_StartMedicalTranscriptionJob.go b/service/transcribe/api_op_StartMedicalTranscriptionJob.go index 06d0f574883..fc18bd2b07d 100644 --- a/service/transcribe/api_op_StartMedicalTranscriptionJob.go +++ b/service/transcribe/api_op_StartMedicalTranscriptionJob.go @@ -154,6 +154,9 @@ func addOperationStartMedicalTranscriptionJobMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -196,6 +199,9 @@ func addOperationStartMedicalTranscriptionJobMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_StartTranscriptionJob.go b/service/transcribe/api_op_StartTranscriptionJob.go index 56b20998eb1..3c3021d68aa 100644 --- a/service/transcribe/api_op_StartTranscriptionJob.go +++ b/service/transcribe/api_op_StartTranscriptionJob.go @@ -160,6 +160,9 @@ func addOperationStartTranscriptionJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -202,6 +205,9 @@ func addOperationStartTranscriptionJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_UpdateMedicalVocabulary.go b/service/transcribe/api_op_UpdateMedicalVocabulary.go index 42604a9018f..7c7d4a43793 100644 --- a/service/transcribe/api_op_UpdateMedicalVocabulary.go +++ b/service/transcribe/api_op_UpdateMedicalVocabulary.go @@ -91,6 +91,9 @@ func addOperationUpdateMedicalVocabularyMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationUpdateMedicalVocabularyMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_UpdateVocabulary.go b/service/transcribe/api_op_UpdateVocabulary.go index 560ee380421..135493390d5 100644 --- a/service/transcribe/api_op_UpdateVocabulary.go +++ b/service/transcribe/api_op_UpdateVocabulary.go @@ -86,6 +86,9 @@ func addOperationUpdateVocabularyMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationUpdateVocabularyMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/api_op_UpdateVocabularyFilter.go b/service/transcribe/api_op_UpdateVocabularyFilter.go index 350295b5029..9cc0ea7db21 100644 --- a/service/transcribe/api_op_UpdateVocabularyFilter.go +++ b/service/transcribe/api_op_UpdateVocabularyFilter.go @@ -80,6 +80,9 @@ func addOperationUpdateVocabularyFilterMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationUpdateVocabularyFilterMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transcribe/go.mod b/service/transcribe/go.mod index bc869ddabe1..51090c34d5d 100644 --- a/service/transcribe/go.mod +++ b/service/transcribe/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/transcribe go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/transcribe/go.sum b/service/transcribe/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/transcribe/go.sum +++ b/service/transcribe/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/transfer/api_client.go b/service/transfer/api_client.go index e25f48977f8..839be6fe679 100644 --- a/service/transfer/api_client.go +++ b/service/transfer/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/transfer/api_op_CreateServer.go b/service/transfer/api_op_CreateServer.go index 74ecaf24e31..ae4d5c68d04 100644 --- a/service/transfer/api_op_CreateServer.go +++ b/service/transfer/api_op_CreateServer.go @@ -156,6 +156,9 @@ func addOperationCreateServerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -198,6 +201,9 @@ func addOperationCreateServerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_CreateUser.go b/service/transfer/api_op_CreateUser.go index e859519d4e4..936f856b3e9 100644 --- a/service/transfer/api_op_CreateUser.go +++ b/service/transfer/api_op_CreateUser.go @@ -139,6 +139,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -181,6 +184,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_DeleteServer.go b/service/transfer/api_op_DeleteServer.go index fc94ef45b90..37d0e9f1342 100644 --- a/service/transfer/api_op_DeleteServer.go +++ b/service/transfer/api_op_DeleteServer.go @@ -49,6 +49,9 @@ func addOperationDeleteServerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteServerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_DeleteSshPublicKey.go b/service/transfer/api_op_DeleteSshPublicKey.go index 31bbb158f39..8c37b551691 100644 --- a/service/transfer/api_op_DeleteSshPublicKey.go +++ b/service/transfer/api_op_DeleteSshPublicKey.go @@ -60,6 +60,9 @@ func addOperationDeleteSshPublicKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteSshPublicKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_DeleteUser.go b/service/transfer/api_op_DeleteUser.go index 168f4b638b8..013fd68e16f 100644 --- a/service/transfer/api_op_DeleteUser.go +++ b/service/transfer/api_op_DeleteUser.go @@ -56,6 +56,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_DescribeSecurityPolicy.go b/service/transfer/api_op_DescribeSecurityPolicy.go index 2f81cb2b619..94a0616175b 100644 --- a/service/transfer/api_op_DescribeSecurityPolicy.go +++ b/service/transfer/api_op_DescribeSecurityPolicy.go @@ -59,6 +59,9 @@ func addOperationDescribeSecurityPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeSecurityPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_DescribeServer.go b/service/transfer/api_op_DescribeServer.go index 998e655f4bf..cfb082a4f06 100644 --- a/service/transfer/api_op_DescribeServer.go +++ b/service/transfer/api_op_DescribeServer.go @@ -58,6 +58,9 @@ func addOperationDescribeServerMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeServerMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_DescribeUser.go b/service/transfer/api_op_DescribeUser.go index d593728d696..1e487c5262e 100644 --- a/service/transfer/api_op_DescribeUser.go +++ b/service/transfer/api_op_DescribeUser.go @@ -71,6 +71,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_ImportSshPublicKey.go b/service/transfer/api_op_ImportSshPublicKey.go index 29b0e38ea8f..d629e617100 100644 --- a/service/transfer/api_op_ImportSshPublicKey.go +++ b/service/transfer/api_op_ImportSshPublicKey.go @@ -80,6 +80,9 @@ func addOperationImportSshPublicKeyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationImportSshPublicKeyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_ListSecurityPolicies.go b/service/transfer/api_op_ListSecurityPolicies.go index c2ad97ba633..f6504a44ca6 100644 --- a/service/transfer/api_op_ListSecurityPolicies.go +++ b/service/transfer/api_op_ListSecurityPolicies.go @@ -65,6 +65,9 @@ func addOperationListSecurityPoliciesMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListSecurityPoliciesMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_ListServers.go b/service/transfer/api_op_ListServers.go index d5752b00982..ed42e861813 100644 --- a/service/transfer/api_op_ListServers.go +++ b/service/transfer/api_op_ListServers.go @@ -65,6 +65,9 @@ func addOperationListServersMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationListServersMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_ListTagsForResource.go b/service/transfer/api_op_ListTagsForResource.go index 63a7e17e442..27c8ec95bab 100644 --- a/service/transfer/api_op_ListTagsForResource.go +++ b/service/transfer/api_op_ListTagsForResource.go @@ -74,6 +74,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_ListUsers.go b/service/transfer/api_op_ListUsers.go index 8e5ae025b64..781d30c3600 100644 --- a/service/transfer/api_op_ListUsers.go +++ b/service/transfer/api_op_ListUsers.go @@ -75,6 +75,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_StartServer.go b/service/transfer/api_op_StartServer.go index ef3b127a04f..c63890adce5 100644 --- a/service/transfer/api_op_StartServer.go +++ b/service/transfer/api_op_StartServer.go @@ -53,6 +53,9 @@ func addOperationStartServerMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationStartServerMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_StopServer.go b/service/transfer/api_op_StopServer.go index 9e3b89d6aeb..995476d0792 100644 --- a/service/transfer/api_op_StopServer.go +++ b/service/transfer/api_op_StopServer.go @@ -56,6 +56,9 @@ func addOperationStopServerMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationStopServerMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_TagResource.go b/service/transfer/api_op_TagResource.go index 655a26f0efd..2f1d78f1834 100644 --- a/service/transfer/api_op_TagResource.go +++ b/service/transfer/api_op_TagResource.go @@ -59,6 +59,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_TestIdentityProvider.go b/service/transfer/api_op_TestIdentityProvider.go index d7eac594eec..0b3cddd5e63 100644 --- a/service/transfer/api_op_TestIdentityProvider.go +++ b/service/transfer/api_op_TestIdentityProvider.go @@ -94,6 +94,9 @@ func addOperationTestIdentityProviderMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationTestIdentityProviderMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_UntagResource.go b/service/transfer/api_op_UntagResource.go index 0a4f0a55c7e..a0477eb9711 100644 --- a/service/transfer/api_op_UntagResource.go +++ b/service/transfer/api_op_UntagResource.go @@ -59,6 +59,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_UpdateServer.go b/service/transfer/api_op_UpdateServer.go index b6d2160c634..07e8cdc3604 100644 --- a/service/transfer/api_op_UpdateServer.go +++ b/service/transfer/api_op_UpdateServer.go @@ -148,6 +148,9 @@ func addOperationUpdateServerMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -190,6 +193,9 @@ func addOperationUpdateServerMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/api_op_UpdateUser.go b/service/transfer/api_op_UpdateUser.go index 7e844192082..a29b09e7cac 100644 --- a/service/transfer/api_op_UpdateUser.go +++ b/service/transfer/api_op_UpdateUser.go @@ -131,6 +131,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -173,6 +176,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/transfer/go.mod b/service/transfer/go.mod index 77854028e8d..506516a778e 100644 --- a/service/transfer/go.mod +++ b/service/transfer/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/transfer go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/transfer/go.sum b/service/transfer/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/transfer/go.sum +++ b/service/transfer/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/translate/api_client.go b/service/translate/api_client.go index fcbd0491d97..8d8f0fe7623 100644 --- a/service/translate/api_client.go +++ b/service/translate/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/translate/api_op_DeleteTerminology.go b/service/translate/api_op_DeleteTerminology.go index bdac02fec3e..26fb2b5af07 100644 --- a/service/translate/api_op_DeleteTerminology.go +++ b/service/translate/api_op_DeleteTerminology.go @@ -48,6 +48,9 @@ func addOperationDeleteTerminologyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteTerminologyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_DescribeTextTranslationJob.go b/service/translate/api_op_DescribeTextTranslationJob.go index 8ac52701bd2..aa69b873bd4 100644 --- a/service/translate/api_op_DescribeTextTranslationJob.go +++ b/service/translate/api_op_DescribeTextTranslationJob.go @@ -57,6 +57,9 @@ func addOperationDescribeTextTranslationJobMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDescribeTextTranslationJobMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_GetTerminology.go b/service/translate/api_op_GetTerminology.go index c1b466f5ae6..60d9961fe28 100644 --- a/service/translate/api_op_GetTerminology.go +++ b/service/translate/api_op_GetTerminology.go @@ -62,6 +62,9 @@ func addOperationGetTerminologyMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetTerminologyMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_ImportTerminology.go b/service/translate/api_op_ImportTerminology.go index c73bb6f8941..de258019706 100644 --- a/service/translate/api_op_ImportTerminology.go +++ b/service/translate/api_op_ImportTerminology.go @@ -79,6 +79,9 @@ func addOperationImportTerminologyMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationImportTerminologyMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_ListTerminologies.go b/service/translate/api_op_ListTerminologies.go index 4b4e0c06072..611ea90b13b 100644 --- a/service/translate/api_op_ListTerminologies.go +++ b/service/translate/api_op_ListTerminologies.go @@ -59,6 +59,9 @@ func addOperationListTerminologiesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListTerminologiesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_ListTextTranslationJobs.go b/service/translate/api_op_ListTextTranslationJobs.go index 179dcbbb33f..e72d45886eb 100644 --- a/service/translate/api_op_ListTextTranslationJobs.go +++ b/service/translate/api_op_ListTextTranslationJobs.go @@ -63,6 +63,9 @@ func addOperationListTextTranslationJobsMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationListTextTranslationJobsMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_StartTextTranslationJob.go b/service/translate/api_op_StartTextTranslationJob.go index f41fe10f5a1..8a2d8be0ba7 100644 --- a/service/translate/api_op_StartTextTranslationJob.go +++ b/service/translate/api_op_StartTextTranslationJob.go @@ -123,6 +123,9 @@ func addOperationStartTextTranslationJobMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -168,6 +171,9 @@ func addOperationStartTextTranslationJobMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_StopTextTranslationJob.go b/service/translate/api_op_StopTextTranslationJob.go index b7bb2fdb719..11a292010e0 100644 --- a/service/translate/api_op_StopTextTranslationJob.go +++ b/service/translate/api_op_StopTextTranslationJob.go @@ -63,6 +63,9 @@ func addOperationStopTextTranslationJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationStopTextTranslationJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/api_op_TranslateText.go b/service/translate/api_op_TranslateText.go index 9f452fe8a67..d67218e0456 100644 --- a/service/translate/api_op_TranslateText.go +++ b/service/translate/api_op_TranslateText.go @@ -93,6 +93,9 @@ func addOperationTranslateTextMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationTranslateTextMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/translate/go.mod b/service/translate/go.mod index d7b26d6e72b..77bd58dadee 100644 --- a/service/translate/go.mod +++ b/service/translate/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/translate go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/translate/go.sum b/service/translate/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/translate/go.sum +++ b/service/translate/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/waf/api_client.go b/service/waf/api_client.go index 044a407dea4..15620c7ebe5 100644 --- a/service/waf/api_client.go +++ b/service/waf/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/waf/api_op_CreateByteMatchSet.go b/service/waf/api_op_CreateByteMatchSet.go index 92176893de5..e414cf31c5a 100644 --- a/service/waf/api_op_CreateByteMatchSet.go +++ b/service/waf/api_op_CreateByteMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateByteMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateByteMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateGeoMatchSet.go b/service/waf/api_op_CreateGeoMatchSet.go index e52171222bc..216be56f9ef 100644 --- a/service/waf/api_op_CreateGeoMatchSet.go +++ b/service/waf/api_op_CreateGeoMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateIPSet.go b/service/waf/api_op_CreateIPSet.go index c7d80d390cd..35c9cbc3d70 100644 --- a/service/waf/api_op_CreateIPSet.go +++ b/service/waf/api_op_CreateIPSet.go @@ -93,6 +93,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateRateBasedRule.go b/service/waf/api_op_CreateRateBasedRule.go index b6880a64377..0df654fb7d6 100644 --- a/service/waf/api_op_CreateRateBasedRule.go +++ b/service/waf/api_op_CreateRateBasedRule.go @@ -162,6 +162,9 @@ func addOperationCreateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationCreateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateRegexMatchSet.go b/service/waf/api_op_CreateRegexMatchSet.go index 703fc6562f8..ce98919c3a4 100644 --- a/service/waf/api_op_CreateRegexMatchSet.go +++ b/service/waf/api_op_CreateRegexMatchSet.go @@ -95,6 +95,9 @@ func addOperationCreateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateRegexPatternSet.go b/service/waf/api_op_CreateRegexPatternSet.go index b25e289b7db..73677bc3911 100644 --- a/service/waf/api_op_CreateRegexPatternSet.go +++ b/service/waf/api_op_CreateRegexPatternSet.go @@ -91,6 +91,9 @@ func addOperationCreateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateRule.go b/service/waf/api_op_CreateRule.go index 27596a93067..845795d7b8f 100644 --- a/service/waf/api_op_CreateRule.go +++ b/service/waf/api_op_CreateRule.go @@ -122,6 +122,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateRuleGroup.go b/service/waf/api_op_CreateRuleGroup.go index dd2c0d7f9ac..545b7623569 100644 --- a/service/waf/api_op_CreateRuleGroup.go +++ b/service/waf/api_op_CreateRuleGroup.go @@ -97,6 +97,9 @@ func addOperationCreateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateSizeConstraintSet.go b/service/waf/api_op_CreateSizeConstraintSet.go index 11481405126..d864c62b9d7 100644 --- a/service/waf/api_op_CreateSizeConstraintSet.go +++ b/service/waf/api_op_CreateSizeConstraintSet.go @@ -95,6 +95,9 @@ func addOperationCreateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateSqlInjectionMatchSet.go b/service/waf/api_op_CreateSqlInjectionMatchSet.go index 6964d733921..311f595eb2e 100644 --- a/service/waf/api_op_CreateSqlInjectionMatchSet.go +++ b/service/waf/api_op_CreateSqlInjectionMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateWebACL.go b/service/waf/api_op_CreateWebACL.go index 250313f50f7..8ca7420552e 100644 --- a/service/waf/api_op_CreateWebACL.go +++ b/service/waf/api_op_CreateWebACL.go @@ -121,6 +121,9 @@ func addOperationCreateWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationCreateWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateWebACLMigrationStack.go b/service/waf/api_op_CreateWebACLMigrationStack.go index 2acf80d1e3e..dd6d4e2332f 100644 --- a/service/waf/api_op_CreateWebACLMigrationStack.go +++ b/service/waf/api_op_CreateWebACLMigrationStack.go @@ -90,6 +90,9 @@ func addOperationCreateWebACLMigrationStackMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateWebACLMigrationStackMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_CreateXssMatchSet.go b/service/waf/api_op_CreateXssMatchSet.go index be27c0f592f..3e04321e5c7 100644 --- a/service/waf/api_op_CreateXssMatchSet.go +++ b/service/waf/api_op_CreateXssMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteByteMatchSet.go b/service/waf/api_op_DeleteByteMatchSet.go index f2e8d17be4d..9b7879c3b8f 100644 --- a/service/waf/api_op_DeleteByteMatchSet.go +++ b/service/waf/api_op_DeleteByteMatchSet.go @@ -79,6 +79,9 @@ func addOperationDeleteByteMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteByteMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteGeoMatchSet.go b/service/waf/api_op_DeleteGeoMatchSet.go index 66e0f08ba05..f2e5ff7d0d4 100644 --- a/service/waf/api_op_DeleteGeoMatchSet.go +++ b/service/waf/api_op_DeleteGeoMatchSet.go @@ -79,6 +79,9 @@ func addOperationDeleteGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteIPSet.go b/service/waf/api_op_DeleteIPSet.go index 044813e493f..470eaf1b8cf 100644 --- a/service/waf/api_op_DeleteIPSet.go +++ b/service/waf/api_op_DeleteIPSet.go @@ -78,6 +78,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteLoggingConfiguration.go b/service/waf/api_op_DeleteLoggingConfiguration.go index f2004c19470..fc0017639e3 100644 --- a/service/waf/api_op_DeleteLoggingConfiguration.go +++ b/service/waf/api_op_DeleteLoggingConfiguration.go @@ -56,6 +56,9 @@ func addOperationDeleteLoggingConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteLoggingConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeletePermissionPolicy.go b/service/waf/api_op_DeletePermissionPolicy.go index 4155ede8a5a..aebf20eaae8 100644 --- a/service/waf/api_op_DeletePermissionPolicy.go +++ b/service/waf/api_op_DeletePermissionPolicy.go @@ -56,6 +56,9 @@ func addOperationDeletePermissionPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeletePermissionPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteRateBasedRule.go b/service/waf/api_op_DeleteRateBasedRule.go index 4c7d89564a5..2dffec2bc70 100644 --- a/service/waf/api_op_DeleteRateBasedRule.go +++ b/service/waf/api_op_DeleteRateBasedRule.go @@ -79,6 +79,9 @@ func addOperationDeleteRateBasedRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteRateBasedRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteRegexMatchSet.go b/service/waf/api_op_DeleteRegexMatchSet.go index 829194e2d00..c885a6088f7 100644 --- a/service/waf/api_op_DeleteRegexMatchSet.go +++ b/service/waf/api_op_DeleteRegexMatchSet.go @@ -80,6 +80,9 @@ func addOperationDeleteRegexMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteRegexMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteRegexPatternSet.go b/service/waf/api_op_DeleteRegexPatternSet.go index 026a9ab4bbb..2736b2af4a9 100644 --- a/service/waf/api_op_DeleteRegexPatternSet.go +++ b/service/waf/api_op_DeleteRegexPatternSet.go @@ -69,6 +69,9 @@ func addOperationDeleteRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteRule.go b/service/waf/api_op_DeleteRule.go index c130fdc7899..611a1e8c438 100644 --- a/service/waf/api_op_DeleteRule.go +++ b/service/waf/api_op_DeleteRule.go @@ -79,6 +79,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteRuleGroup.go b/service/waf/api_op_DeleteRuleGroup.go index 90041c7b4e0..00d59d70940 100644 --- a/service/waf/api_op_DeleteRuleGroup.go +++ b/service/waf/api_op_DeleteRuleGroup.go @@ -78,6 +78,9 @@ func addOperationDeleteRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteSizeConstraintSet.go b/service/waf/api_op_DeleteSizeConstraintSet.go index 3e835e934a9..8e6b2aaa515 100644 --- a/service/waf/api_op_DeleteSizeConstraintSet.go +++ b/service/waf/api_op_DeleteSizeConstraintSet.go @@ -81,6 +81,9 @@ func addOperationDeleteSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteSqlInjectionMatchSet.go b/service/waf/api_op_DeleteSqlInjectionMatchSet.go index 0012d9d6d89..ecf040fd343 100644 --- a/service/waf/api_op_DeleteSqlInjectionMatchSet.go +++ b/service/waf/api_op_DeleteSqlInjectionMatchSet.go @@ -83,6 +83,9 @@ func addOperationDeleteSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDeleteSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteWebACL.go b/service/waf/api_op_DeleteWebACL.go index 5b0b30e6788..4a964efcebc 100644 --- a/service/waf/api_op_DeleteWebACL.go +++ b/service/waf/api_op_DeleteWebACL.go @@ -76,6 +76,9 @@ func addOperationDeleteWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDeleteWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_DeleteXssMatchSet.go b/service/waf/api_op_DeleteXssMatchSet.go index 53c815dd869..df2999cd0b5 100644 --- a/service/waf/api_op_DeleteXssMatchSet.go +++ b/service/waf/api_op_DeleteXssMatchSet.go @@ -81,6 +81,9 @@ func addOperationDeleteXssMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteXssMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetByteMatchSet.go b/service/waf/api_op_GetByteMatchSet.go index da7e636e817..df378f40074 100644 --- a/service/waf/api_op_GetByteMatchSet.go +++ b/service/waf/api_op_GetByteMatchSet.go @@ -71,6 +71,9 @@ func addOperationGetByteMatchSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetByteMatchSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetChangeToken.go b/service/waf/api_op_GetChangeToken.go index cdbfc99f9bd..96e2fc89122 100644 --- a/service/waf/api_op_GetChangeToken.go +++ b/service/waf/api_op_GetChangeToken.go @@ -64,6 +64,9 @@ func addOperationGetChangeTokenMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetChangeTokenMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetChangeTokenStatus.go b/service/waf/api_op_GetChangeTokenStatus.go index 04fe81b0346..15c1f1c26cb 100644 --- a/service/waf/api_op_GetChangeTokenStatus.go +++ b/service/waf/api_op_GetChangeTokenStatus.go @@ -71,6 +71,9 @@ func addOperationGetChangeTokenStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetChangeTokenStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetGeoMatchSet.go b/service/waf/api_op_GetGeoMatchSet.go index 5336a201038..974009f11c8 100644 --- a/service/waf/api_op_GetGeoMatchSet.go +++ b/service/waf/api_op_GetGeoMatchSet.go @@ -62,6 +62,9 @@ func addOperationGetGeoMatchSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetGeoMatchSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetIPSet.go b/service/waf/api_op_GetIPSet.go index a408208327a..fbf36519088 100644 --- a/service/waf/api_op_GetIPSet.go +++ b/service/waf/api_op_GetIPSet.go @@ -67,6 +67,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetLoggingConfiguration.go b/service/waf/api_op_GetLoggingConfiguration.go index d00694c4fcd..748d5a10167 100644 --- a/service/waf/api_op_GetLoggingConfiguration.go +++ b/service/waf/api_op_GetLoggingConfiguration.go @@ -60,6 +60,9 @@ func addOperationGetLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetPermissionPolicy.go b/service/waf/api_op_GetPermissionPolicy.go index 008e4b7d873..90ee9e5fb20 100644 --- a/service/waf/api_op_GetPermissionPolicy.go +++ b/service/waf/api_op_GetPermissionPolicy.go @@ -59,6 +59,9 @@ func addOperationGetPermissionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetPermissionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetRateBasedRule.go b/service/waf/api_op_GetRateBasedRule.go index 44ba667a2bf..2b19cbd36b8 100644 --- a/service/waf/api_op_GetRateBasedRule.go +++ b/service/waf/api_op_GetRateBasedRule.go @@ -62,6 +62,9 @@ func addOperationGetRateBasedRuleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetRateBasedRuleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetRateBasedRuleManagedKeys.go b/service/waf/api_op_GetRateBasedRuleManagedKeys.go index a411e1fc010..22352a570d1 100644 --- a/service/waf/api_op_GetRateBasedRuleManagedKeys.go +++ b/service/waf/api_op_GetRateBasedRuleManagedKeys.go @@ -69,6 +69,9 @@ func addOperationGetRateBasedRuleManagedKeysMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetRateBasedRuleManagedKeysMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetRegexMatchSet.go b/service/waf/api_op_GetRegexMatchSet.go index 2945a18cd82..24ed32423f3 100644 --- a/service/waf/api_op_GetRegexMatchSet.go +++ b/service/waf/api_op_GetRegexMatchSet.go @@ -61,6 +61,9 @@ func addOperationGetRegexMatchSetMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetRegexMatchSetMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetRegexPatternSet.go b/service/waf/api_op_GetRegexPatternSet.go index 9747683d337..6ef052da940 100644 --- a/service/waf/api_op_GetRegexPatternSet.go +++ b/service/waf/api_op_GetRegexPatternSet.go @@ -63,6 +63,9 @@ func addOperationGetRegexPatternSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetRegexPatternSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetRule.go b/service/waf/api_op_GetRule.go index fdd8b2be9de..5937eff0ddb 100644 --- a/service/waf/api_op_GetRule.go +++ b/service/waf/api_op_GetRule.go @@ -68,6 +68,9 @@ func addOperationGetRuleMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetRuleMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetRuleGroup.go b/service/waf/api_op_GetRuleGroup.go index fcb4e7d34dc..b1e31f07636 100644 --- a/service/waf/api_op_GetRuleGroup.go +++ b/service/waf/api_op_GetRuleGroup.go @@ -62,6 +62,9 @@ func addOperationGetRuleGroupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetRuleGroupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetSampledRequests.go b/service/waf/api_op_GetSampledRequests.go index 2d2e273782f..8012b6bf18b 100644 --- a/service/waf/api_op_GetSampledRequests.go +++ b/service/waf/api_op_GetSampledRequests.go @@ -111,6 +111,9 @@ func addOperationGetSampledRequestsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationGetSampledRequestsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetSizeConstraintSet.go b/service/waf/api_op_GetSizeConstraintSet.go index 68e01e2ac3c..0aab590fb08 100644 --- a/service/waf/api_op_GetSizeConstraintSet.go +++ b/service/waf/api_op_GetSizeConstraintSet.go @@ -72,6 +72,9 @@ func addOperationGetSizeConstraintSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetSizeConstraintSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetSqlInjectionMatchSet.go b/service/waf/api_op_GetSqlInjectionMatchSet.go index c093b6ad201..af9a0e6d8cd 100644 --- a/service/waf/api_op_GetSqlInjectionMatchSet.go +++ b/service/waf/api_op_GetSqlInjectionMatchSet.go @@ -75,6 +75,9 @@ func addOperationGetSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetWebACL.go b/service/waf/api_op_GetWebACL.go index fa0a820b499..2ddd157dd2e 100644 --- a/service/waf/api_op_GetWebACL.go +++ b/service/waf/api_op_GetWebACL.go @@ -72,6 +72,9 @@ func addOperationGetWebACLMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetWebACLMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_GetXssMatchSet.go b/service/waf/api_op_GetXssMatchSet.go index c8d77978286..fb3a436481e 100644 --- a/service/waf/api_op_GetXssMatchSet.go +++ b/service/waf/api_op_GetXssMatchSet.go @@ -72,6 +72,9 @@ func addOperationGetXssMatchSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetXssMatchSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListActivatedRulesInRuleGroup.go b/service/waf/api_op_ListActivatedRulesInRuleGroup.go index 0facec7fa81..8e0009159b9 100644 --- a/service/waf/api_op_ListActivatedRulesInRuleGroup.go +++ b/service/waf/api_op_ListActivatedRulesInRuleGroup.go @@ -78,6 +78,9 @@ func addOperationListActivatedRulesInRuleGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListActivatedRulesInRuleGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListByteMatchSets.go b/service/waf/api_op_ListByteMatchSets.go index a5c1e102182..488845248ac 100644 --- a/service/waf/api_op_ListByteMatchSets.go +++ b/service/waf/api_op_ListByteMatchSets.go @@ -73,6 +73,9 @@ func addOperationListByteMatchSetsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListByteMatchSetsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListGeoMatchSets.go b/service/waf/api_op_ListGeoMatchSets.go index ea0fee8fcc1..662f8e91004 100644 --- a/service/waf/api_op_ListGeoMatchSets.go +++ b/service/waf/api_op_ListGeoMatchSets.go @@ -73,6 +73,9 @@ func addOperationListGeoMatchSetsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListGeoMatchSetsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListIPSets.go b/service/waf/api_op_ListIPSets.go index b1b9aa46df5..b3c64aa0830 100644 --- a/service/waf/api_op_ListIPSets.go +++ b/service/waf/api_op_ListIPSets.go @@ -70,6 +70,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListLoggingConfigurations.go b/service/waf/api_op_ListLoggingConfigurations.go index 8c71cecad09..1f7a058201c 100644 --- a/service/waf/api_op_ListLoggingConfigurations.go +++ b/service/waf/api_op_ListLoggingConfigurations.go @@ -75,6 +75,9 @@ func addOperationListLoggingConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListLoggingConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListRateBasedRules.go b/service/waf/api_op_ListRateBasedRules.go index b83ba677eb4..59bbbb174b3 100644 --- a/service/waf/api_op_ListRateBasedRules.go +++ b/service/waf/api_op_ListRateBasedRules.go @@ -72,6 +72,9 @@ func addOperationListRateBasedRulesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListRateBasedRulesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListRegexMatchSets.go b/service/waf/api_op_ListRegexMatchSets.go index f914e8bb755..e34371f39ba 100644 --- a/service/waf/api_op_ListRegexMatchSets.go +++ b/service/waf/api_op_ListRegexMatchSets.go @@ -74,6 +74,9 @@ func addOperationListRegexMatchSetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListRegexMatchSetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListRegexPatternSets.go b/service/waf/api_op_ListRegexPatternSets.go index b816c460920..df307e81ea2 100644 --- a/service/waf/api_op_ListRegexPatternSets.go +++ b/service/waf/api_op_ListRegexPatternSets.go @@ -75,6 +75,9 @@ func addOperationListRegexPatternSetsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListRegexPatternSetsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListRuleGroups.go b/service/waf/api_op_ListRuleGroups.go index a56a7d03538..9bff341a54a 100644 --- a/service/waf/api_op_ListRuleGroups.go +++ b/service/waf/api_op_ListRuleGroups.go @@ -73,6 +73,9 @@ func addOperationListRuleGroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListRuleGroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListRules.go b/service/waf/api_op_ListRules.go index 8e93f5f753b..5fb38611b34 100644 --- a/service/waf/api_op_ListRules.go +++ b/service/waf/api_op_ListRules.go @@ -72,6 +72,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListSizeConstraintSets.go b/service/waf/api_op_ListSizeConstraintSets.go index 563a100071b..db16acfc910 100644 --- a/service/waf/api_op_ListSizeConstraintSets.go +++ b/service/waf/api_op_ListSizeConstraintSets.go @@ -74,6 +74,9 @@ func addOperationListSizeConstraintSetsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListSizeConstraintSetsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListSqlInjectionMatchSets.go b/service/waf/api_op_ListSqlInjectionMatchSets.go index bfb4fae7666..e6707f7a76d 100644 --- a/service/waf/api_op_ListSqlInjectionMatchSets.go +++ b/service/waf/api_op_ListSqlInjectionMatchSets.go @@ -78,6 +78,9 @@ func addOperationListSqlInjectionMatchSetsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListSqlInjectionMatchSetsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListSubscribedRuleGroups.go b/service/waf/api_op_ListSubscribedRuleGroups.go index 747407ad129..cdfa19fe7b0 100644 --- a/service/waf/api_op_ListSubscribedRuleGroups.go +++ b/service/waf/api_op_ListSubscribedRuleGroups.go @@ -74,6 +74,9 @@ func addOperationListSubscribedRuleGroupsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListSubscribedRuleGroupsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListTagsForResource.go b/service/waf/api_op_ListTagsForResource.go index e4e4e5ac605..c9dca457b75 100644 --- a/service/waf/api_op_ListTagsForResource.go +++ b/service/waf/api_op_ListTagsForResource.go @@ -75,6 +75,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListWebACLs.go b/service/waf/api_op_ListWebACLs.go index 7386c7dfe93..fcea1aa32e8 100644 --- a/service/waf/api_op_ListWebACLs.go +++ b/service/waf/api_op_ListWebACLs.go @@ -73,6 +73,9 @@ func addOperationListWebACLsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListWebACLsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_ListXssMatchSets.go b/service/waf/api_op_ListXssMatchSets.go index 707c00a9472..5063f9d734b 100644 --- a/service/waf/api_op_ListXssMatchSets.go +++ b/service/waf/api_op_ListXssMatchSets.go @@ -75,6 +75,9 @@ func addOperationListXssMatchSetsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListXssMatchSetsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_PutLoggingConfiguration.go b/service/waf/api_op_PutLoggingConfiguration.go index 800e39bd962..517b692855b 100644 --- a/service/waf/api_op_PutLoggingConfiguration.go +++ b/service/waf/api_op_PutLoggingConfiguration.go @@ -80,6 +80,9 @@ func addOperationPutLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationPutLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_PutPermissionPolicy.go b/service/waf/api_op_PutPermissionPolicy.go index 2af4fa95f10..2646ce2acbd 100644 --- a/service/waf/api_op_PutPermissionPolicy.go +++ b/service/waf/api_op_PutPermissionPolicy.go @@ -91,6 +91,9 @@ func addOperationPutPermissionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationPutPermissionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_TagResource.go b/service/waf/api_op_TagResource.go index 04d184ae42b..b4785fdf3af 100644 --- a/service/waf/api_op_TagResource.go +++ b/service/waf/api_op_TagResource.go @@ -67,6 +67,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UntagResource.go b/service/waf/api_op_UntagResource.go index afab38838ca..9ac952be275 100644 --- a/service/waf/api_op_UntagResource.go +++ b/service/waf/api_op_UntagResource.go @@ -59,6 +59,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateByteMatchSet.go b/service/waf/api_op_UpdateByteMatchSet.go index 2c886f422c6..8695ce5d7af 100644 --- a/service/waf/api_op_UpdateByteMatchSet.go +++ b/service/waf/api_op_UpdateByteMatchSet.go @@ -124,6 +124,9 @@ func addOperationUpdateByteMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateByteMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateGeoMatchSet.go b/service/waf/api_op_UpdateGeoMatchSet.go index 2572e5c5e1f..d38f0e12252 100644 --- a/service/waf/api_op_UpdateGeoMatchSet.go +++ b/service/waf/api_op_UpdateGeoMatchSet.go @@ -112,6 +112,9 @@ func addOperationUpdateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationUpdateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateIPSet.go b/service/waf/api_op_UpdateIPSet.go index 9c62026ca81..f1a9b68741f 100644 --- a/service/waf/api_op_UpdateIPSet.go +++ b/service/waf/api_op_UpdateIPSet.go @@ -135,6 +135,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateRateBasedRule.go b/service/waf/api_op_UpdateRateBasedRule.go index d8e438bfca7..c8907865ad4 100644 --- a/service/waf/api_op_UpdateRateBasedRule.go +++ b/service/waf/api_op_UpdateRateBasedRule.go @@ -115,6 +115,9 @@ func addOperationUpdateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateRegexMatchSet.go b/service/waf/api_op_UpdateRegexMatchSet.go index 96621297fd8..5b8a2002d2d 100644 --- a/service/waf/api_op_UpdateRegexMatchSet.go +++ b/service/waf/api_op_UpdateRegexMatchSet.go @@ -111,6 +111,9 @@ func addOperationUpdateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationUpdateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateRegexPatternSet.go b/service/waf/api_op_UpdateRegexPatternSet.go index 81b8f51b1b3..5f64b7b4c32 100644 --- a/service/waf/api_op_UpdateRegexPatternSet.go +++ b/service/waf/api_op_UpdateRegexPatternSet.go @@ -111,6 +111,9 @@ func addOperationUpdateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationUpdateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateRule.go b/service/waf/api_op_UpdateRule.go index 47d322a97c8..2b76890b7c8 100644 --- a/service/waf/api_op_UpdateRule.go +++ b/service/waf/api_op_UpdateRule.go @@ -118,6 +118,9 @@ func addOperationUpdateRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationUpdateRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateRuleGroup.go b/service/waf/api_op_UpdateRuleGroup.go index ca9f58a6b00..4d5b1686351 100644 --- a/service/waf/api_op_UpdateRuleGroup.go +++ b/service/waf/api_op_UpdateRuleGroup.go @@ -97,6 +97,9 @@ func addOperationUpdateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationUpdateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateSizeConstraintSet.go b/service/waf/api_op_UpdateSizeConstraintSet.go index 7c781af9589..4f199197022 100644 --- a/service/waf/api_op_UpdateSizeConstraintSet.go +++ b/service/waf/api_op_UpdateSizeConstraintSet.go @@ -128,6 +128,9 @@ func addOperationUpdateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationUpdateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateSqlInjectionMatchSet.go b/service/waf/api_op_UpdateSqlInjectionMatchSet.go index 99afdcccc9b..189e2235181 100644 --- a/service/waf/api_op_UpdateSqlInjectionMatchSet.go +++ b/service/waf/api_op_UpdateSqlInjectionMatchSet.go @@ -123,6 +123,9 @@ func addOperationUpdateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationUpdateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateWebACL.go b/service/waf/api_op_UpdateWebACL.go index 3da983fd281..407d7ba5741 100644 --- a/service/waf/api_op_UpdateWebACL.go +++ b/service/waf/api_op_UpdateWebACL.go @@ -146,6 +146,9 @@ func addOperationUpdateWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationUpdateWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/api_op_UpdateXssMatchSet.go b/service/waf/api_op_UpdateXssMatchSet.go index 28079afaa5d..f1103fb30da 100644 --- a/service/waf/api_op_UpdateXssMatchSet.go +++ b/service/waf/api_op_UpdateXssMatchSet.go @@ -119,6 +119,9 @@ func addOperationUpdateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationUpdateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/waf/go.mod b/service/waf/go.mod index 1cb4dc5b122..6184a4cd54e 100644 --- a/service/waf/go.mod +++ b/service/waf/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/waf go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/waf/go.sum b/service/waf/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/waf/go.sum +++ b/service/waf/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/wafregional/api_client.go b/service/wafregional/api_client.go index 8d8387ab1e1..7482c97ca69 100644 --- a/service/wafregional/api_client.go +++ b/service/wafregional/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/wafregional/api_op_AssociateWebACL.go b/service/wafregional/api_op_AssociateWebACL.go index 7109b644fd9..a8e7b2bd70d 100644 --- a/service/wafregional/api_op_AssociateWebACL.go +++ b/service/wafregional/api_op_AssociateWebACL.go @@ -70,6 +70,9 @@ func addOperationAssociateWebACLMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationAssociateWebACLMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateByteMatchSet.go b/service/wafregional/api_op_CreateByteMatchSet.go index fa76f148e1b..7dd187d04db 100644 --- a/service/wafregional/api_op_CreateByteMatchSet.go +++ b/service/wafregional/api_op_CreateByteMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateByteMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateByteMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateGeoMatchSet.go b/service/wafregional/api_op_CreateGeoMatchSet.go index c6bf0e6b404..f17f8d4a977 100644 --- a/service/wafregional/api_op_CreateGeoMatchSet.go +++ b/service/wafregional/api_op_CreateGeoMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateIPSet.go b/service/wafregional/api_op_CreateIPSet.go index 5e47d6c524d..d5a160f497e 100644 --- a/service/wafregional/api_op_CreateIPSet.go +++ b/service/wafregional/api_op_CreateIPSet.go @@ -93,6 +93,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -135,6 +138,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateRateBasedRule.go b/service/wafregional/api_op_CreateRateBasedRule.go index 0a2081c3aaf..3177ad2182b 100644 --- a/service/wafregional/api_op_CreateRateBasedRule.go +++ b/service/wafregional/api_op_CreateRateBasedRule.go @@ -162,6 +162,9 @@ func addOperationCreateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -204,6 +207,9 @@ func addOperationCreateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateRegexMatchSet.go b/service/wafregional/api_op_CreateRegexMatchSet.go index 6a533ea89f9..2f96098e9de 100644 --- a/service/wafregional/api_op_CreateRegexMatchSet.go +++ b/service/wafregional/api_op_CreateRegexMatchSet.go @@ -95,6 +95,9 @@ func addOperationCreateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateRegexPatternSet.go b/service/wafregional/api_op_CreateRegexPatternSet.go index 0fca2965374..1ff55e459d4 100644 --- a/service/wafregional/api_op_CreateRegexPatternSet.go +++ b/service/wafregional/api_op_CreateRegexPatternSet.go @@ -91,6 +91,9 @@ func addOperationCreateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateRule.go b/service/wafregional/api_op_CreateRule.go index c195f5820f6..03470c8d1cc 100644 --- a/service/wafregional/api_op_CreateRule.go +++ b/service/wafregional/api_op_CreateRule.go @@ -122,6 +122,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -164,6 +167,9 @@ func addOperationCreateRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateRuleGroup.go b/service/wafregional/api_op_CreateRuleGroup.go index 61e51942322..24180834660 100644 --- a/service/wafregional/api_op_CreateRuleGroup.go +++ b/service/wafregional/api_op_CreateRuleGroup.go @@ -97,6 +97,9 @@ func addOperationCreateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationCreateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateSizeConstraintSet.go b/service/wafregional/api_op_CreateSizeConstraintSet.go index 19b5c8702f2..c5054b9ad75 100644 --- a/service/wafregional/api_op_CreateSizeConstraintSet.go +++ b/service/wafregional/api_op_CreateSizeConstraintSet.go @@ -95,6 +95,9 @@ func addOperationCreateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationCreateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateSqlInjectionMatchSet.go b/service/wafregional/api_op_CreateSqlInjectionMatchSet.go index ae651b7048f..f753b1a9ea6 100644 --- a/service/wafregional/api_op_CreateSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_CreateSqlInjectionMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateWebACL.go b/service/wafregional/api_op_CreateWebACL.go index 27784037996..4bb78572102 100644 --- a/service/wafregional/api_op_CreateWebACL.go +++ b/service/wafregional/api_op_CreateWebACL.go @@ -121,6 +121,9 @@ func addOperationCreateWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -163,6 +166,9 @@ func addOperationCreateWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateWebACLMigrationStack.go b/service/wafregional/api_op_CreateWebACLMigrationStack.go index 552c64c7af8..0234e491205 100644 --- a/service/wafregional/api_op_CreateWebACLMigrationStack.go +++ b/service/wafregional/api_op_CreateWebACLMigrationStack.go @@ -90,6 +90,9 @@ func addOperationCreateWebACLMigrationStackMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationCreateWebACLMigrationStackMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_CreateXssMatchSet.go b/service/wafregional/api_op_CreateXssMatchSet.go index 97272b67f8b..40167130a4c 100644 --- a/service/wafregional/api_op_CreateXssMatchSet.go +++ b/service/wafregional/api_op_CreateXssMatchSet.go @@ -94,6 +94,9 @@ func addOperationCreateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteByteMatchSet.go b/service/wafregional/api_op_DeleteByteMatchSet.go index 4b9ae57b392..72bda52879f 100644 --- a/service/wafregional/api_op_DeleteByteMatchSet.go +++ b/service/wafregional/api_op_DeleteByteMatchSet.go @@ -79,6 +79,9 @@ func addOperationDeleteByteMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteByteMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteGeoMatchSet.go b/service/wafregional/api_op_DeleteGeoMatchSet.go index 2458a5fdc25..349c8b9ba4c 100644 --- a/service/wafregional/api_op_DeleteGeoMatchSet.go +++ b/service/wafregional/api_op_DeleteGeoMatchSet.go @@ -79,6 +79,9 @@ func addOperationDeleteGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteIPSet.go b/service/wafregional/api_op_DeleteIPSet.go index 075780a4b10..2d6f33a505d 100644 --- a/service/wafregional/api_op_DeleteIPSet.go +++ b/service/wafregional/api_op_DeleteIPSet.go @@ -78,6 +78,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteLoggingConfiguration.go b/service/wafregional/api_op_DeleteLoggingConfiguration.go index eb2c0da7f98..a0782b3d52c 100644 --- a/service/wafregional/api_op_DeleteLoggingConfiguration.go +++ b/service/wafregional/api_op_DeleteLoggingConfiguration.go @@ -56,6 +56,9 @@ func addOperationDeleteLoggingConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeleteLoggingConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeletePermissionPolicy.go b/service/wafregional/api_op_DeletePermissionPolicy.go index 04693683899..5d9b61212d2 100644 --- a/service/wafregional/api_op_DeletePermissionPolicy.go +++ b/service/wafregional/api_op_DeletePermissionPolicy.go @@ -56,6 +56,9 @@ func addOperationDeletePermissionPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDeletePermissionPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteRateBasedRule.go b/service/wafregional/api_op_DeleteRateBasedRule.go index 1983ba4206a..0058c828040 100644 --- a/service/wafregional/api_op_DeleteRateBasedRule.go +++ b/service/wafregional/api_op_DeleteRateBasedRule.go @@ -79,6 +79,9 @@ func addOperationDeleteRateBasedRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteRateBasedRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteRegexMatchSet.go b/service/wafregional/api_op_DeleteRegexMatchSet.go index 490c1baf5d9..22ae34bd363 100644 --- a/service/wafregional/api_op_DeleteRegexMatchSet.go +++ b/service/wafregional/api_op_DeleteRegexMatchSet.go @@ -80,6 +80,9 @@ func addOperationDeleteRegexMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationDeleteRegexMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteRegexPatternSet.go b/service/wafregional/api_op_DeleteRegexPatternSet.go index 05711358045..f931ecfa23e 100644 --- a/service/wafregional/api_op_DeleteRegexPatternSet.go +++ b/service/wafregional/api_op_DeleteRegexPatternSet.go @@ -69,6 +69,9 @@ func addOperationDeleteRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationDeleteRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteRule.go b/service/wafregional/api_op_DeleteRule.go index 009901e6bdb..a3d2110a385 100644 --- a/service/wafregional/api_op_DeleteRule.go +++ b/service/wafregional/api_op_DeleteRule.go @@ -79,6 +79,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationDeleteRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteRuleGroup.go b/service/wafregional/api_op_DeleteRuleGroup.go index d0e69a27d4d..9646f9bbfb8 100644 --- a/service/wafregional/api_op_DeleteRuleGroup.go +++ b/service/wafregional/api_op_DeleteRuleGroup.go @@ -78,6 +78,9 @@ func addOperationDeleteRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDeleteRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteSizeConstraintSet.go b/service/wafregional/api_op_DeleteSizeConstraintSet.go index 875723ef751..10a90ffd04a 100644 --- a/service/wafregional/api_op_DeleteSizeConstraintSet.go +++ b/service/wafregional/api_op_DeleteSizeConstraintSet.go @@ -81,6 +81,9 @@ func addOperationDeleteSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go b/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go index 520677f0edc..e8044a62994 100644 --- a/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go @@ -83,6 +83,9 @@ func addOperationDeleteSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDeleteSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteWebACL.go b/service/wafregional/api_op_DeleteWebACL.go index 6445bf3a715..109bf0c8114 100644 --- a/service/wafregional/api_op_DeleteWebACL.go +++ b/service/wafregional/api_op_DeleteWebACL.go @@ -76,6 +76,9 @@ func addOperationDeleteWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -118,6 +121,9 @@ func addOperationDeleteWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DeleteXssMatchSet.go b/service/wafregional/api_op_DeleteXssMatchSet.go index 333dd8c0cd4..7ab93c03586 100644 --- a/service/wafregional/api_op_DeleteXssMatchSet.go +++ b/service/wafregional/api_op_DeleteXssMatchSet.go @@ -81,6 +81,9 @@ func addOperationDeleteXssMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDeleteXssMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_DisassociateWebACL.go b/service/wafregional/api_op_DisassociateWebACL.go index 1b0635c3d03..d29f23151bf 100644 --- a/service/wafregional/api_op_DisassociateWebACL.go +++ b/service/wafregional/api_op_DisassociateWebACL.go @@ -66,6 +66,9 @@ func addOperationDisassociateWebACLMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationDisassociateWebACLMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetByteMatchSet.go b/service/wafregional/api_op_GetByteMatchSet.go index 06e662d5161..506c6ae795e 100644 --- a/service/wafregional/api_op_GetByteMatchSet.go +++ b/service/wafregional/api_op_GetByteMatchSet.go @@ -71,6 +71,9 @@ func addOperationGetByteMatchSetMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetByteMatchSetMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetChangeToken.go b/service/wafregional/api_op_GetChangeToken.go index 1c4c6bdb1ba..b25ba459446 100644 --- a/service/wafregional/api_op_GetChangeToken.go +++ b/service/wafregional/api_op_GetChangeToken.go @@ -64,6 +64,9 @@ func addOperationGetChangeTokenMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetChangeTokenMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetChangeTokenStatus.go b/service/wafregional/api_op_GetChangeTokenStatus.go index e7c80c7fc5a..a599524ba00 100644 --- a/service/wafregional/api_op_GetChangeTokenStatus.go +++ b/service/wafregional/api_op_GetChangeTokenStatus.go @@ -71,6 +71,9 @@ func addOperationGetChangeTokenStatusMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetChangeTokenStatusMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetGeoMatchSet.go b/service/wafregional/api_op_GetGeoMatchSet.go index fe8dd092a5f..4295e6356c2 100644 --- a/service/wafregional/api_op_GetGeoMatchSet.go +++ b/service/wafregional/api_op_GetGeoMatchSet.go @@ -62,6 +62,9 @@ func addOperationGetGeoMatchSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetGeoMatchSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetIPSet.go b/service/wafregional/api_op_GetIPSet.go index e42aab6a4dc..25a27047c42 100644 --- a/service/wafregional/api_op_GetIPSet.go +++ b/service/wafregional/api_op_GetIPSet.go @@ -67,6 +67,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetLoggingConfiguration.go b/service/wafregional/api_op_GetLoggingConfiguration.go index 835428223c6..a7590663db7 100644 --- a/service/wafregional/api_op_GetLoggingConfiguration.go +++ b/service/wafregional/api_op_GetLoggingConfiguration.go @@ -60,6 +60,9 @@ func addOperationGetLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationGetLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetPermissionPolicy.go b/service/wafregional/api_op_GetPermissionPolicy.go index 13266910d45..96ff5d79c22 100644 --- a/service/wafregional/api_op_GetPermissionPolicy.go +++ b/service/wafregional/api_op_GetPermissionPolicy.go @@ -59,6 +59,9 @@ func addOperationGetPermissionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetPermissionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetRateBasedRule.go b/service/wafregional/api_op_GetRateBasedRule.go index 85419a000bb..bb04601f489 100644 --- a/service/wafregional/api_op_GetRateBasedRule.go +++ b/service/wafregional/api_op_GetRateBasedRule.go @@ -62,6 +62,9 @@ func addOperationGetRateBasedRuleMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetRateBasedRuleMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go b/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go index 01f9594326b..d82597143d8 100644 --- a/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go +++ b/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go @@ -69,6 +69,9 @@ func addOperationGetRateBasedRuleManagedKeysMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationGetRateBasedRuleManagedKeysMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetRegexMatchSet.go b/service/wafregional/api_op_GetRegexMatchSet.go index d768439a60f..c42f7a9024d 100644 --- a/service/wafregional/api_op_GetRegexMatchSet.go +++ b/service/wafregional/api_op_GetRegexMatchSet.go @@ -61,6 +61,9 @@ func addOperationGetRegexMatchSetMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetRegexMatchSetMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetRegexPatternSet.go b/service/wafregional/api_op_GetRegexPatternSet.go index b55f932a6fa..7ae5d839384 100644 --- a/service/wafregional/api_op_GetRegexPatternSet.go +++ b/service/wafregional/api_op_GetRegexPatternSet.go @@ -63,6 +63,9 @@ func addOperationGetRegexPatternSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetRegexPatternSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetRule.go b/service/wafregional/api_op_GetRule.go index bd56e9e6687..b7a13e2f1b4 100644 --- a/service/wafregional/api_op_GetRule.go +++ b/service/wafregional/api_op_GetRule.go @@ -68,6 +68,9 @@ func addOperationGetRuleMiddlewares(stack *middleware.Stack, options Options) (e if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationGetRuleMiddlewares(stack *middleware.Stack, options Options) (e if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetRuleGroup.go b/service/wafregional/api_op_GetRuleGroup.go index bd28db8df5c..68e75b0a0fa 100644 --- a/service/wafregional/api_op_GetRuleGroup.go +++ b/service/wafregional/api_op_GetRuleGroup.go @@ -62,6 +62,9 @@ func addOperationGetRuleGroupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetRuleGroupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetSampledRequests.go b/service/wafregional/api_op_GetSampledRequests.go index 66db1231d97..ed0cd9c7c35 100644 --- a/service/wafregional/api_op_GetSampledRequests.go +++ b/service/wafregional/api_op_GetSampledRequests.go @@ -111,6 +111,9 @@ func addOperationGetSampledRequestsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationGetSampledRequestsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetSizeConstraintSet.go b/service/wafregional/api_op_GetSizeConstraintSet.go index 0d2df5e4909..24e257d7e40 100644 --- a/service/wafregional/api_op_GetSizeConstraintSet.go +++ b/service/wafregional/api_op_GetSizeConstraintSet.go @@ -72,6 +72,9 @@ func addOperationGetSizeConstraintSetMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetSizeConstraintSetMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetSqlInjectionMatchSet.go b/service/wafregional/api_op_GetSqlInjectionMatchSet.go index 02615ae7e48..8156b82fa22 100644 --- a/service/wafregional/api_op_GetSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_GetSqlInjectionMatchSet.go @@ -75,6 +75,9 @@ func addOperationGetSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationGetSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetWebACL.go b/service/wafregional/api_op_GetWebACL.go index 01853a8f94d..3bc54aca7d5 100644 --- a/service/wafregional/api_op_GetWebACL.go +++ b/service/wafregional/api_op_GetWebACL.go @@ -72,6 +72,9 @@ func addOperationGetWebACLMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetWebACLMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetWebACLForResource.go b/service/wafregional/api_op_GetWebACLForResource.go index 18c75f26e91..6cbec3179c8 100644 --- a/service/wafregional/api_op_GetWebACLForResource.go +++ b/service/wafregional/api_op_GetWebACLForResource.go @@ -71,6 +71,9 @@ func addOperationGetWebACLForResourceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetWebACLForResourceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_GetXssMatchSet.go b/service/wafregional/api_op_GetXssMatchSet.go index 9220bf64bdb..6b7178fe33d 100644 --- a/service/wafregional/api_op_GetXssMatchSet.go +++ b/service/wafregional/api_op_GetXssMatchSet.go @@ -72,6 +72,9 @@ func addOperationGetXssMatchSetMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetXssMatchSetMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go b/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go index 9f400317207..ea9a52440dc 100644 --- a/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go +++ b/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go @@ -78,6 +78,9 @@ func addOperationListActivatedRulesInRuleGroupMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListActivatedRulesInRuleGroupMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListByteMatchSets.go b/service/wafregional/api_op_ListByteMatchSets.go index 5ad5195852b..97757c957fa 100644 --- a/service/wafregional/api_op_ListByteMatchSets.go +++ b/service/wafregional/api_op_ListByteMatchSets.go @@ -73,6 +73,9 @@ func addOperationListByteMatchSetsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListByteMatchSetsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListGeoMatchSets.go b/service/wafregional/api_op_ListGeoMatchSets.go index 0a1f2f3c168..5299a484497 100644 --- a/service/wafregional/api_op_ListGeoMatchSets.go +++ b/service/wafregional/api_op_ListGeoMatchSets.go @@ -73,6 +73,9 @@ func addOperationListGeoMatchSetsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListGeoMatchSetsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListIPSets.go b/service/wafregional/api_op_ListIPSets.go index 31e3ce7814b..8e7eb1b8c9a 100644 --- a/service/wafregional/api_op_ListIPSets.go +++ b/service/wafregional/api_op_ListIPSets.go @@ -70,6 +70,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListLoggingConfigurations.go b/service/wafregional/api_op_ListLoggingConfigurations.go index 6541600ceb5..f55f4349335 100644 --- a/service/wafregional/api_op_ListLoggingConfigurations.go +++ b/service/wafregional/api_op_ListLoggingConfigurations.go @@ -75,6 +75,9 @@ func addOperationListLoggingConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListLoggingConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListRateBasedRules.go b/service/wafregional/api_op_ListRateBasedRules.go index 65c29d46773..8c1854c36e1 100644 --- a/service/wafregional/api_op_ListRateBasedRules.go +++ b/service/wafregional/api_op_ListRateBasedRules.go @@ -72,6 +72,9 @@ func addOperationListRateBasedRulesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListRateBasedRulesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListRegexMatchSets.go b/service/wafregional/api_op_ListRegexMatchSets.go index 797e1080b9f..4e5af7209af 100644 --- a/service/wafregional/api_op_ListRegexMatchSets.go +++ b/service/wafregional/api_op_ListRegexMatchSets.go @@ -74,6 +74,9 @@ func addOperationListRegexMatchSetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListRegexMatchSetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListRegexPatternSets.go b/service/wafregional/api_op_ListRegexPatternSets.go index 8d92fb47d83..9ca7fc3dc95 100644 --- a/service/wafregional/api_op_ListRegexPatternSets.go +++ b/service/wafregional/api_op_ListRegexPatternSets.go @@ -75,6 +75,9 @@ func addOperationListRegexPatternSetsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListRegexPatternSetsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListResourcesForWebACL.go b/service/wafregional/api_op_ListResourcesForWebACL.go index a8eed4d002f..ce84c907a60 100644 --- a/service/wafregional/api_op_ListResourcesForWebACL.go +++ b/service/wafregional/api_op_ListResourcesForWebACL.go @@ -67,6 +67,9 @@ func addOperationListResourcesForWebACLMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationListResourcesForWebACLMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListRuleGroups.go b/service/wafregional/api_op_ListRuleGroups.go index 89f02e90fa1..cb0e461cb31 100644 --- a/service/wafregional/api_op_ListRuleGroups.go +++ b/service/wafregional/api_op_ListRuleGroups.go @@ -73,6 +73,9 @@ func addOperationListRuleGroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListRuleGroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListRules.go b/service/wafregional/api_op_ListRules.go index f99455f7536..b1a2183e8f9 100644 --- a/service/wafregional/api_op_ListRules.go +++ b/service/wafregional/api_op_ListRules.go @@ -72,6 +72,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationListRulesMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListSizeConstraintSets.go b/service/wafregional/api_op_ListSizeConstraintSets.go index 91a0a95ec10..c6f08e1eec7 100644 --- a/service/wafregional/api_op_ListSizeConstraintSets.go +++ b/service/wafregional/api_op_ListSizeConstraintSets.go @@ -74,6 +74,9 @@ func addOperationListSizeConstraintSetsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListSizeConstraintSetsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListSqlInjectionMatchSets.go b/service/wafregional/api_op_ListSqlInjectionMatchSets.go index 18c90bebaec..744932cb6c5 100644 --- a/service/wafregional/api_op_ListSqlInjectionMatchSets.go +++ b/service/wafregional/api_op_ListSqlInjectionMatchSets.go @@ -78,6 +78,9 @@ func addOperationListSqlInjectionMatchSetsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListSqlInjectionMatchSetsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListSubscribedRuleGroups.go b/service/wafregional/api_op_ListSubscribedRuleGroups.go index 57ee852e1ff..bce2a330177 100644 --- a/service/wafregional/api_op_ListSubscribedRuleGroups.go +++ b/service/wafregional/api_op_ListSubscribedRuleGroups.go @@ -74,6 +74,9 @@ func addOperationListSubscribedRuleGroupsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListSubscribedRuleGroupsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListTagsForResource.go b/service/wafregional/api_op_ListTagsForResource.go index bed99740714..c31c699a014 100644 --- a/service/wafregional/api_op_ListTagsForResource.go +++ b/service/wafregional/api_op_ListTagsForResource.go @@ -75,6 +75,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListWebACLs.go b/service/wafregional/api_op_ListWebACLs.go index 7fe17d973dc..8c1c9257432 100644 --- a/service/wafregional/api_op_ListWebACLs.go +++ b/service/wafregional/api_op_ListWebACLs.go @@ -73,6 +73,9 @@ func addOperationListWebACLsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationListWebACLsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_ListXssMatchSets.go b/service/wafregional/api_op_ListXssMatchSets.go index 2ee34f298c8..7846a516533 100644 --- a/service/wafregional/api_op_ListXssMatchSets.go +++ b/service/wafregional/api_op_ListXssMatchSets.go @@ -75,6 +75,9 @@ func addOperationListXssMatchSetsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListXssMatchSetsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_PutLoggingConfiguration.go b/service/wafregional/api_op_PutLoggingConfiguration.go index bc12fb39542..7a580faf3f4 100644 --- a/service/wafregional/api_op_PutLoggingConfiguration.go +++ b/service/wafregional/api_op_PutLoggingConfiguration.go @@ -80,6 +80,9 @@ func addOperationPutLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationPutLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_PutPermissionPolicy.go b/service/wafregional/api_op_PutPermissionPolicy.go index 6c128f4f214..678e74e736f 100644 --- a/service/wafregional/api_op_PutPermissionPolicy.go +++ b/service/wafregional/api_op_PutPermissionPolicy.go @@ -91,6 +91,9 @@ func addOperationPutPermissionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationPutPermissionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_TagResource.go b/service/wafregional/api_op_TagResource.go index 771c343dc14..bc25f217328 100644 --- a/service/wafregional/api_op_TagResource.go +++ b/service/wafregional/api_op_TagResource.go @@ -67,6 +67,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UntagResource.go b/service/wafregional/api_op_UntagResource.go index 89579d22b40..881217cd950 100644 --- a/service/wafregional/api_op_UntagResource.go +++ b/service/wafregional/api_op_UntagResource.go @@ -59,6 +59,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateByteMatchSet.go b/service/wafregional/api_op_UpdateByteMatchSet.go index 9939f6ca99c..df89cee5953 100644 --- a/service/wafregional/api_op_UpdateByteMatchSet.go +++ b/service/wafregional/api_op_UpdateByteMatchSet.go @@ -124,6 +124,9 @@ func addOperationUpdateByteMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateByteMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateGeoMatchSet.go b/service/wafregional/api_op_UpdateGeoMatchSet.go index b6e19e14695..811dc0d82de 100644 --- a/service/wafregional/api_op_UpdateGeoMatchSet.go +++ b/service/wafregional/api_op_UpdateGeoMatchSet.go @@ -112,6 +112,9 @@ func addOperationUpdateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -154,6 +157,9 @@ func addOperationUpdateGeoMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateIPSet.go b/service/wafregional/api_op_UpdateIPSet.go index c3c1b9568ca..7450c84162a 100644 --- a/service/wafregional/api_op_UpdateIPSet.go +++ b/service/wafregional/api_op_UpdateIPSet.go @@ -135,6 +135,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -177,6 +180,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateRateBasedRule.go b/service/wafregional/api_op_UpdateRateBasedRule.go index 876c9ccd463..fb31c837606 100644 --- a/service/wafregional/api_op_UpdateRateBasedRule.go +++ b/service/wafregional/api_op_UpdateRateBasedRule.go @@ -115,6 +115,9 @@ func addOperationUpdateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -157,6 +160,9 @@ func addOperationUpdateRateBasedRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateRegexMatchSet.go b/service/wafregional/api_op_UpdateRegexMatchSet.go index 0336f5ce0ba..8a7507ebf62 100644 --- a/service/wafregional/api_op_UpdateRegexMatchSet.go +++ b/service/wafregional/api_op_UpdateRegexMatchSet.go @@ -111,6 +111,9 @@ func addOperationUpdateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationUpdateRegexMatchSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateRegexPatternSet.go b/service/wafregional/api_op_UpdateRegexPatternSet.go index 989872e1652..13a922d3aa5 100644 --- a/service/wafregional/api_op_UpdateRegexPatternSet.go +++ b/service/wafregional/api_op_UpdateRegexPatternSet.go @@ -111,6 +111,9 @@ func addOperationUpdateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -153,6 +156,9 @@ func addOperationUpdateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateRule.go b/service/wafregional/api_op_UpdateRule.go index 009f69e15db..a8fe08a24a1 100644 --- a/service/wafregional/api_op_UpdateRule.go +++ b/service/wafregional/api_op_UpdateRule.go @@ -118,6 +118,9 @@ func addOperationUpdateRuleMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -160,6 +163,9 @@ func addOperationUpdateRuleMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateRuleGroup.go b/service/wafregional/api_op_UpdateRuleGroup.go index 35168d5a53e..2031a5dce1b 100644 --- a/service/wafregional/api_op_UpdateRuleGroup.go +++ b/service/wafregional/api_op_UpdateRuleGroup.go @@ -97,6 +97,9 @@ func addOperationUpdateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -139,6 +142,9 @@ func addOperationUpdateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateSizeConstraintSet.go b/service/wafregional/api_op_UpdateSizeConstraintSet.go index e2987180242..c88bbe2cd70 100644 --- a/service/wafregional/api_op_UpdateSizeConstraintSet.go +++ b/service/wafregional/api_op_UpdateSizeConstraintSet.go @@ -128,6 +128,9 @@ func addOperationUpdateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -170,6 +173,9 @@ func addOperationUpdateSizeConstraintSetMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go b/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go index 8bc01ae4dd0..d166aada7f7 100644 --- a/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go @@ -123,6 +123,9 @@ func addOperationUpdateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -165,6 +168,9 @@ func addOperationUpdateSqlInjectionMatchSetMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateWebACL.go b/service/wafregional/api_op_UpdateWebACL.go index f4b3569e3d6..ab8cc641245 100644 --- a/service/wafregional/api_op_UpdateWebACL.go +++ b/service/wafregional/api_op_UpdateWebACL.go @@ -146,6 +146,9 @@ func addOperationUpdateWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -188,6 +191,9 @@ func addOperationUpdateWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/api_op_UpdateXssMatchSet.go b/service/wafregional/api_op_UpdateXssMatchSet.go index 4c5f75f237c..6819f358af4 100644 --- a/service/wafregional/api_op_UpdateXssMatchSet.go +++ b/service/wafregional/api_op_UpdateXssMatchSet.go @@ -119,6 +119,9 @@ func addOperationUpdateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationUpdateXssMatchSetMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafregional/go.mod b/service/wafregional/go.mod index 4b82c1b5147..32c8fc2ce12 100644 --- a/service/wafregional/go.mod +++ b/service/wafregional/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/wafregional go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wafregional/go.sum b/service/wafregional/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/wafregional/go.sum +++ b/service/wafregional/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/wafv2/api_client.go b/service/wafv2/api_client.go index d9a3d7a3942..692d647e3d6 100644 --- a/service/wafv2/api_client.go +++ b/service/wafv2/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/wafv2/api_op_AssociateWebACL.go b/service/wafv2/api_op_AssociateWebACL.go index 8c99cc76ce2..f3ebeebfc43 100644 --- a/service/wafv2/api_op_AssociateWebACL.go +++ b/service/wafv2/api_op_AssociateWebACL.go @@ -77,6 +77,9 @@ func addOperationAssociateWebACLMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationAssociateWebACLMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_CheckCapacity.go b/service/wafv2/api_op_CheckCapacity.go index a9c7f5e63a7..57eff1cb42d 100644 --- a/service/wafv2/api_op_CheckCapacity.go +++ b/service/wafv2/api_op_CheckCapacity.go @@ -80,6 +80,9 @@ func addOperationCheckCapacityMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationCheckCapacityMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_CreateIPSet.go b/service/wafv2/api_op_CreateIPSet.go index 5b768486c37..b7da22037a7 100644 --- a/service/wafv2/api_op_CreateIPSet.go +++ b/service/wafv2/api_op_CreateIPSet.go @@ -120,6 +120,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -162,6 +165,9 @@ func addOperationCreateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_CreateRegexPatternSet.go b/service/wafv2/api_op_CreateRegexPatternSet.go index 5a29e9d5711..14e50a58aa7 100644 --- a/service/wafv2/api_op_CreateRegexPatternSet.go +++ b/service/wafv2/api_op_CreateRegexPatternSet.go @@ -89,6 +89,9 @@ func addOperationCreateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationCreateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_CreateRuleGroup.go b/service/wafv2/api_op_CreateRuleGroup.go index 71ccea7ea40..3b1f4bfb633 100644 --- a/service/wafv2/api_op_CreateRuleGroup.go +++ b/service/wafv2/api_op_CreateRuleGroup.go @@ -113,6 +113,9 @@ func addOperationCreateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -155,6 +158,9 @@ func addOperationCreateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_CreateWebACL.go b/service/wafv2/api_op_CreateWebACL.go index eaad2df5e67..a6449d908c9 100644 --- a/service/wafv2/api_op_CreateWebACL.go +++ b/service/wafv2/api_op_CreateWebACL.go @@ -107,6 +107,9 @@ func addOperationCreateWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -149,6 +152,9 @@ func addOperationCreateWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go b/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go index 0a358ebf004..a515d5de001 100644 --- a/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go +++ b/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go @@ -71,6 +71,9 @@ func addOperationDeleteFirewallManagerRuleGroupsMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDeleteFirewallManagerRuleGroupsMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeleteIPSet.go b/service/wafv2/api_op_DeleteIPSet.go index 92d1e760874..813306a8f16 100644 --- a/service/wafv2/api_op_DeleteIPSet.go +++ b/service/wafv2/api_op_DeleteIPSet.go @@ -86,6 +86,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDeleteIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeleteLoggingConfiguration.go b/service/wafv2/api_op_DeleteLoggingConfiguration.go index 31c44559ee6..0005a017f74 100644 --- a/service/wafv2/api_op_DeleteLoggingConfiguration.go +++ b/service/wafv2/api_op_DeleteLoggingConfiguration.go @@ -53,6 +53,9 @@ func addOperationDeleteLoggingConfigurationMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteLoggingConfigurationMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeletePermissionPolicy.go b/service/wafv2/api_op_DeletePermissionPolicy.go index 547c5d51d21..f32535470a3 100644 --- a/service/wafv2/api_op_DeletePermissionPolicy.go +++ b/service/wafv2/api_op_DeletePermissionPolicy.go @@ -50,6 +50,9 @@ func addOperationDeletePermissionPolicyMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeletePermissionPolicyMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeleteRegexPatternSet.go b/service/wafv2/api_op_DeleteRegexPatternSet.go index 9297c91b1d8..a78d98e4964 100644 --- a/service/wafv2/api_op_DeleteRegexPatternSet.go +++ b/service/wafv2/api_op_DeleteRegexPatternSet.go @@ -85,6 +85,9 @@ func addOperationDeleteRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationDeleteRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeleteRuleGroup.go b/service/wafv2/api_op_DeleteRuleGroup.go index 5280ddf53d8..92e6ca8bd41 100644 --- a/service/wafv2/api_op_DeleteRuleGroup.go +++ b/service/wafv2/api_op_DeleteRuleGroup.go @@ -86,6 +86,9 @@ func addOperationDeleteRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationDeleteRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DeleteWebACL.go b/service/wafv2/api_op_DeleteWebACL.go index dbbb364898a..377155dfbc6 100644 --- a/service/wafv2/api_op_DeleteWebACL.go +++ b/service/wafv2/api_op_DeleteWebACL.go @@ -87,6 +87,9 @@ func addOperationDeleteWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDeleteWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DescribeManagedRuleGroup.go b/service/wafv2/api_op_DescribeManagedRuleGroup.go index 4c9b231d249..4e03cf0d0ca 100644 --- a/service/wafv2/api_op_DescribeManagedRuleGroup.go +++ b/service/wafv2/api_op_DescribeManagedRuleGroup.go @@ -88,6 +88,9 @@ func addOperationDescribeManagedRuleGroupMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeManagedRuleGroupMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_DisassociateWebACL.go b/service/wafv2/api_op_DisassociateWebACL.go index 08f8466a3a5..27c140da256 100644 --- a/service/wafv2/api_op_DisassociateWebACL.go +++ b/service/wafv2/api_op_DisassociateWebACL.go @@ -70,6 +70,9 @@ func addOperationDisassociateWebACLMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDisassociateWebACLMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetIPSet.go b/service/wafv2/api_op_GetIPSet.go index a97f3778177..f9070e5212a 100644 --- a/service/wafv2/api_op_GetIPSet.go +++ b/service/wafv2/api_op_GetIPSet.go @@ -88,6 +88,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetIPSetMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetLoggingConfiguration.go b/service/wafv2/api_op_GetLoggingConfiguration.go index e01b59405c0..afebe5b8da8 100644 --- a/service/wafv2/api_op_GetLoggingConfiguration.go +++ b/service/wafv2/api_op_GetLoggingConfiguration.go @@ -58,6 +58,9 @@ func addOperationGetLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetPermissionPolicy.go b/service/wafv2/api_op_GetPermissionPolicy.go index f714e26bd5a..5251875f6eb 100644 --- a/service/wafv2/api_op_GetPermissionPolicy.go +++ b/service/wafv2/api_op_GetPermissionPolicy.go @@ -54,6 +54,9 @@ func addOperationGetPermissionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationGetPermissionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go b/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go index bab035634a8..3cc5bcfe4b2 100644 --- a/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go +++ b/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go @@ -90,6 +90,9 @@ func addOperationGetRateBasedStatementManagedKeysMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -132,6 +135,9 @@ func addOperationGetRateBasedStatementManagedKeysMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetRegexPatternSet.go b/service/wafv2/api_op_GetRegexPatternSet.go index 63736150e00..b320daed5ff 100644 --- a/service/wafv2/api_op_GetRegexPatternSet.go +++ b/service/wafv2/api_op_GetRegexPatternSet.go @@ -87,6 +87,9 @@ func addOperationGetRegexPatternSetMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationGetRegexPatternSetMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetRuleGroup.go b/service/wafv2/api_op_GetRuleGroup.go index 51a419dbdff..0ed1825b45d 100644 --- a/service/wafv2/api_op_GetRuleGroup.go +++ b/service/wafv2/api_op_GetRuleGroup.go @@ -88,6 +88,9 @@ func addOperationGetRuleGroupMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationGetRuleGroupMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetSampledRequests.go b/service/wafv2/api_op_GetSampledRequests.go index ace6518afd2..6622094b779 100644 --- a/service/wafv2/api_op_GetSampledRequests.go +++ b/service/wafv2/api_op_GetSampledRequests.go @@ -117,6 +117,9 @@ func addOperationGetSampledRequestsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -159,6 +162,9 @@ func addOperationGetSampledRequestsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetWebACL.go b/service/wafv2/api_op_GetWebACL.go index 3c99db8f095..27169f07359 100644 --- a/service/wafv2/api_op_GetWebACL.go +++ b/service/wafv2/api_op_GetWebACL.go @@ -89,6 +89,9 @@ func addOperationGetWebACLMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetWebACLMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_GetWebACLForResource.go b/service/wafv2/api_op_GetWebACLForResource.go index ed25069db3a..b552a13dfc3 100644 --- a/service/wafv2/api_op_GetWebACLForResource.go +++ b/service/wafv2/api_op_GetWebACLForResource.go @@ -58,6 +58,9 @@ func addOperationGetWebACLForResourceMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationGetWebACLForResourceMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListAvailableManagedRuleGroups.go b/service/wafv2/api_op_ListAvailableManagedRuleGroups.go index 4017cf88338..660f8b6e571 100644 --- a/service/wafv2/api_op_ListAvailableManagedRuleGroups.go +++ b/service/wafv2/api_op_ListAvailableManagedRuleGroups.go @@ -86,6 +86,9 @@ func addOperationListAvailableManagedRuleGroupsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -128,6 +131,9 @@ func addOperationListAvailableManagedRuleGroupsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListIPSets.go b/service/wafv2/api_op_ListIPSets.go index 8ea05cef092..adf876b5eb7 100644 --- a/service/wafv2/api_op_ListIPSets.go +++ b/service/wafv2/api_op_ListIPSets.go @@ -85,6 +85,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListIPSetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListLoggingConfigurations.go b/service/wafv2/api_op_ListLoggingConfigurations.go index 6919746fb8d..66938492d7f 100644 --- a/service/wafv2/api_op_ListLoggingConfigurations.go +++ b/service/wafv2/api_op_ListLoggingConfigurations.go @@ -82,6 +82,9 @@ func addOperationListLoggingConfigurationsMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationListLoggingConfigurationsMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListRegexPatternSets.go b/service/wafv2/api_op_ListRegexPatternSets.go index ef3091d8af3..1a6d4759310 100644 --- a/service/wafv2/api_op_ListRegexPatternSets.go +++ b/service/wafv2/api_op_ListRegexPatternSets.go @@ -85,6 +85,9 @@ func addOperationListRegexPatternSetsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListRegexPatternSetsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListResourcesForWebACL.go b/service/wafv2/api_op_ListResourcesForWebACL.go index 283be8d2763..a15672c34c0 100644 --- a/service/wafv2/api_op_ListResourcesForWebACL.go +++ b/service/wafv2/api_op_ListResourcesForWebACL.go @@ -65,6 +65,9 @@ func addOperationListResourcesForWebACLMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListResourcesForWebACLMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListRuleGroups.go b/service/wafv2/api_op_ListRuleGroups.go index 7690b024624..4e72925796d 100644 --- a/service/wafv2/api_op_ListRuleGroups.go +++ b/service/wafv2/api_op_ListRuleGroups.go @@ -85,6 +85,9 @@ func addOperationListRuleGroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationListRuleGroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListTagsForResource.go b/service/wafv2/api_op_ListTagsForResource.go index f8d94ed8f7c..358c5f59f34 100644 --- a/service/wafv2/api_op_ListTagsForResource.go +++ b/service/wafv2/api_op_ListTagsForResource.go @@ -80,6 +80,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -122,6 +125,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_ListWebACLs.go b/service/wafv2/api_op_ListWebACLs.go index 0da9d2d7247..aa25ef5b96e 100644 --- a/service/wafv2/api_op_ListWebACLs.go +++ b/service/wafv2/api_op_ListWebACLs.go @@ -84,6 +84,9 @@ func addOperationListWebACLsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationListWebACLsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_PutLoggingConfiguration.go b/service/wafv2/api_op_PutLoggingConfiguration.go index 831e66cee39..e5f2334e167 100644 --- a/service/wafv2/api_op_PutLoggingConfiguration.go +++ b/service/wafv2/api_op_PutLoggingConfiguration.go @@ -77,6 +77,9 @@ func addOperationPutLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationPutLoggingConfigurationMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_PutPermissionPolicy.go b/service/wafv2/api_op_PutPermissionPolicy.go index 0e6f6323176..24089fbbe1d 100644 --- a/service/wafv2/api_op_PutPermissionPolicy.go +++ b/service/wafv2/api_op_PutPermissionPolicy.go @@ -85,6 +85,9 @@ func addOperationPutPermissionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationPutPermissionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_TagResource.go b/service/wafv2/api_op_TagResource.go index 4bc8f2c2df0..dd27fbd3909 100644 --- a/service/wafv2/api_op_TagResource.go +++ b/service/wafv2/api_op_TagResource.go @@ -64,6 +64,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_UntagResource.go b/service/wafv2/api_op_UntagResource.go index be1ad43c5a1..0c5386dd04e 100644 --- a/service/wafv2/api_op_UntagResource.go +++ b/service/wafv2/api_op_UntagResource.go @@ -60,6 +60,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_UpdateIPSet.go b/service/wafv2/api_op_UpdateIPSet.go index 25fa529f1c7..9aa04f0d316 100644 --- a/service/wafv2/api_op_UpdateIPSet.go +++ b/service/wafv2/api_op_UpdateIPSet.go @@ -124,6 +124,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -166,6 +169,9 @@ func addOperationUpdateIPSetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_UpdateRegexPatternSet.go b/service/wafv2/api_op_UpdateRegexPatternSet.go index 7fab2215bb2..1ca59ff1226 100644 --- a/service/wafv2/api_op_UpdateRegexPatternSet.go +++ b/service/wafv2/api_op_UpdateRegexPatternSet.go @@ -99,6 +99,9 @@ func addOperationUpdateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -141,6 +144,9 @@ func addOperationUpdateRegexPatternSetMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_UpdateRuleGroup.go b/service/wafv2/api_op_UpdateRuleGroup.go index ff045f43ad3..6916ae5b59a 100644 --- a/service/wafv2/api_op_UpdateRuleGroup.go +++ b/service/wafv2/api_op_UpdateRuleGroup.go @@ -110,6 +110,9 @@ func addOperationUpdateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -152,6 +155,9 @@ func addOperationUpdateRuleGroupMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/api_op_UpdateWebACL.go b/service/wafv2/api_op_UpdateWebACL.go index 03bfbe60634..f10e8c3f12f 100644 --- a/service/wafv2/api_op_UpdateWebACL.go +++ b/service/wafv2/api_op_UpdateWebACL.go @@ -119,6 +119,9 @@ func addOperationUpdateWebACLMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -161,6 +164,9 @@ func addOperationUpdateWebACLMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/wafv2/go.mod b/service/wafv2/go.mod index 368fb3cbbd2..671013dea1b 100644 --- a/service/wafv2/go.mod +++ b/service/wafv2/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/wafv2 go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wafv2/go.sum b/service/wafv2/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/wafv2/go.sum +++ b/service/wafv2/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/workdocs/api_client.go b/service/workdocs/api_client.go index f5c54015565..4b854646462 100644 --- a/service/workdocs/api_client.go +++ b/service/workdocs/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/workdocs/api_op_AbortDocumentVersionUpload.go b/service/workdocs/api_op_AbortDocumentVersionUpload.go index 1ce11b87af0..bcac0ddd054 100644 --- a/service/workdocs/api_op_AbortDocumentVersionUpload.go +++ b/service/workdocs/api_op_AbortDocumentVersionUpload.go @@ -60,6 +60,9 @@ func addOperationAbortDocumentVersionUploadMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationAbortDocumentVersionUploadMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_ActivateUser.go b/service/workdocs/api_op_ActivateUser.go index 91a265521e3..9bd7f389d36 100644 --- a/service/workdocs/api_op_ActivateUser.go +++ b/service/workdocs/api_op_ActivateUser.go @@ -57,6 +57,9 @@ func addOperationActivateUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationActivateUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_AddResourcePermissions.go b/service/workdocs/api_op_AddResourcePermissions.go index 8871c5d199c..6d2d08b33bb 100644 --- a/service/workdocs/api_op_AddResourcePermissions.go +++ b/service/workdocs/api_op_AddResourcePermissions.go @@ -67,6 +67,9 @@ func addOperationAddResourcePermissionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationAddResourcePermissionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_CreateComment.go b/service/workdocs/api_op_CreateComment.go index efde50812c2..5605d28b48b 100644 --- a/service/workdocs/api_op_CreateComment.go +++ b/service/workdocs/api_op_CreateComment.go @@ -82,6 +82,9 @@ func addOperationCreateCommentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateCommentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_CreateCustomMetadata.go b/service/workdocs/api_op_CreateCustomMetadata.go index 003ebc124f3..c9083dd34a7 100644 --- a/service/workdocs/api_op_CreateCustomMetadata.go +++ b/service/workdocs/api_op_CreateCustomMetadata.go @@ -62,6 +62,9 @@ func addOperationCreateCustomMetadataMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateCustomMetadataMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_CreateFolder.go b/service/workdocs/api_op_CreateFolder.go index 6b0f1465ad4..5f2e01c9a31 100644 --- a/service/workdocs/api_op_CreateFolder.go +++ b/service/workdocs/api_op_CreateFolder.go @@ -60,6 +60,9 @@ func addOperationCreateFolderMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateFolderMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_CreateLabels.go b/service/workdocs/api_op_CreateLabels.go index c94ae966347..d7a03ff21e2 100644 --- a/service/workdocs/api_op_CreateLabels.go +++ b/service/workdocs/api_op_CreateLabels.go @@ -57,6 +57,9 @@ func addOperationCreateLabelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationCreateLabelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_CreateNotificationSubscription.go b/service/workdocs/api_op_CreateNotificationSubscription.go index 8717fed1239..252a68e3d98 100644 --- a/service/workdocs/api_op_CreateNotificationSubscription.go +++ b/service/workdocs/api_op_CreateNotificationSubscription.go @@ -74,6 +74,9 @@ func addOperationCreateNotificationSubscriptionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationCreateNotificationSubscriptionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_CreateUser.go b/service/workdocs/api_op_CreateUser.go index dbfb5bcfe6d..ffbd11e693c 100644 --- a/service/workdocs/api_op_CreateUser.go +++ b/service/workdocs/api_op_CreateUser.go @@ -85,6 +85,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -127,6 +130,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeactivateUser.go b/service/workdocs/api_op_DeactivateUser.go index c3d60391544..d8c40d7cda1 100644 --- a/service/workdocs/api_op_DeactivateUser.go +++ b/service/workdocs/api_op_DeactivateUser.go @@ -53,6 +53,9 @@ func addOperationDeactivateUserMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeactivateUserMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteComment.go b/service/workdocs/api_op_DeleteComment.go index 60bcd347378..30ea3d2b231 100644 --- a/service/workdocs/api_op_DeleteComment.go +++ b/service/workdocs/api_op_DeleteComment.go @@ -62,6 +62,9 @@ func addOperationDeleteCommentMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationDeleteCommentMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteCustomMetadata.go b/service/workdocs/api_op_DeleteCustomMetadata.go index 10f3e9d0309..3f9aac7376a 100644 --- a/service/workdocs/api_op_DeleteCustomMetadata.go +++ b/service/workdocs/api_op_DeleteCustomMetadata.go @@ -63,6 +63,9 @@ func addOperationDeleteCustomMetadataMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDeleteCustomMetadataMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteDocument.go b/service/workdocs/api_op_DeleteDocument.go index f59dbf44ca7..4550384ee7f 100644 --- a/service/workdocs/api_op_DeleteDocument.go +++ b/service/workdocs/api_op_DeleteDocument.go @@ -52,6 +52,9 @@ func addOperationDeleteDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteFolder.go b/service/workdocs/api_op_DeleteFolder.go index c9eb5991d8a..36c69d7d990 100644 --- a/service/workdocs/api_op_DeleteFolder.go +++ b/service/workdocs/api_op_DeleteFolder.go @@ -52,6 +52,9 @@ func addOperationDeleteFolderMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteFolderMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteFolderContents.go b/service/workdocs/api_op_DeleteFolderContents.go index 563b1321236..d44d7bb4760 100644 --- a/service/workdocs/api_op_DeleteFolderContents.go +++ b/service/workdocs/api_op_DeleteFolderContents.go @@ -52,6 +52,9 @@ func addOperationDeleteFolderContentsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteFolderContentsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteLabels.go b/service/workdocs/api_op_DeleteLabels.go index 5ff88da5766..692dc453239 100644 --- a/service/workdocs/api_op_DeleteLabels.go +++ b/service/workdocs/api_op_DeleteLabels.go @@ -58,6 +58,9 @@ func addOperationDeleteLabelsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDeleteLabelsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteNotificationSubscription.go b/service/workdocs/api_op_DeleteNotificationSubscription.go index bc0009930d6..80fd253717d 100644 --- a/service/workdocs/api_op_DeleteNotificationSubscription.go +++ b/service/workdocs/api_op_DeleteNotificationSubscription.go @@ -53,6 +53,9 @@ func addOperationDeleteNotificationSubscriptionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteNotificationSubscriptionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DeleteUser.go b/service/workdocs/api_op_DeleteUser.go index 0a61cc8b407..fde34b1dc9a 100644 --- a/service/workdocs/api_op_DeleteUser.go +++ b/service/workdocs/api_op_DeleteUser.go @@ -52,6 +52,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeActivities.go b/service/workdocs/api_op_DescribeActivities.go index 056b8deacfd..375b291d8b9 100644 --- a/service/workdocs/api_op_DescribeActivities.go +++ b/service/workdocs/api_op_DescribeActivities.go @@ -92,6 +92,9 @@ func addOperationDescribeActivitiesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationDescribeActivitiesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeComments.go b/service/workdocs/api_op_DescribeComments.go index 8a71fee4578..809da17f8df 100644 --- a/service/workdocs/api_op_DescribeComments.go +++ b/service/workdocs/api_op_DescribeComments.go @@ -73,6 +73,9 @@ func addOperationDescribeCommentsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationDescribeCommentsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeDocumentVersions.go b/service/workdocs/api_op_DescribeDocumentVersions.go index 4113f962705..fec02e973f5 100644 --- a/service/workdocs/api_op_DescribeDocumentVersions.go +++ b/service/workdocs/api_op_DescribeDocumentVersions.go @@ -77,6 +77,9 @@ func addOperationDescribeDocumentVersionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeDocumentVersionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeFolderContents.go b/service/workdocs/api_op_DescribeFolderContents.go index 9389118056a..09777bd28ad 100644 --- a/service/workdocs/api_op_DescribeFolderContents.go +++ b/service/workdocs/api_op_DescribeFolderContents.go @@ -87,6 +87,9 @@ func addOperationDescribeFolderContentsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationDescribeFolderContentsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeGroups.go b/service/workdocs/api_op_DescribeGroups.go index b8c6fc8d7ae..9eadd4596c7 100644 --- a/service/workdocs/api_op_DescribeGroups.go +++ b/service/workdocs/api_op_DescribeGroups.go @@ -72,6 +72,9 @@ func addOperationDescribeGroupsMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeGroupsMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeNotificationSubscriptions.go b/service/workdocs/api_op_DescribeNotificationSubscriptions.go index fac1d5ca455..24e3939c312 100644 --- a/service/workdocs/api_op_DescribeNotificationSubscriptions.go +++ b/service/workdocs/api_op_DescribeNotificationSubscriptions.go @@ -64,6 +64,9 @@ func addOperationDescribeNotificationSubscriptionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeNotificationSubscriptionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeResourcePermissions.go b/service/workdocs/api_op_DescribeResourcePermissions.go index 247648373d3..b30c98a992e 100644 --- a/service/workdocs/api_op_DescribeResourcePermissions.go +++ b/service/workdocs/api_op_DescribeResourcePermissions.go @@ -71,6 +71,9 @@ func addOperationDescribeResourcePermissionsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationDescribeResourcePermissionsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeRootFolders.go b/service/workdocs/api_op_DescribeRootFolders.go index 6f0fb23649d..efdef4aa853 100644 --- a/service/workdocs/api_op_DescribeRootFolders.go +++ b/service/workdocs/api_op_DescribeRootFolders.go @@ -70,6 +70,9 @@ func addOperationDescribeRootFoldersMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeRootFoldersMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_DescribeUsers.go b/service/workdocs/api_op_DescribeUsers.go index 4924cc5141a..5129124243e 100644 --- a/service/workdocs/api_op_DescribeUsers.go +++ b/service/workdocs/api_op_DescribeUsers.go @@ -91,6 +91,9 @@ func addOperationDescribeUsersMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeUsersMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetCurrentUser.go b/service/workdocs/api_op_GetCurrentUser.go index 55d93d34d21..43e4fff28e4 100644 --- a/service/workdocs/api_op_GetCurrentUser.go +++ b/service/workdocs/api_op_GetCurrentUser.go @@ -59,6 +59,9 @@ func addOperationGetCurrentUserMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetCurrentUserMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetDocument.go b/service/workdocs/api_op_GetDocument.go index 0b17d2a32c8..e0e760352af 100644 --- a/service/workdocs/api_op_GetDocument.go +++ b/service/workdocs/api_op_GetDocument.go @@ -63,6 +63,9 @@ func addOperationGetDocumentMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetDocumentMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetDocumentPath.go b/service/workdocs/api_op_GetDocumentPath.go index 7f23e668a25..6bb377d10b2 100644 --- a/service/workdocs/api_op_GetDocumentPath.go +++ b/service/workdocs/api_op_GetDocumentPath.go @@ -71,6 +71,9 @@ func addOperationGetDocumentPathMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetDocumentPathMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetDocumentVersion.go b/service/workdocs/api_op_GetDocumentVersion.go index 1834422ff57..fc97af61395 100644 --- a/service/workdocs/api_op_GetDocumentVersion.go +++ b/service/workdocs/api_op_GetDocumentVersion.go @@ -72,6 +72,9 @@ func addOperationGetDocumentVersionMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationGetDocumentVersionMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetFolder.go b/service/workdocs/api_op_GetFolder.go index 412eac25746..f6e9718afcd 100644 --- a/service/workdocs/api_op_GetFolder.go +++ b/service/workdocs/api_op_GetFolder.go @@ -63,6 +63,9 @@ func addOperationGetFolderMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetFolderMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetFolderPath.go b/service/workdocs/api_op_GetFolderPath.go index 72abe10233d..4a4bb00916b 100644 --- a/service/workdocs/api_op_GetFolderPath.go +++ b/service/workdocs/api_op_GetFolderPath.go @@ -71,6 +71,9 @@ func addOperationGetFolderPathMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetFolderPathMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_GetResources.go b/service/workdocs/api_op_GetResources.go index 6b869aa7e14..1dac60b223a 100644 --- a/service/workdocs/api_op_GetResources.go +++ b/service/workdocs/api_op_GetResources.go @@ -74,6 +74,9 @@ func addOperationGetResourcesMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationGetResourcesMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_InitiateDocumentVersionUpload.go b/service/workdocs/api_op_InitiateDocumentVersionUpload.go index 5f5a98fbd0d..6d9cbd35fa2 100644 --- a/service/workdocs/api_op_InitiateDocumentVersionUpload.go +++ b/service/workdocs/api_op_InitiateDocumentVersionUpload.go @@ -84,6 +84,9 @@ func addOperationInitiateDocumentVersionUploadMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationInitiateDocumentVersionUploadMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_RemoveAllResourcePermissions.go b/service/workdocs/api_op_RemoveAllResourcePermissions.go index 331d2d556ac..2d81ca41486 100644 --- a/service/workdocs/api_op_RemoveAllResourcePermissions.go +++ b/service/workdocs/api_op_RemoveAllResourcePermissions.go @@ -52,6 +52,9 @@ func addOperationRemoveAllResourcePermissionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationRemoveAllResourcePermissionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_RemoveResourcePermission.go b/service/workdocs/api_op_RemoveResourcePermission.go index 8bed7845568..9bb1f2c3809 100644 --- a/service/workdocs/api_op_RemoveResourcePermission.go +++ b/service/workdocs/api_op_RemoveResourcePermission.go @@ -61,6 +61,9 @@ func addOperationRemoveResourcePermissionMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationRemoveResourcePermissionMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_UpdateDocument.go b/service/workdocs/api_op_UpdateDocument.go index a7c6425929b..892c7d6e26e 100644 --- a/service/workdocs/api_op_UpdateDocument.go +++ b/service/workdocs/api_op_UpdateDocument.go @@ -63,6 +63,9 @@ func addOperationUpdateDocumentMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateDocumentMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_UpdateDocumentVersion.go b/service/workdocs/api_op_UpdateDocumentVersion.go index c1da441d5de..3d4be962f38 100644 --- a/service/workdocs/api_op_UpdateDocumentVersion.go +++ b/service/workdocs/api_op_UpdateDocumentVersion.go @@ -64,6 +64,9 @@ func addOperationUpdateDocumentVersionMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateDocumentVersionMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_UpdateFolder.go b/service/workdocs/api_op_UpdateFolder.go index abc6cffbf74..9eef09223f6 100644 --- a/service/workdocs/api_op_UpdateFolder.go +++ b/service/workdocs/api_op_UpdateFolder.go @@ -64,6 +64,9 @@ func addOperationUpdateFolderMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateFolderMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/api_op_UpdateUser.go b/service/workdocs/api_op_UpdateUser.go index 95f7965b879..dcd6c69c794 100644 --- a/service/workdocs/api_op_UpdateUser.go +++ b/service/workdocs/api_op_UpdateUser.go @@ -79,6 +79,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -121,6 +124,9 @@ func addOperationUpdateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workdocs/go.mod b/service/workdocs/go.mod index a2d9f147b6d..96308890a7b 100644 --- a/service/workdocs/go.mod +++ b/service/workdocs/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/workdocs go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workdocs/go.sum b/service/workdocs/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/workdocs/go.sum +++ b/service/workdocs/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/worklink/api_client.go b/service/worklink/api_client.go index 75383bd13f8..e1f17d9d2df 100644 --- a/service/worklink/api_client.go +++ b/service/worklink/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/worklink/api_op_AssociateDomain.go b/service/worklink/api_op_AssociateDomain.go index 9e73017675c..4e87e83a1ed 100644 --- a/service/worklink/api_op_AssociateDomain.go +++ b/service/worklink/api_op_AssociateDomain.go @@ -62,6 +62,9 @@ func addOperationAssociateDomainMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationAssociateDomainMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go b/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go index bc80ec8f339..23ff92a70d4 100644 --- a/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go +++ b/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go @@ -63,6 +63,9 @@ func addOperationAssociateWebsiteAuthorizationProviderMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationAssociateWebsiteAuthorizationProviderMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go b/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go index fc5e93f372e..ee8a2fdf7eb 100644 --- a/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go +++ b/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go @@ -61,6 +61,9 @@ func addOperationAssociateWebsiteCertificateAuthorityMiddlewares(stack *middlewa if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationAssociateWebsiteCertificateAuthorityMiddlewares(stack *middlewa if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_CreateFleet.go b/service/worklink/api_op_CreateFleet.go index 4a471dda20c..484bb84ac3f 100644 --- a/service/worklink/api_op_CreateFleet.go +++ b/service/worklink/api_op_CreateFleet.go @@ -64,6 +64,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DeleteFleet.go b/service/worklink/api_op_DeleteFleet.go index 86f628b4b9f..efe1aa481e2 100644 --- a/service/worklink/api_op_DeleteFleet.go +++ b/service/worklink/api_op_DeleteFleet.go @@ -48,6 +48,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -90,6 +93,9 @@ func addOperationDeleteFleetMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeAuditStreamConfiguration.go b/service/worklink/api_op_DescribeAuditStreamConfiguration.go index b11d38c06e6..857edd6e14a 100644 --- a/service/worklink/api_op_DescribeAuditStreamConfiguration.go +++ b/service/worklink/api_op_DescribeAuditStreamConfiguration.go @@ -53,6 +53,9 @@ func addOperationDescribeAuditStreamConfigurationMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeAuditStreamConfigurationMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go b/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go index cbe64b1bf2e..2c672b9567e 100644 --- a/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go +++ b/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go @@ -60,6 +60,9 @@ func addOperationDescribeCompanyNetworkConfigurationMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeCompanyNetworkConfigurationMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeDevice.go b/service/worklink/api_op_DescribeDevice.go index f7a39ef082f..e654e17c313 100644 --- a/service/worklink/api_op_DescribeDevice.go +++ b/service/worklink/api_op_DescribeDevice.go @@ -83,6 +83,9 @@ func addOperationDescribeDeviceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationDescribeDeviceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeDevicePolicyConfiguration.go b/service/worklink/api_op_DescribeDevicePolicyConfiguration.go index 56bd2239e35..3ebc1a8b7c1 100644 --- a/service/worklink/api_op_DescribeDevicePolicyConfiguration.go +++ b/service/worklink/api_op_DescribeDevicePolicyConfiguration.go @@ -53,6 +53,9 @@ func addOperationDescribeDevicePolicyConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeDevicePolicyConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeDomain.go b/service/worklink/api_op_DescribeDomain.go index b4d725077ea..a541e06a424 100644 --- a/service/worklink/api_op_DescribeDomain.go +++ b/service/worklink/api_op_DescribeDomain.go @@ -72,6 +72,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDescribeDomainMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeFleetMetadata.go b/service/worklink/api_op_DescribeFleetMetadata.go index fb93c24b5f9..48c6572377e 100644 --- a/service/worklink/api_op_DescribeFleetMetadata.go +++ b/service/worklink/api_op_DescribeFleetMetadata.go @@ -77,6 +77,9 @@ func addOperationDescribeFleetMetadataMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeFleetMetadataMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeIdentityProviderConfiguration.go b/service/worklink/api_op_DescribeIdentityProviderConfiguration.go index 4dbd70a140b..a9cb1c66cfb 100644 --- a/service/worklink/api_op_DescribeIdentityProviderConfiguration.go +++ b/service/worklink/api_op_DescribeIdentityProviderConfiguration.go @@ -59,6 +59,9 @@ func addOperationDescribeIdentityProviderConfigurationMiddlewares(stack *middlew if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeIdentityProviderConfigurationMiddlewares(stack *middlew if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go b/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go index 4c6985cc8c5..fd6edb86f3d 100644 --- a/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go +++ b/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go @@ -64,6 +64,9 @@ func addOperationDescribeWebsiteCertificateAuthorityMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeWebsiteCertificateAuthorityMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DisassociateDomain.go b/service/worklink/api_op_DisassociateDomain.go index 7a6874c0a40..5117e96ee16 100644 --- a/service/worklink/api_op_DisassociateDomain.go +++ b/service/worklink/api_op_DisassociateDomain.go @@ -54,6 +54,9 @@ func addOperationDisassociateDomainMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateDomainMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go b/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go index 7dca8e3fd5a..8b0850e4852 100644 --- a/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go +++ b/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go @@ -55,6 +55,9 @@ func addOperationDisassociateWebsiteAuthorizationProviderMiddlewares(stack *midd if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisassociateWebsiteAuthorizationProviderMiddlewares(stack *midd if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go b/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go index 959734974f2..ec2a7195ba0 100644 --- a/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go +++ b/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go @@ -53,6 +53,9 @@ func addOperationDisassociateWebsiteCertificateAuthorityMiddlewares(stack *middl if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDisassociateWebsiteCertificateAuthorityMiddlewares(stack *middl if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_ListDevices.go b/service/worklink/api_op_ListDevices.go index 416b2ddb524..0763e521eea 100644 --- a/service/worklink/api_op_ListDevices.go +++ b/service/worklink/api_op_ListDevices.go @@ -64,6 +64,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDevicesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_ListDomains.go b/service/worklink/api_op_ListDomains.go index c4d1421b16f..79b4510ed41 100644 --- a/service/worklink/api_op_ListDomains.go +++ b/service/worklink/api_op_ListDomains.go @@ -64,6 +64,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListDomainsMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_ListFleets.go b/service/worklink/api_op_ListFleets.go index 6c52f233b4a..9081fd81162 100644 --- a/service/worklink/api_op_ListFleets.go +++ b/service/worklink/api_op_ListFleets.go @@ -59,6 +59,9 @@ func addOperationListFleetsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationListFleetsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_ListTagsForResource.go b/service/worklink/api_op_ListTagsForResource.go index 2318e4dd409..6b1683d96ed 100644 --- a/service/worklink/api_op_ListTagsForResource.go +++ b/service/worklink/api_op_ListTagsForResource.go @@ -52,6 +52,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_ListWebsiteAuthorizationProviders.go b/service/worklink/api_op_ListWebsiteAuthorizationProviders.go index 78f3a02dcee..05bd936daeb 100644 --- a/service/worklink/api_op_ListWebsiteAuthorizationProviders.go +++ b/service/worklink/api_op_ListWebsiteAuthorizationProviders.go @@ -65,6 +65,9 @@ func addOperationListWebsiteAuthorizationProvidersMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListWebsiteAuthorizationProvidersMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_ListWebsiteCertificateAuthorities.go b/service/worklink/api_op_ListWebsiteCertificateAuthorities.go index c0a627ae4e2..d622edcbc48 100644 --- a/service/worklink/api_op_ListWebsiteCertificateAuthorities.go +++ b/service/worklink/api_op_ListWebsiteCertificateAuthorities.go @@ -65,6 +65,9 @@ func addOperationListWebsiteCertificateAuthoritiesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListWebsiteCertificateAuthoritiesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_RestoreDomainAccess.go b/service/worklink/api_op_RestoreDomainAccess.go index 6ab20125fa6..ff02fa68f81 100644 --- a/service/worklink/api_op_RestoreDomainAccess.go +++ b/service/worklink/api_op_RestoreDomainAccess.go @@ -53,6 +53,9 @@ func addOperationRestoreDomainAccessMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationRestoreDomainAccessMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_RevokeDomainAccess.go b/service/worklink/api_op_RevokeDomainAccess.go index c9195f59f8e..e9cfd2da88e 100644 --- a/service/worklink/api_op_RevokeDomainAccess.go +++ b/service/worklink/api_op_RevokeDomainAccess.go @@ -53,6 +53,9 @@ func addOperationRevokeDomainAccessMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationRevokeDomainAccessMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_SignOutUser.go b/service/worklink/api_op_SignOutUser.go index da3ad820f50..2092f21c669 100644 --- a/service/worklink/api_op_SignOutUser.go +++ b/service/worklink/api_op_SignOutUser.go @@ -54,6 +54,9 @@ func addOperationSignOutUserMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationSignOutUserMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_TagResource.go b/service/worklink/api_op_TagResource.go index 8eee29b07b0..939ee94b5bc 100644 --- a/service/worklink/api_op_TagResource.go +++ b/service/worklink/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UntagResource.go b/service/worklink/api_op_UntagResource.go index 122909e058a..629eab4bea2 100644 --- a/service/worklink/api_op_UntagResource.go +++ b/service/worklink/api_op_UntagResource.go @@ -53,6 +53,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UpdateAuditStreamConfiguration.go b/service/worklink/api_op_UpdateAuditStreamConfiguration.go index d4e2f012a2c..df2e839419d 100644 --- a/service/worklink/api_op_UpdateAuditStreamConfiguration.go +++ b/service/worklink/api_op_UpdateAuditStreamConfiguration.go @@ -51,6 +51,9 @@ func addOperationUpdateAuditStreamConfigurationMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationUpdateAuditStreamConfigurationMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go b/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go index 8ae31002fb3..f0b25838bfd 100644 --- a/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go +++ b/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go @@ -64,6 +64,9 @@ func addOperationUpdateCompanyNetworkConfigurationMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationUpdateCompanyNetworkConfigurationMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UpdateDevicePolicyConfiguration.go b/service/worklink/api_op_UpdateDevicePolicyConfiguration.go index 20f39a4005d..6111cb66cbd 100644 --- a/service/worklink/api_op_UpdateDevicePolicyConfiguration.go +++ b/service/worklink/api_op_UpdateDevicePolicyConfiguration.go @@ -52,6 +52,9 @@ func addOperationUpdateDevicePolicyConfigurationMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationUpdateDevicePolicyConfigurationMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UpdateDomainMetadata.go b/service/worklink/api_op_UpdateDomainMetadata.go index 0f6004299fa..73f1c204533 100644 --- a/service/worklink/api_op_UpdateDomainMetadata.go +++ b/service/worklink/api_op_UpdateDomainMetadata.go @@ -56,6 +56,9 @@ func addOperationUpdateDomainMetadataMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationUpdateDomainMetadataMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UpdateFleetMetadata.go b/service/worklink/api_op_UpdateFleetMetadata.go index 41b062cf026..2bb7c98e05d 100644 --- a/service/worklink/api_op_UpdateFleetMetadata.go +++ b/service/worklink/api_op_UpdateFleetMetadata.go @@ -55,6 +55,9 @@ func addOperationUpdateFleetMetadataMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateFleetMetadataMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/api_op_UpdateIdentityProviderConfiguration.go b/service/worklink/api_op_UpdateIdentityProviderConfiguration.go index 8ed7b72f4e4..b1df8d64b5b 100644 --- a/service/worklink/api_op_UpdateIdentityProviderConfiguration.go +++ b/service/worklink/api_op_UpdateIdentityProviderConfiguration.go @@ -58,6 +58,9 @@ func addOperationUpdateIdentityProviderConfigurationMiddlewares(stack *middlewar if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationUpdateIdentityProviderConfigurationMiddlewares(stack *middlewar if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/worklink/go.mod b/service/worklink/go.mod index 8508a971a85..aebab200a6a 100644 --- a/service/worklink/go.mod +++ b/service/worklink/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/worklink go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/worklink/go.sum b/service/worklink/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/worklink/go.sum +++ b/service/worklink/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/workmail/api_client.go b/service/workmail/api_client.go index 0a9a7dc36a9..4eed2dff746 100644 --- a/service/workmail/api_client.go +++ b/service/workmail/api_client.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyrand "github.com/awslabs/smithy-go/rand" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,6 +33,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -59,6 +62,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -75,6 +81,9 @@ type Options struct { // idempotent API operations. IdempotencyTokenProvider IdempotencyTokenProvider + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -129,14 +138,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -175,15 +197,15 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } @@ -196,7 +218,8 @@ func resolveIdempotencyTokenProvider(o *Options) { func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -213,3 +236,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/workmail/api_op_AssociateDelegateToResource.go b/service/workmail/api_op_AssociateDelegateToResource.go index cd0509070ec..49c7659e668 100644 --- a/service/workmail/api_op_AssociateDelegateToResource.go +++ b/service/workmail/api_op_AssociateDelegateToResource.go @@ -58,6 +58,9 @@ func addOperationAssociateDelegateToResourceMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAssociateDelegateToResourceMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_AssociateMemberToGroup.go b/service/workmail/api_op_AssociateMemberToGroup.go index 1f870f4ec4c..3f9060e565c 100644 --- a/service/workmail/api_op_AssociateMemberToGroup.go +++ b/service/workmail/api_op_AssociateMemberToGroup.go @@ -58,6 +58,9 @@ func addOperationAssociateMemberToGroupMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationAssociateMemberToGroupMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_CancelMailboxExportJob.go b/service/workmail/api_op_CancelMailboxExportJob.go index 4c5bc45e308..e91daa5e2d9 100644 --- a/service/workmail/api_op_CancelMailboxExportJob.go +++ b/service/workmail/api_op_CancelMailboxExportJob.go @@ -60,6 +60,9 @@ func addOperationCancelMailboxExportJobMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationCancelMailboxExportJobMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_CreateAlias.go b/service/workmail/api_op_CreateAlias.go index 493ae8b40cf..d77eabc995e 100644 --- a/service/workmail/api_op_CreateAlias.go +++ b/service/workmail/api_op_CreateAlias.go @@ -58,6 +58,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_CreateGroup.go b/service/workmail/api_op_CreateGroup.go index 841c3ee3d83..de32c88189f 100644 --- a/service/workmail/api_op_CreateGroup.go +++ b/service/workmail/api_op_CreateGroup.go @@ -58,6 +58,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_CreateOrganization.go b/service/workmail/api_op_CreateOrganization.go index 603cdea8e0a..8b12c09e7a3 100644 --- a/service/workmail/api_op_CreateOrganization.go +++ b/service/workmail/api_op_CreateOrganization.go @@ -88,6 +88,9 @@ func addOperationCreateOrganizationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -133,6 +136,9 @@ func addOperationCreateOrganizationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_CreateResource.go b/service/workmail/api_op_CreateResource.go index bbae04be7e9..ea316607f4b 100644 --- a/service/workmail/api_op_CreateResource.go +++ b/service/workmail/api_op_CreateResource.go @@ -64,6 +64,9 @@ func addOperationCreateResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationCreateResourceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_CreateUser.go b/service/workmail/api_op_CreateUser.go index 8e114fc59d2..f2d0053a437 100644 --- a/service/workmail/api_op_CreateUser.go +++ b/service/workmail/api_op_CreateUser.go @@ -69,6 +69,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -111,6 +114,9 @@ func addOperationCreateUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteAccessControlRule.go b/service/workmail/api_op_DeleteAccessControlRule.go index 6f7b573ab59..317f40d9b27 100644 --- a/service/workmail/api_op_DeleteAccessControlRule.go +++ b/service/workmail/api_op_DeleteAccessControlRule.go @@ -53,6 +53,9 @@ func addOperationDeleteAccessControlRuleMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteAccessControlRuleMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteAlias.go b/service/workmail/api_op_DeleteAlias.go index a29e3497705..02dbdecef29 100644 --- a/service/workmail/api_op_DeleteAlias.go +++ b/service/workmail/api_op_DeleteAlias.go @@ -60,6 +60,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteAliasMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteGroup.go b/service/workmail/api_op_DeleteGroup.go index 65e4fa4d884..4bb7734e12e 100644 --- a/service/workmail/api_op_DeleteGroup.go +++ b/service/workmail/api_op_DeleteGroup.go @@ -53,6 +53,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteMailboxPermissions.go b/service/workmail/api_op_DeleteMailboxPermissions.go index d32e1b2d379..e4640be90b7 100644 --- a/service/workmail/api_op_DeleteMailboxPermissions.go +++ b/service/workmail/api_op_DeleteMailboxPermissions.go @@ -60,6 +60,9 @@ func addOperationDeleteMailboxPermissionsMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteMailboxPermissionsMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteOrganization.go b/service/workmail/api_op_DeleteOrganization.go index d4a8d0053cd..3cee1f59dd3 100644 --- a/service/workmail/api_op_DeleteOrganization.go +++ b/service/workmail/api_op_DeleteOrganization.go @@ -69,6 +69,9 @@ func addOperationDeleteOrganizationMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationDeleteOrganizationMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteResource.go b/service/workmail/api_op_DeleteResource.go index b184217cddd..25c98b43a7f 100644 --- a/service/workmail/api_op_DeleteResource.go +++ b/service/workmail/api_op_DeleteResource.go @@ -54,6 +54,9 @@ func addOperationDeleteResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDeleteResourceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteRetentionPolicy.go b/service/workmail/api_op_DeleteRetentionPolicy.go index 69f50147523..cc228291093 100644 --- a/service/workmail/api_op_DeleteRetentionPolicy.go +++ b/service/workmail/api_op_DeleteRetentionPolicy.go @@ -53,6 +53,9 @@ func addOperationDeleteRetentionPolicyMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteRetentionPolicyMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeleteUser.go b/service/workmail/api_op_DeleteUser.go index ec10cdce1ce..5056604c011 100644 --- a/service/workmail/api_op_DeleteUser.go +++ b/service/workmail/api_op_DeleteUser.go @@ -57,6 +57,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeleteUserMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DeregisterFromWorkMail.go b/service/workmail/api_op_DeregisterFromWorkMail.go index 3979b467108..db540a8b20b 100644 --- a/service/workmail/api_op_DeregisterFromWorkMail.go +++ b/service/workmail/api_op_DeregisterFromWorkMail.go @@ -57,6 +57,9 @@ func addOperationDeregisterFromWorkMailMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationDeregisterFromWorkMailMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DescribeGroup.go b/service/workmail/api_op_DescribeGroup.go index 66d1e609d17..b526d6af604 100644 --- a/service/workmail/api_op_DescribeGroup.go +++ b/service/workmail/api_op_DescribeGroup.go @@ -77,6 +77,9 @@ func addOperationDescribeGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -119,6 +122,9 @@ func addOperationDescribeGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DescribeMailboxExportJob.go b/service/workmail/api_op_DescribeMailboxExportJob.go index ffd5cccb8d7..369128f47fc 100644 --- a/service/workmail/api_op_DescribeMailboxExportJob.go +++ b/service/workmail/api_op_DescribeMailboxExportJob.go @@ -94,6 +94,9 @@ func addOperationDescribeMailboxExportJobMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationDescribeMailboxExportJobMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DescribeOrganization.go b/service/workmail/api_op_DescribeOrganization.go index 934d31a3ec1..5cccbda617d 100644 --- a/service/workmail/api_op_DescribeOrganization.go +++ b/service/workmail/api_op_DescribeOrganization.go @@ -81,6 +81,9 @@ func addOperationDescribeOrganizationMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -123,6 +126,9 @@ func addOperationDescribeOrganizationMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DescribeResource.go b/service/workmail/api_op_DescribeResource.go index 3f47ceb2a6f..413a01739a5 100644 --- a/service/workmail/api_op_DescribeResource.go +++ b/service/workmail/api_op_DescribeResource.go @@ -84,6 +84,9 @@ func addOperationDescribeResourceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationDescribeResourceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DescribeUser.go b/service/workmail/api_op_DescribeUser.go index 58b5dac90a9..9824bd6e936 100644 --- a/service/workmail/api_op_DescribeUser.go +++ b/service/workmail/api_op_DescribeUser.go @@ -88,6 +88,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -130,6 +133,9 @@ func addOperationDescribeUserMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DisassociateDelegateFromResource.go b/service/workmail/api_op_DisassociateDelegateFromResource.go index 68e7e0c8cf5..8e863c9bcee 100644 --- a/service/workmail/api_op_DisassociateDelegateFromResource.go +++ b/service/workmail/api_op_DisassociateDelegateFromResource.go @@ -59,6 +59,9 @@ func addOperationDisassociateDelegateFromResourceMiddlewares(stack *middleware.S if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDisassociateDelegateFromResourceMiddlewares(stack *middleware.S if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_DisassociateMemberFromGroup.go b/service/workmail/api_op_DisassociateMemberFromGroup.go index b4c5214a683..ad3bca64286 100644 --- a/service/workmail/api_op_DisassociateMemberFromGroup.go +++ b/service/workmail/api_op_DisassociateMemberFromGroup.go @@ -58,6 +58,9 @@ func addOperationDisassociateMemberFromGroupMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDisassociateMemberFromGroupMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_GetAccessControlEffect.go b/service/workmail/api_op_GetAccessControlEffect.go index a3d2d08e86a..06fb28a3c23 100644 --- a/service/workmail/api_op_GetAccessControlEffect.go +++ b/service/workmail/api_op_GetAccessControlEffect.go @@ -73,6 +73,9 @@ func addOperationGetAccessControlEffectMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationGetAccessControlEffectMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_GetDefaultRetentionPolicy.go b/service/workmail/api_op_GetDefaultRetentionPolicy.go index 556bf19fcee..eb7527d7c94 100644 --- a/service/workmail/api_op_GetDefaultRetentionPolicy.go +++ b/service/workmail/api_op_GetDefaultRetentionPolicy.go @@ -62,6 +62,9 @@ func addOperationGetDefaultRetentionPolicyMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationGetDefaultRetentionPolicyMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_GetMailboxDetails.go b/service/workmail/api_op_GetMailboxDetails.go index d30c1727d89..8d9b10d155c 100644 --- a/service/workmail/api_op_GetMailboxDetails.go +++ b/service/workmail/api_op_GetMailboxDetails.go @@ -61,6 +61,9 @@ func addOperationGetMailboxDetailsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationGetMailboxDetailsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListAccessControlRules.go b/service/workmail/api_op_ListAccessControlRules.go index 322c19e1845..edfc3da74d9 100644 --- a/service/workmail/api_op_ListAccessControlRules.go +++ b/service/workmail/api_op_ListAccessControlRules.go @@ -53,6 +53,9 @@ func addOperationListAccessControlRulesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListAccessControlRulesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListAliases.go b/service/workmail/api_op_ListAliases.go index 32186592847..4d4ac5c130f 100644 --- a/service/workmail/api_op_ListAliases.go +++ b/service/workmail/api_op_ListAliases.go @@ -68,6 +68,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationListAliasesMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListGroupMembers.go b/service/workmail/api_op_ListGroupMembers.go index c8f3182d6eb..f5cfd6643e0 100644 --- a/service/workmail/api_op_ListGroupMembers.go +++ b/service/workmail/api_op_ListGroupMembers.go @@ -71,6 +71,9 @@ func addOperationListGroupMembersMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListGroupMembersMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListGroups.go b/service/workmail/api_op_ListGroups.go index a64b6ecc04a..2e194f67c65 100644 --- a/service/workmail/api_op_ListGroups.go +++ b/service/workmail/api_op_ListGroups.go @@ -64,6 +64,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListMailboxExportJobs.go b/service/workmail/api_op_ListMailboxExportJobs.go index 1e4978befda..8827e66265f 100644 --- a/service/workmail/api_op_ListMailboxExportJobs.go +++ b/service/workmail/api_op_ListMailboxExportJobs.go @@ -63,6 +63,9 @@ func addOperationListMailboxExportJobsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationListMailboxExportJobsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListMailboxPermissions.go b/service/workmail/api_op_ListMailboxPermissions.go index dc3da47d8e6..ca9795986e0 100644 --- a/service/workmail/api_op_ListMailboxPermissions.go +++ b/service/workmail/api_op_ListMailboxPermissions.go @@ -72,6 +72,9 @@ func addOperationListMailboxPermissionsMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListMailboxPermissionsMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListOrganizations.go b/service/workmail/api_op_ListOrganizations.go index 74858db784c..4720b8a7cc4 100644 --- a/service/workmail/api_op_ListOrganizations.go +++ b/service/workmail/api_op_ListOrganizations.go @@ -60,6 +60,9 @@ func addOperationListOrganizationsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationListOrganizationsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListResourceDelegates.go b/service/workmail/api_op_ListResourceDelegates.go index 098a430a2bf..1352b2e4e2d 100644 --- a/service/workmail/api_op_ListResourceDelegates.go +++ b/service/workmail/api_op_ListResourceDelegates.go @@ -71,6 +71,9 @@ func addOperationListResourceDelegatesMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationListResourceDelegatesMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListResources.go b/service/workmail/api_op_ListResources.go index a29cb7705bc..b60b41318ab 100644 --- a/service/workmail/api_op_ListResources.go +++ b/service/workmail/api_op_ListResources.go @@ -65,6 +65,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationListResourcesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListTagsForResource.go b/service/workmail/api_op_ListTagsForResource.go index c90ffab194a..75462dd4a29 100644 --- a/service/workmail/api_op_ListTagsForResource.go +++ b/service/workmail/api_op_ListTagsForResource.go @@ -53,6 +53,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ListUsers.go b/service/workmail/api_op_ListUsers.go index cbddcecb7aa..e37c18fbd7a 100644 --- a/service/workmail/api_op_ListUsers.go +++ b/service/workmail/api_op_ListUsers.go @@ -64,6 +64,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListUsersMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_PutAccessControlRule.go b/service/workmail/api_op_PutAccessControlRule.go index 3f97da25ab0..1e9cf5bf759 100644 --- a/service/workmail/api_op_PutAccessControlRule.go +++ b/service/workmail/api_op_PutAccessControlRule.go @@ -87,6 +87,9 @@ func addOperationPutAccessControlRuleMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationPutAccessControlRuleMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_PutMailboxPermissions.go b/service/workmail/api_op_PutMailboxPermissions.go index 5f283418d56..87ed78d67bf 100644 --- a/service/workmail/api_op_PutMailboxPermissions.go +++ b/service/workmail/api_op_PutMailboxPermissions.go @@ -73,6 +73,9 @@ func addOperationPutMailboxPermissionsMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationPutMailboxPermissionsMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_PutRetentionPolicy.go b/service/workmail/api_op_PutRetentionPolicy.go index 293f6a813e7..8f367577195 100644 --- a/service/workmail/api_op_PutRetentionPolicy.go +++ b/service/workmail/api_op_PutRetentionPolicy.go @@ -65,6 +65,9 @@ func addOperationPutRetentionPolicyMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationPutRetentionPolicyMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_RegisterToWorkMail.go b/service/workmail/api_op_RegisterToWorkMail.go index 574a611a9f7..748fcc8b256 100644 --- a/service/workmail/api_op_RegisterToWorkMail.go +++ b/service/workmail/api_op_RegisterToWorkMail.go @@ -66,6 +66,9 @@ func addOperationRegisterToWorkMailMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -108,6 +111,9 @@ func addOperationRegisterToWorkMailMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_ResetPassword.go b/service/workmail/api_op_ResetPassword.go index 68c59b22a7c..0d26a547d6f 100644 --- a/service/workmail/api_op_ResetPassword.go +++ b/service/workmail/api_op_ResetPassword.go @@ -59,6 +59,9 @@ func addOperationResetPasswordMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationResetPasswordMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_StartMailboxExportJob.go b/service/workmail/api_op_StartMailboxExportJob.go index 45e0983b642..25929062933 100644 --- a/service/workmail/api_op_StartMailboxExportJob.go +++ b/service/workmail/api_op_StartMailboxExportJob.go @@ -92,6 +92,9 @@ func addOperationStartMailboxExportJobMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -137,6 +140,9 @@ func addOperationStartMailboxExportJobMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_TagResource.go b/service/workmail/api_op_TagResource.go index 5b34440cd74..a588f33530f 100644 --- a/service/workmail/api_op_TagResource.go +++ b/service/workmail/api_op_TagResource.go @@ -55,6 +55,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_UntagResource.go b/service/workmail/api_op_UntagResource.go index dc612a247c3..3b125c4a31f 100644 --- a/service/workmail/api_op_UntagResource.go +++ b/service/workmail/api_op_UntagResource.go @@ -54,6 +54,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_UpdateMailboxQuota.go b/service/workmail/api_op_UpdateMailboxQuota.go index 1af0139ac54..65ec5e58741 100644 --- a/service/workmail/api_op_UpdateMailboxQuota.go +++ b/service/workmail/api_op_UpdateMailboxQuota.go @@ -59,6 +59,9 @@ func addOperationUpdateMailboxQuotaMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationUpdateMailboxQuotaMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_UpdatePrimaryEmailAddress.go b/service/workmail/api_op_UpdatePrimaryEmailAddress.go index 4f1c1a51ae1..76c8795b068 100644 --- a/service/workmail/api_op_UpdatePrimaryEmailAddress.go +++ b/service/workmail/api_op_UpdatePrimaryEmailAddress.go @@ -61,6 +61,9 @@ func addOperationUpdatePrimaryEmailAddressMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -103,6 +106,9 @@ func addOperationUpdatePrimaryEmailAddressMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/api_op_UpdateResource.go b/service/workmail/api_op_UpdateResource.go index ac9834e7305..bc271a44d04 100644 --- a/service/workmail/api_op_UpdateResource.go +++ b/service/workmail/api_op_UpdateResource.go @@ -63,6 +63,9 @@ func addOperationUpdateResourceMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationUpdateResourceMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmail/go.mod b/service/workmail/go.mod index c99db3488b6..c78d1e3c58e 100644 --- a/service/workmail/go.mod +++ b/service/workmail/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/workmail go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workmail/go.sum b/service/workmail/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/workmail/go.sum +++ b/service/workmail/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/workmailmessageflow/api_client.go b/service/workmailmessageflow/api_client.go index e410c835f5b..d0102bd3b31 100644 --- a/service/workmailmessageflow/api_client.go +++ b/service/workmailmessageflow/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -31,6 +32,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -56,6 +59,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -68,6 +74,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -122,14 +131,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -168,21 +190,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -194,3 +217,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/workmailmessageflow/api_op_GetRawMessageContent.go b/service/workmailmessageflow/api_op_GetRawMessageContent.go index 58e4ce4bb97..83bc7dd2db8 100644 --- a/service/workmailmessageflow/api_op_GetRawMessageContent.go +++ b/service/workmailmessageflow/api_op_GetRawMessageContent.go @@ -55,6 +55,9 @@ func addOperationGetRawMessageContentMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationGetRawMessageContentMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workmailmessageflow/go.mod b/service/workmailmessageflow/go.mod index f413734e612..9394a95309c 100644 --- a/service/workmailmessageflow/go.mod +++ b/service/workmailmessageflow/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/workmailmessageflow go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workmailmessageflow/go.sum b/service/workmailmessageflow/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/workmailmessageflow/go.sum +++ b/service/workmailmessageflow/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/workspaces/api_client.go b/service/workspaces/api_client.go index 04e56d2b8a3..2ad48e95305 100644 --- a/service/workspaces/api_client.go +++ b/service/workspaces/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/workspaces/api_op_AssociateConnectionAlias.go b/service/workspaces/api_op_AssociateConnectionAlias.go index de65b322787..26a70398f61 100644 --- a/service/workspaces/api_op_AssociateConnectionAlias.go +++ b/service/workspaces/api_op_AssociateConnectionAlias.go @@ -65,6 +65,9 @@ func addOperationAssociateConnectionAliasMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationAssociateConnectionAliasMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_AssociateIpGroups.go b/service/workspaces/api_op_AssociateIpGroups.go index a03340f543a..ef8d77b6bde 100644 --- a/service/workspaces/api_op_AssociateIpGroups.go +++ b/service/workspaces/api_op_AssociateIpGroups.go @@ -53,6 +53,9 @@ func addOperationAssociateIpGroupsMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationAssociateIpGroupsMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_AuthorizeIpRules.go b/service/workspaces/api_op_AuthorizeIpRules.go index e2a97c1addf..c8c677d2974 100644 --- a/service/workspaces/api_op_AuthorizeIpRules.go +++ b/service/workspaces/api_op_AuthorizeIpRules.go @@ -56,6 +56,9 @@ func addOperationAuthorizeIpRulesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationAuthorizeIpRulesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_CopyWorkspaceImage.go b/service/workspaces/api_op_CopyWorkspaceImage.go index 45af5238b61..2487ee9d875 100644 --- a/service/workspaces/api_op_CopyWorkspaceImage.go +++ b/service/workspaces/api_op_CopyWorkspaceImage.go @@ -78,6 +78,9 @@ func addOperationCopyWorkspaceImageMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationCopyWorkspaceImageMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_CreateConnectionAlias.go b/service/workspaces/api_op_CreateConnectionAlias.go index d5629c74b98..1c25afd2f7b 100644 --- a/service/workspaces/api_op_CreateConnectionAlias.go +++ b/service/workspaces/api_op_CreateConnectionAlias.go @@ -62,6 +62,9 @@ func addOperationCreateConnectionAliasMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -104,6 +107,9 @@ func addOperationCreateConnectionAliasMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_CreateIpGroup.go b/service/workspaces/api_op_CreateIpGroup.go index 384224fd45c..0ba7904de67 100644 --- a/service/workspaces/api_op_CreateIpGroup.go +++ b/service/workspaces/api_op_CreateIpGroup.go @@ -71,6 +71,9 @@ func addOperationCreateIpGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -113,6 +116,9 @@ func addOperationCreateIpGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_CreateTags.go b/service/workspaces/api_op_CreateTags.go index 0ef1dcf5c52..8d9c77ebdea 100644 --- a/service/workspaces/api_op_CreateTags.go +++ b/service/workspaces/api_op_CreateTags.go @@ -56,6 +56,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationCreateTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_CreateWorkspaces.go b/service/workspaces/api_op_CreateWorkspaces.go index 863e94a36be..79a6ae0d5d7 100644 --- a/service/workspaces/api_op_CreateWorkspaces.go +++ b/service/workspaces/api_op_CreateWorkspaces.go @@ -60,6 +60,9 @@ func addOperationCreateWorkspacesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationCreateWorkspacesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DeleteConnectionAlias.go b/service/workspaces/api_op_DeleteConnectionAlias.go index 5955e5218a0..da3597533bc 100644 --- a/service/workspaces/api_op_DeleteConnectionAlias.go +++ b/service/workspaces/api_op_DeleteConnectionAlias.go @@ -60,6 +60,9 @@ func addOperationDeleteConnectionAliasMiddlewares(stack *middleware.Stack, optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDeleteConnectionAliasMiddlewares(stack *middleware.Stack, optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DeleteIpGroup.go b/service/workspaces/api_op_DeleteIpGroup.go index 00ddd574ff0..221732e278f 100644 --- a/service/workspaces/api_op_DeleteIpGroup.go +++ b/service/workspaces/api_op_DeleteIpGroup.go @@ -49,6 +49,9 @@ func addOperationDeleteIpGroupMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -91,6 +94,9 @@ func addOperationDeleteIpGroupMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DeleteTags.go b/service/workspaces/api_op_DeleteTags.go index a5befdb87ff..df826579cac 100644 --- a/service/workspaces/api_op_DeleteTags.go +++ b/service/workspaces/api_op_DeleteTags.go @@ -55,6 +55,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDeleteTagsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DeleteWorkspaceImage.go b/service/workspaces/api_op_DeleteWorkspaceImage.go index a9447b32d93..9891a42bc2c 100644 --- a/service/workspaces/api_op_DeleteWorkspaceImage.go +++ b/service/workspaces/api_op_DeleteWorkspaceImage.go @@ -50,6 +50,9 @@ func addOperationDeleteWorkspaceImageMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -92,6 +95,9 @@ func addOperationDeleteWorkspaceImageMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DeregisterWorkspaceDirectory.go b/service/workspaces/api_op_DeregisterWorkspaceDirectory.go index ef52da085d1..18214c83c1d 100644 --- a/service/workspaces/api_op_DeregisterWorkspaceDirectory.go +++ b/service/workspaces/api_op_DeregisterWorkspaceDirectory.go @@ -52,6 +52,9 @@ func addOperationDeregisterWorkspaceDirectoryMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationDeregisterWorkspaceDirectoryMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeAccount.go b/service/workspaces/api_op_DescribeAccount.go index 4aa1f99b025..c444c2f7774 100644 --- a/service/workspaces/api_op_DescribeAccount.go +++ b/service/workspaces/api_op_DescribeAccount.go @@ -56,6 +56,9 @@ func addOperationDescribeAccountMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeAccountMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeAccountModifications.go b/service/workspaces/api_op_DescribeAccountModifications.go index 53ae6134643..9e2a38d71a6 100644 --- a/service/workspaces/api_op_DescribeAccountModifications.go +++ b/service/workspaces/api_op_DescribeAccountModifications.go @@ -57,6 +57,9 @@ func addOperationDescribeAccountModificationsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDescribeAccountModificationsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeClientProperties.go b/service/workspaces/api_op_DescribeClientProperties.go index 8f51e9616a4..862888fc2f0 100644 --- a/service/workspaces/api_op_DescribeClientProperties.go +++ b/service/workspaces/api_op_DescribeClientProperties.go @@ -53,6 +53,9 @@ func addOperationDescribeClientPropertiesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDescribeClientPropertiesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeConnectionAliasPermissions.go b/service/workspaces/api_op_DescribeConnectionAliasPermissions.go index b5241e8a9fe..228878c5908 100644 --- a/service/workspaces/api_op_DescribeConnectionAliasPermissions.go +++ b/service/workspaces/api_op_DescribeConnectionAliasPermissions.go @@ -70,6 +70,9 @@ func addOperationDescribeConnectionAliasPermissionsMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -112,6 +115,9 @@ func addOperationDescribeConnectionAliasPermissionsMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeConnectionAliases.go b/service/workspaces/api_op_DescribeConnectionAliases.go index 1fbc4c09238..b07413d0b14 100644 --- a/service/workspaces/api_op_DescribeConnectionAliases.go +++ b/service/workspaces/api_op_DescribeConnectionAliases.go @@ -68,6 +68,9 @@ func addOperationDescribeConnectionAliasesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -107,6 +110,9 @@ func addOperationDescribeConnectionAliasesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeIpGroups.go b/service/workspaces/api_op_DescribeIpGroups.go index a7488a40671..e30189de6b8 100644 --- a/service/workspaces/api_op_DescribeIpGroups.go +++ b/service/workspaces/api_op_DescribeIpGroups.go @@ -62,6 +62,9 @@ func addOperationDescribeIpGroupsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationDescribeIpGroupsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeTags.go b/service/workspaces/api_op_DescribeTags.go index 3ff892a264a..594157dec71 100644 --- a/service/workspaces/api_op_DescribeTags.go +++ b/service/workspaces/api_op_DescribeTags.go @@ -55,6 +55,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDescribeTagsMiddlewares(stack *middleware.Stack, options Option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspaceBundles.go b/service/workspaces/api_op_DescribeWorkspaceBundles.go index 90b60886a95..73b286e8979 100644 --- a/service/workspaces/api_op_DescribeWorkspaceBundles.go +++ b/service/workspaces/api_op_DescribeWorkspaceBundles.go @@ -67,6 +67,9 @@ func addOperationDescribeWorkspaceBundlesMiddlewares(stack *middleware.Stack, op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationDescribeWorkspaceBundlesMiddlewares(stack *middleware.Stack, op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspaceDirectories.go b/service/workspaces/api_op_DescribeWorkspaceDirectories.go index 867a04666d5..a83fe770f3c 100644 --- a/service/workspaces/api_op_DescribeWorkspaceDirectories.go +++ b/service/workspaces/api_op_DescribeWorkspaceDirectories.go @@ -63,6 +63,9 @@ func addOperationDescribeWorkspaceDirectoriesMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -102,6 +105,9 @@ func addOperationDescribeWorkspaceDirectoriesMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go b/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go index 7283ca413d6..4b817f8f739 100644 --- a/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go +++ b/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go @@ -68,6 +68,9 @@ func addOperationDescribeWorkspaceImagePermissionsMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -110,6 +113,9 @@ func addOperationDescribeWorkspaceImagePermissionsMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspaceImages.go b/service/workspaces/api_op_DescribeWorkspaceImages.go index d516a8a00d3..2a4377fd357 100644 --- a/service/workspaces/api_op_DescribeWorkspaceImages.go +++ b/service/workspaces/api_op_DescribeWorkspaceImages.go @@ -66,6 +66,9 @@ func addOperationDescribeWorkspaceImagesMiddlewares(stack *middleware.Stack, opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationDescribeWorkspaceImagesMiddlewares(stack *middleware.Stack, opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspaceSnapshots.go b/service/workspaces/api_op_DescribeWorkspaceSnapshots.go index e5f33ac2186..9252ef5bd9a 100644 --- a/service/workspaces/api_op_DescribeWorkspaceSnapshots.go +++ b/service/workspaces/api_op_DescribeWorkspaceSnapshots.go @@ -58,6 +58,9 @@ func addOperationDescribeWorkspaceSnapshotsMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationDescribeWorkspaceSnapshotsMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspaces.go b/service/workspaces/api_op_DescribeWorkspaces.go index 90d6d06d822..22dfb0e79a1 100644 --- a/service/workspaces/api_op_DescribeWorkspaces.go +++ b/service/workspaces/api_op_DescribeWorkspaces.go @@ -81,6 +81,9 @@ func addOperationDescribeWorkspacesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -120,6 +123,9 @@ func addOperationDescribeWorkspacesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go b/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go index 9e7cccdd328..6b03b84eb7f 100644 --- a/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go +++ b/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go @@ -59,6 +59,9 @@ func addOperationDescribeWorkspacesConnectionStatusMiddlewares(stack *middleware if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationDescribeWorkspacesConnectionStatusMiddlewares(stack *middleware if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DisassociateConnectionAlias.go b/service/workspaces/api_op_DisassociateConnectionAlias.go index 1aa78397d3a..805207570b9 100644 --- a/service/workspaces/api_op_DisassociateConnectionAlias.go +++ b/service/workspaces/api_op_DisassociateConnectionAlias.go @@ -55,6 +55,9 @@ func addOperationDisassociateConnectionAliasMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationDisassociateConnectionAliasMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_DisassociateIpGroups.go b/service/workspaces/api_op_DisassociateIpGroups.go index 8597524c591..0e3b55ad723 100644 --- a/service/workspaces/api_op_DisassociateIpGroups.go +++ b/service/workspaces/api_op_DisassociateIpGroups.go @@ -54,6 +54,9 @@ func addOperationDisassociateIpGroupsMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationDisassociateIpGroupsMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ImportWorkspaceImage.go b/service/workspaces/api_op_ImportWorkspaceImage.go index 51d2ddd22c8..3e2dfb08a52 100644 --- a/service/workspaces/api_op_ImportWorkspaceImage.go +++ b/service/workspaces/api_op_ImportWorkspaceImage.go @@ -83,6 +83,9 @@ func addOperationImportWorkspaceImageMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -125,6 +128,9 @@ func addOperationImportWorkspaceImageMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ListAvailableManagementCidrRanges.go b/service/workspaces/api_op_ListAvailableManagementCidrRanges.go index 41a438600f7..94bb59af14d 100644 --- a/service/workspaces/api_op_ListAvailableManagementCidrRanges.go +++ b/service/workspaces/api_op_ListAvailableManagementCidrRanges.go @@ -72,6 +72,9 @@ func addOperationListAvailableManagementCidrRangesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationListAvailableManagementCidrRangesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_MigrateWorkspace.go b/service/workspaces/api_op_MigrateWorkspace.go index 002bdd3047a..30153bee0b9 100644 --- a/service/workspaces/api_op_MigrateWorkspace.go +++ b/service/workspaces/api_op_MigrateWorkspace.go @@ -72,6 +72,9 @@ func addOperationMigrateWorkspaceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationMigrateWorkspaceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifyAccount.go b/service/workspaces/api_op_ModifyAccount.go index 0fefe2ec9de..c1f93149558 100644 --- a/service/workspaces/api_op_ModifyAccount.go +++ b/service/workspaces/api_op_ModifyAccount.go @@ -55,6 +55,9 @@ func addOperationModifyAccountMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -94,6 +97,9 @@ func addOperationModifyAccountMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifyClientProperties.go b/service/workspaces/api_op_ModifyClientProperties.go index 4e11e5e966e..27e785a8128 100644 --- a/service/workspaces/api_op_ModifyClientProperties.go +++ b/service/workspaces/api_op_ModifyClientProperties.go @@ -54,6 +54,9 @@ func addOperationModifyClientPropertiesMiddlewares(stack *middleware.Stack, opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationModifyClientPropertiesMiddlewares(stack *middleware.Stack, opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifySelfservicePermissions.go b/service/workspaces/api_op_ModifySelfservicePermissions.go index 7ff56745064..7b452ca53e7 100644 --- a/service/workspaces/api_op_ModifySelfservicePermissions.go +++ b/service/workspaces/api_op_ModifySelfservicePermissions.go @@ -57,6 +57,9 @@ func addOperationModifySelfservicePermissionsMiddlewares(stack *middleware.Stack if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -99,6 +102,9 @@ func addOperationModifySelfservicePermissionsMiddlewares(stack *middleware.Stack if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go b/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go index 211e2be7716..ad9fe5d33eb 100644 --- a/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go +++ b/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go @@ -56,6 +56,9 @@ func addOperationModifyWorkspaceAccessPropertiesMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationModifyWorkspaceAccessPropertiesMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go b/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go index 1708158a868..4d94036831d 100644 --- a/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go +++ b/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go @@ -54,6 +54,9 @@ func addOperationModifyWorkspaceCreationPropertiesMiddlewares(stack *middleware. if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationModifyWorkspaceCreationPropertiesMiddlewares(stack *middleware. if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifyWorkspaceProperties.go b/service/workspaces/api_op_ModifyWorkspaceProperties.go index f07ad9061b1..138babd985a 100644 --- a/service/workspaces/api_op_ModifyWorkspaceProperties.go +++ b/service/workspaces/api_op_ModifyWorkspaceProperties.go @@ -56,6 +56,9 @@ func addOperationModifyWorkspacePropertiesMiddlewares(stack *middleware.Stack, o if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -98,6 +101,9 @@ func addOperationModifyWorkspacePropertiesMiddlewares(stack *middleware.Stack, o if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_ModifyWorkspaceState.go b/service/workspaces/api_op_ModifyWorkspaceState.go index 419b61e033b..752e86fcdde 100644 --- a/service/workspaces/api_op_ModifyWorkspaceState.go +++ b/service/workspaces/api_op_ModifyWorkspaceState.go @@ -58,6 +58,9 @@ func addOperationModifyWorkspaceStateMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationModifyWorkspaceStateMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_RebootWorkspaces.go b/service/workspaces/api_op_RebootWorkspaces.go index 1e7e995f212..70a5e34bb44 100644 --- a/service/workspaces/api_op_RebootWorkspaces.go +++ b/service/workspaces/api_op_RebootWorkspaces.go @@ -55,6 +55,9 @@ func addOperationRebootWorkspacesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationRebootWorkspacesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_RebuildWorkspaces.go b/service/workspaces/api_op_RebuildWorkspaces.go index 374b6fc0d42..9b72062209d 100644 --- a/service/workspaces/api_op_RebuildWorkspaces.go +++ b/service/workspaces/api_op_RebuildWorkspaces.go @@ -59,6 +59,9 @@ func addOperationRebuildWorkspacesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationRebuildWorkspacesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_RegisterWorkspaceDirectory.go b/service/workspaces/api_op_RegisterWorkspaceDirectory.go index 31a983eaeb6..5bf80414d34 100644 --- a/service/workspaces/api_op_RegisterWorkspaceDirectory.go +++ b/service/workspaces/api_op_RegisterWorkspaceDirectory.go @@ -87,6 +87,9 @@ func addOperationRegisterWorkspaceDirectoryMiddlewares(stack *middleware.Stack, if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -129,6 +132,9 @@ func addOperationRegisterWorkspaceDirectoryMiddlewares(stack *middleware.Stack, if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_RestoreWorkspace.go b/service/workspaces/api_op_RestoreWorkspace.go index 06aa9984b5d..48983086dee 100644 --- a/service/workspaces/api_op_RestoreWorkspace.go +++ b/service/workspaces/api_op_RestoreWorkspace.go @@ -54,6 +54,9 @@ func addOperationRestoreWorkspaceMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationRestoreWorkspaceMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_RevokeIpRules.go b/service/workspaces/api_op_RevokeIpRules.go index ae8d1725eea..2e5528a150f 100644 --- a/service/workspaces/api_op_RevokeIpRules.go +++ b/service/workspaces/api_op_RevokeIpRules.go @@ -53,6 +53,9 @@ func addOperationRevokeIpRulesMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationRevokeIpRulesMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_StartWorkspaces.go b/service/workspaces/api_op_StartWorkspaces.go index c190edb54dd..07c68bf5286 100644 --- a/service/workspaces/api_op_StartWorkspaces.go +++ b/service/workspaces/api_op_StartWorkspaces.go @@ -54,6 +54,9 @@ func addOperationStartWorkspacesMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -96,6 +99,9 @@ func addOperationStartWorkspacesMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_StopWorkspaces.go b/service/workspaces/api_op_StopWorkspaces.go index a0634b65602..0d332fbd4c2 100644 --- a/service/workspaces/api_op_StopWorkspaces.go +++ b/service/workspaces/api_op_StopWorkspaces.go @@ -55,6 +55,9 @@ func addOperationStopWorkspacesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationStopWorkspacesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_TerminateWorkspaces.go b/service/workspaces/api_op_TerminateWorkspaces.go index 72eafbd02db..c79643c7561 100644 --- a/service/workspaces/api_op_TerminateWorkspaces.go +++ b/service/workspaces/api_op_TerminateWorkspaces.go @@ -64,6 +64,9 @@ func addOperationTerminateWorkspacesMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationTerminateWorkspacesMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_UpdateConnectionAliasPermission.go b/service/workspaces/api_op_UpdateConnectionAliasPermission.go index 16938d26b2f..96a6b548442 100644 --- a/service/workspaces/api_op_UpdateConnectionAliasPermission.go +++ b/service/workspaces/api_op_UpdateConnectionAliasPermission.go @@ -73,6 +73,9 @@ func addOperationUpdateConnectionAliasPermissionMiddlewares(stack *middleware.St if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -115,6 +118,9 @@ func addOperationUpdateConnectionAliasPermissionMiddlewares(stack *middleware.St if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_UpdateRulesOfIpGroup.go b/service/workspaces/api_op_UpdateRulesOfIpGroup.go index 39de10625d4..930f187158a 100644 --- a/service/workspaces/api_op_UpdateRulesOfIpGroup.go +++ b/service/workspaces/api_op_UpdateRulesOfIpGroup.go @@ -55,6 +55,9 @@ func addOperationUpdateRulesOfIpGroupMiddlewares(stack *middleware.Stack, option if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUpdateRulesOfIpGroupMiddlewares(stack *middleware.Stack, option if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/api_op_UpdateWorkspaceImagePermission.go b/service/workspaces/api_op_UpdateWorkspaceImagePermission.go index d01412efa16..b15998ff0d2 100644 --- a/service/workspaces/api_op_UpdateWorkspaceImagePermission.go +++ b/service/workspaces/api_op_UpdateWorkspaceImagePermission.go @@ -74,6 +74,9 @@ func addOperationUpdateWorkspaceImagePermissionMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -116,6 +119,9 @@ func addOperationUpdateWorkspaceImagePermissionMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/workspaces/go.mod b/service/workspaces/go.mod index dd050925f5c..09b312eadcd 100644 --- a/service/workspaces/go.mod +++ b/service/workspaces/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/workspaces go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workspaces/go.sum b/service/workspaces/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/workspaces/go.sum +++ b/service/workspaces/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/xray/api_client.go b/service/xray/api_client.go index f7803300ae9..f23fe4a6c09 100644 --- a/service/xray/api_client.go +++ b/service/xray/api_client.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" smithy "github.com/awslabs/smithy-go" + "github.com/awslabs/smithy-go/logging" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" "net/http" @@ -30,6 +31,8 @@ type Client struct { func New(options Options, optFns ...func(*Options)) *Client { options = options.Copy() + resolveDefaultLogger(&options) + resolveRetryer(&options) resolveHTTPClient(&options) @@ -55,6 +58,9 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error + // Configures the events that will be sent to the configured logger. + ClientLogMode aws.ClientLogMode + // The credentials object to use when signing requests. Credentials aws.CredentialsProvider @@ -67,6 +73,9 @@ type Options struct { // Signature Version 4 (SigV4) Signer HTTPSignerV4 HTTPSignerV4 + // The logger writer interface to write logging messages to. + Logger logging.Logger + // The region to send requests to. (Required) Region string @@ -121,14 +130,27 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf return result, metadata, err } +func resolveDefaultLogger(o *Options) { + if o.Logger != nil { + return + } + o.Logger = logging.Nop{} +} + +func addSetLoggerMiddleware(stack *middleware.Stack, o Options) error { + return middleware.AddSetLoggerMiddleware(stack, o.Logger) +} + // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - Retryer: cfg.Retryer, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, + Region: cfg.Region, + Retryer: cfg.Retryer, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, } resolveAWSEndpointResolver(cfg, &opts) return New(opts, optFns...) @@ -167,21 +189,22 @@ type HTTPSignerV4 interface { SignHTTP(ctx context.Context, credentials aws.Credentials, r *http.Request, payloadHash string, service string, region string, signingTime time.Time) error } -func configureSignerV4(s *v4.Signer) { -} - func resolveHTTPSignerV4(o *Options) { if o.HTTPSignerV4 != nil { return } o.HTTPSignerV4 = v4.NewSigner( - configureSignerV4, + func(s *v4.Signer) { + s.Logger = o.Logger + s.LogSigning = o.ClientLogMode.IsSigning() + }, ) } func addRetryMiddlewares(stack *middleware.Stack, o Options) error { mo := retry.AddRetryMiddlewaresOptions{ - Retryer: o.Retryer, + Retryer: o.Retryer, + LogRetryAttempts: o.ClientLogMode.IsRetries(), } return retry.AddRetryMiddlewares(stack, mo) } @@ -193,3 +216,12 @@ func addRequestIDRetrieverMiddleware(stack *middleware.Stack) error { func addResponseErrorMiddleware(stack *middleware.Stack) error { return awshttp.AddResponseErrorMiddleware(stack) } + +func addRequestResponseLogging(stack *middleware.Stack, o Options) error { + return stack.Deserialize.Add(&smithyhttp.RequestResponseLogger{ + LogRequest: o.ClientLogMode.IsRequest(), + LogRequestWithBody: o.ClientLogMode.IsRequestWithBody(), + LogResponse: o.ClientLogMode.IsResponse(), + LogResponseWithBody: o.ClientLogMode.IsResponseWithBody(), + }, middleware.After) +} diff --git a/service/xray/api_op_BatchGetTraces.go b/service/xray/api_op_BatchGetTraces.go index 22b25c9f8fb..7ac7b7feba1 100644 --- a/service/xray/api_op_BatchGetTraces.go +++ b/service/xray/api_op_BatchGetTraces.go @@ -64,6 +64,9 @@ func addOperationBatchGetTracesMiddlewares(stack *middleware.Stack, options Opti if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationBatchGetTracesMiddlewares(stack *middleware.Stack, options Opti if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_CreateGroup.go b/service/xray/api_op_CreateGroup.go index dbba6940fc6..64723159b5d 100644 --- a/service/xray/api_op_CreateGroup.go +++ b/service/xray/api_op_CreateGroup.go @@ -94,6 +94,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -136,6 +139,9 @@ func addOperationCreateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_CreateSamplingRule.go b/service/xray/api_op_CreateSamplingRule.go index 0e408388420..3a388952682 100644 --- a/service/xray/api_op_CreateSamplingRule.go +++ b/service/xray/api_op_CreateSamplingRule.go @@ -82,6 +82,9 @@ func addOperationCreateSamplingRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -124,6 +127,9 @@ func addOperationCreateSamplingRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_DeleteGroup.go b/service/xray/api_op_DeleteGroup.go index 18cb3467449..cd7caed8eaf 100644 --- a/service/xray/api_op_DeleteGroup.go +++ b/service/xray/api_op_DeleteGroup.go @@ -49,6 +49,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -88,6 +91,9 @@ func addOperationDeleteGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_DeleteSamplingRule.go b/service/xray/api_op_DeleteSamplingRule.go index eca45226300..962899b7823 100644 --- a/service/xray/api_op_DeleteSamplingRule.go +++ b/service/xray/api_op_DeleteSamplingRule.go @@ -56,6 +56,9 @@ func addOperationDeleteSamplingRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationDeleteSamplingRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetEncryptionConfig.go b/service/xray/api_op_GetEncryptionConfig.go index d42f9e9b7a1..1fa2d8c2f97 100644 --- a/service/xray/api_op_GetEncryptionConfig.go +++ b/service/xray/api_op_GetEncryptionConfig.go @@ -48,6 +48,9 @@ func addOperationGetEncryptionConfigMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -87,6 +90,9 @@ func addOperationGetEncryptionConfigMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetGroup.go b/service/xray/api_op_GetGroup.go index 4da473b3a84..0469a42ef08 100644 --- a/service/xray/api_op_GetGroup.go +++ b/service/xray/api_op_GetGroup.go @@ -56,6 +56,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationGetGroupMiddlewares(stack *middleware.Stack, options Options) ( if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetGroups.go b/service/xray/api_op_GetGroups.go index 3ea04902ef3..3828c604f4b 100644 --- a/service/xray/api_op_GetGroups.go +++ b/service/xray/api_op_GetGroups.go @@ -54,6 +54,9 @@ func addOperationGetGroupsMiddlewares(stack *middleware.Stack, options Options) if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetGroupsMiddlewares(stack *middleware.Stack, options Options) if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetSamplingRules.go b/service/xray/api_op_GetSamplingRules.go index f05331d7275..79bcad9174b 100644 --- a/service/xray/api_op_GetSamplingRules.go +++ b/service/xray/api_op_GetSamplingRules.go @@ -54,6 +54,9 @@ func addOperationGetSamplingRulesMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetSamplingRulesMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetSamplingStatisticSummaries.go b/service/xray/api_op_GetSamplingStatisticSummaries.go index e574a61566b..355d9cd970e 100644 --- a/service/xray/api_op_GetSamplingStatisticSummaries.go +++ b/service/xray/api_op_GetSamplingStatisticSummaries.go @@ -54,6 +54,9 @@ func addOperationGetSamplingStatisticSummariesMiddlewares(stack *middleware.Stac if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -93,6 +96,9 @@ func addOperationGetSamplingStatisticSummariesMiddlewares(stack *middleware.Stac if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetSamplingTargets.go b/service/xray/api_op_GetSamplingTargets.go index 6e72aff0427..4688b611abc 100644 --- a/service/xray/api_op_GetSamplingTargets.go +++ b/service/xray/api_op_GetSamplingTargets.go @@ -63,6 +63,9 @@ func addOperationGetSamplingTargetsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -105,6 +108,9 @@ func addOperationGetSamplingTargetsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetServiceGraph.go b/service/xray/api_op_GetServiceGraph.go index 5a94ba4e7db..88ea30f85ae 100644 --- a/service/xray/api_op_GetServiceGraph.go +++ b/service/xray/api_op_GetServiceGraph.go @@ -89,6 +89,9 @@ func addOperationGetServiceGraphMiddlewares(stack *middleware.Stack, options Opt if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -131,6 +134,9 @@ func addOperationGetServiceGraphMiddlewares(stack *middleware.Stack, options Opt if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetTimeSeriesServiceStatistics.go b/service/xray/api_op_GetTimeSeriesServiceStatistics.go index f444a71883c..e91c259a5ab 100644 --- a/service/xray/api_op_GetTimeSeriesServiceStatistics.go +++ b/service/xray/api_op_GetTimeSeriesServiceStatistics.go @@ -84,6 +84,9 @@ func addOperationGetTimeSeriesServiceStatisticsMiddlewares(stack *middleware.Sta if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -126,6 +129,9 @@ func addOperationGetTimeSeriesServiceStatisticsMiddlewares(stack *middleware.Sta if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetTraceGraph.go b/service/xray/api_op_GetTraceGraph.go index f3c6ca1e435..97b2d9154c0 100644 --- a/service/xray/api_op_GetTraceGraph.go +++ b/service/xray/api_op_GetTraceGraph.go @@ -59,6 +59,9 @@ func addOperationGetTraceGraphMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -101,6 +104,9 @@ func addOperationGetTraceGraphMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_GetTraceSummaries.go b/service/xray/api_op_GetTraceSummaries.go index 26f56a204b0..00a527b1aa9 100644 --- a/service/xray/api_op_GetTraceSummaries.go +++ b/service/xray/api_op_GetTraceSummaries.go @@ -101,6 +101,9 @@ func addOperationGetTraceSummariesMiddlewares(stack *middleware.Stack, options O if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -143,6 +146,9 @@ func addOperationGetTraceSummariesMiddlewares(stack *middleware.Stack, options O if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_ListTagsForResource.go b/service/xray/api_op_ListTagsForResource.go index 0021e7c688f..0776fa4676e 100644 --- a/service/xray/api_op_ListTagsForResource.go +++ b/service/xray/api_op_ListTagsForResource.go @@ -64,6 +64,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -106,6 +109,9 @@ func addOperationListTagsForResourceMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_PutEncryptionConfig.go b/service/xray/api_op_PutEncryptionConfig.go index ab9154230a8..0cdd336d298 100644 --- a/service/xray/api_op_PutEncryptionConfig.go +++ b/service/xray/api_op_PutEncryptionConfig.go @@ -72,6 +72,9 @@ func addOperationPutEncryptionConfigMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -114,6 +117,9 @@ func addOperationPutEncryptionConfigMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_PutTelemetryRecords.go b/service/xray/api_op_PutTelemetryRecords.go index 1ff72dd3dbf..a490bfff4ff 100644 --- a/service/xray/api_op_PutTelemetryRecords.go +++ b/service/xray/api_op_PutTelemetryRecords.go @@ -58,6 +58,9 @@ func addOperationPutTelemetryRecordsMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -100,6 +103,9 @@ func addOperationPutTelemetryRecordsMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_PutTraceSegments.go b/service/xray/api_op_PutTraceSegments.go index 1ba1cd9dfbf..189f6a74605 100644 --- a/service/xray/api_op_PutTraceSegments.go +++ b/service/xray/api_op_PutTraceSegments.go @@ -100,6 +100,9 @@ func addOperationPutTraceSegmentsMiddlewares(stack *middleware.Stack, options Op if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -142,6 +145,9 @@ func addOperationPutTraceSegmentsMiddlewares(stack *middleware.Stack, options Op if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_TagResource.go b/service/xray/api_op_TagResource.go index d911287aae4..d0ec132da4d 100644 --- a/service/xray/api_op_TagResource.go +++ b/service/xray/api_op_TagResource.go @@ -75,6 +75,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -117,6 +120,9 @@ func addOperationTagResourceMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_UntagResource.go b/service/xray/api_op_UntagResource.go index 7946bd5096a..bcf265442a7 100644 --- a/service/xray/api_op_UntagResource.go +++ b/service/xray/api_op_UntagResource.go @@ -55,6 +55,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -97,6 +100,9 @@ func addOperationUntagResourceMiddlewares(stack *middleware.Stack, options Optio if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_UpdateGroup.go b/service/xray/api_op_UpdateGroup.go index c476389231c..7b3d1948da0 100644 --- a/service/xray/api_op_UpdateGroup.go +++ b/service/xray/api_op_UpdateGroup.go @@ -70,6 +70,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -109,6 +112,9 @@ func addOperationUpdateGroupMiddlewares(stack *middleware.Stack, options Options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/api_op_UpdateSamplingRule.go b/service/xray/api_op_UpdateSamplingRule.go index 612db0b6676..33cae5487c3 100644 --- a/service/xray/api_op_UpdateSamplingRule.go +++ b/service/xray/api_op_UpdateSamplingRule.go @@ -53,6 +53,9 @@ func addOperationUpdateSamplingRuleMiddlewares(stack *middleware.Stack, options if err != nil { return err } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { return err } @@ -95,6 +98,9 @@ func addOperationUpdateSamplingRuleMiddlewares(stack *middleware.Stack, options if err = addResponseErrorMiddleware(stack); err != nil { return err } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } return nil } diff --git a/service/xray/go.mod b/service/xray/go.mod index b1db04745f9..0247d7046d5 100644 --- a/service/xray/go.mod +++ b/service/xray/go.mod @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/xray go 1.15 require ( - github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027184009-8eb8fc303e7c - github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 + github.com/aws/aws-sdk-go-v2 v0.29.0 + github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/xray/go.sum b/service/xray/go.sum index 074f6b91625..c669e324b14 100644 --- a/service/xray/go.sum +++ b/service/xray/go.sum @@ -1,5 +1,3 @@ -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15 h1:VoGfHAIdt3SWiMe+oGB1f4fXdXAvA3J61Sl0rPR/SSM= -github.com/awslabs/smithy-go v0.3.1-0.20201103180816-d4c6ec013e15/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=